Merge branch 'liuxin' into develop

src/pages/contractCreate/add-undertake.vue

+<template>
+  <h-view v-if="showFlag" id="add-person">
+    <h-header :proportion="[1,4,1]" class="bar-custom">
+      <span slot="center" style="color:#fff">添加担保人</span>
+      <span slot="right" style="color:#fff" @click="showFlag=false">取消</span>
+    </h-header>
+    <div class="search has-header">
+      <input v-model="keyWord" placeholder="请输入担保人名称/证件号码" >
+    </div>
+    <scroll ref="scroll" :updateData="[undertakeList]" :pullUp="true" @pullingUp="loadMore">
+      <list-item :item-height="68" class="item">
+        <item v-for="(item,index) in undertakeList" :key="index" @click.native="addUndertake(item)">
+          <img slot="left-icon" src="@/assets/contractCreate/name.png" class="left-icon" >
+          <div slot="name">
+            担保人名称
+            <br >证件号
+          </div>
+          <div slot="content">
+            <input v-model="item.bp_name" placeholder="暂无信息" readonly >
+            <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
+          </div>
+        </item>
+      </list-item>
+    </scroll>
+  </h-view>
+</template>
+<script>
+export default {
+  props: {
+    bp_agent_id: {
+      type: String,
+      default: '',
+    },
+  },
+  data () {
+    return {
+      undertakeList: [], // 担保人列表
+      selectUdertake: [],
+      pagenum: 1,
+      keyWord: '',
+      showFlag: false,
+    }
+  },
+  watch: {
+
+  },
+  methods: {
+    show () {
+      this.showFlag = true
+    },
+    init () {
+      this.undertakeList = []
+      this.selectUdertake = []
+      this.pagenum = 1
+      this.keyWord = ''
+    },
+    unshow () {
+      this.showFlag = false
+    },
+    loadMore () {
+      if (this.keyWord) {
+        this.searchUndertake()
+      } else {
+        this.getUndertake()
+      }
+    },
+    searchUndertake () {
+      let vm = this
+      let randomString = Math.floor(Math.random() * 21)
+      let url =
+        process.env.basePath +
+        'prj_bp_guta_query' +
+        '&index' +
+        `'${randomString}'`
+      let param = {
+        bp_agent_id: vm.bp_agent_id,
+        pagesize: 10,
+        pagenum: vm.pageNumSearch,
+        searchInput: vm.keyWord,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          let returnData = []
+          returnData = res.lists
+          if (returnData.length === 0) {
+            vm.undertakeList = returnData
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length > 0 && returnData.length < 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.undertakeList = returnData
+            })
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length === 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.undertakeList.push(array[index])
+            })
+            vm.pageNumSearch++
+            vm.$refs.scroll.update(false)
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    addUndertake (e) {
+      if (this.selectUdertake.length === 0) {
+        this.selectUdertake.push(e)
+      } else {
+        let index = this.selectUdertake.findIndex(item => {
+          if (item.bp_name === e.bp_name) {
+            return true
+          }
+        })
+        if (index !== -1) {
+          hlsPopup.showLongCenter('您已添加了该担保人')
+        } else {
+          this.selectUdertake.push(e)
+        }
+      }
+      this.$emit('addUnder', this.selectUdertake)
+      setTimeout(() => {
+        this.showFlag = false
+      }, 100)
+    },
+    getUndertake () { // 担保人查询
+      let vm = this
+      let randomString = Math.floor(Math.random() * 21)
+      let url =
+        process.env.basePath +
+        'prj_bp_guta_query' +
+        '&index' +
+        `'${randomString}'`
+      let param = {
+        bp_agent_id: vm.bp_agent_id,
+        pagesize: 10,
+        pagenum: vm.pageNum,
+        searchInput: vm.keyWord,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          let returnData = []
+          returnData = res.lists
+          if (returnData.length === 0) {
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length > 0 && returnData.length < 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.undertakeList.push(array[index])
+            })
+            vm.pagenum++
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length === 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.undertakeList.push(array[index])
+            })
+            vm.pagenum++
+            vm.$refs.scroll.update(false)
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+  },
+}
+</script>
+<style lang="less" scoped>
+#add-person {
+  position: absolute;
+  top:0;
+  z-index:999;
+  .item {
+    width: 359px;
+    margin: 0 auto;
+  }
+  .search {
+    background-color: #fff;
+    padding: 8px 12px;
+    width: 100%;
+    height: 1.02rem;
+    z-index: 100;
+    margin-bottom: 8px;
+    input {
+      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239, 239, 239, 0.55);
+      padding-left: 12px;
+      height: 36px;
+      line-height: 36px;
+      border-radius: 4px;
+      width: 100%;
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      color: #888c8f;
+    }
+
+    input::placeholder {
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      color: #888c8f;
+      letter-spacing: 0;
+    }
+
+    input:focus {
+      background: url("../../assets/contractStart/search2.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239, 239, 239, 0.55);
+      border: 2px solid #bcc6ff;
+    }
+  }
+}
+</style>

src/pages/contractCreate/creat-rent-info.vue

@@ -327,14 +327,14 @@ export default {
       vm.divisionLists = []
       vm.pagenum = 1
       vm.pagenumPolicy = 1
-      if (vm.fromPage === 'sale') {
-        vm.fromList = false
-      } else if (vm.fromPage === 'list') {
-        vm.fromList = true
-        vm.rentInfoQuery()
-      }
       if (from.name === 'CreateBaseInfo') {
         vm.isComputed = false
+        if (vm.fromPage === 'sale') {
+          vm.fromList = false
+        } else if (vm.fromPage === 'list') {
+          vm.fromList = true
+          vm.rentInfoQuery()
+        }
         Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo
           if (i !== 'project_id') {
             vm.saveInfo[i] = ''

src/pages/contractCreate/create-base-info.vue

@@ -299,40 +299,15 @@
       <tab-button class="before" @click.native="$routeGo()">上一步</tab-button>
       <tab-button class="next" @click.native="save">下一步</tab-button>
     </bottom-tab>
-    <h-modal ref="modal" v-model="showModalValue" class="flow" position="bottom">
-      <h-view id="add-person">
-        <h-header :proportion="[1,4,1]" class="bar-custom">
-          <!-- <div class="h-header-btn"> -->
-          <span slot="center" style="color:#fff">添加担保人</span>
-          <span slot="right" style="color:#fff" @click="showModalValue=false">取消</span>
-          <!-- </div> -->
-        </h-header>
-        <h-content>
-          <div class="search has-header">
-            <input v-model="keyWord" placeholder="请输入担保人名称/证件号码" >
-          </div>
-          <scroll ref="scroll" :updateData="[undertakeList]" :pullUp="true" @pullingUp="loadMore">
-            <list-item :item-height="68" class="item">
-              <item v-for="(item,index) in undertakeList" :key="index" @click.native="addUndertake(item)">
-                <img slot="left-icon" src="@/assets/contractCreate/name.png" class="left-icon" >
-                <div slot="name">
-                  担保人名称
-                  <br >证件号
-                </div>
-                <div slot="content">
-                  <input v-model="item.bp_name" placeholder="暂无信息" readonly >
-                  <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
-                </div>
-              </item>
-            </list-item>
-          </scroll>
-        </h-content>
-      </h-view>
-    </h-modal>
+    <AddUnderTake ref="addperson" :bp_agent_id="bp_agent_id" @addUnder="addUnder"/>
   </h-view>
 </template>
 <script>
+import AddUnderTake from '../../pages/contractCreate/add-undertake'
 export default {
+  components: {
+    AddUnderTake,
+  },
   data () {
     return {
       checked: false, // 农行代扣
@@ -351,7 +326,6 @@ export default {
       equipInfonList: [], // 设备信息
       engeList: [], // 工程合同查询
       nativeList: [], // 企业性质查询
-      undertakeList: [], // 担保人列表
       selectUdertake: [], // 已选择的担保人列表
       NPBaseInfo: {}, // 自然人基本信息
       ORGBaseInfo: {}, // 企业基本信息
@@ -445,33 +419,30 @@ export default {
       }
     })
   },
+  mounted () {
+  },
   methods: {
     getSaveInfo () {
 
     },
-    addPerson () {
-      this.showModalValue = true
-      this.getUndertake()
-    },
-    addUndertake (e) {
-      if (this.selectUdertake.length === 0) {
-        this.selectUdertake.push(e)
-      } else {
-        let index = this.selectUdertake.findIndex(item => {
-          if (item.bp_name === e.bp_name) {
-            return true
-          }
-        })
-        if (index !== -1) {
-          hlsPopup.showLongCenter('您已添加了该担保人')
-        } else {
-          this.selectUdertake.push(e)
+    addUnder (e) {
+      let index = this.selectUdertake.findIndex(item => {
+        if (item.bp_name === e.bp_name) {
+          return true
         }
+      })
+      if (index !== -1) {
+        hlsPopup.showLongCenter('您已添加了该担保人')
+      } else {
+        this.selectUdertake.push(...e)
       }
-      setTimeout(() => {
-        this.showModalValue = false
-      }, 100)
     },
+    addPerson () {
+      this.$refs.addperson.init()
+      this.$refs.addperson.getUndertake()
+      this.$refs.addperson.show()
+    },
+
     makeData () {
       let obj = {}
       this.selectUdertake.forEach((i, index, arr) => {
@@ -541,93 +512,7 @@ export default {
         this.getORGnative()
       }
     },
-    loadMore () {
-      if (this.keyWord) {
-        this.searchUndertake()
-      } else {
-        this.getUndertake()
-      }
-    },
-    searchUndertake () {
-      let vm = this
-      let randomString = Math.floor(Math.random() * 21)
-      let url =
-        process.env.basePath +
-        'prj_bp_guta_query' +
-        '&index' +
-        `'${randomString}'`
-      let param = {
-        bp_agent_id: vm.bp_agent_id,
-        pagesize: 10,
-        pagenum: vm.pageNumSearch,
-        searchInput: vm.keyWord,
-      }
-      hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          let returnData = []
-          returnData = res.lists
-          if (returnData.length === 0) {
-            vm.undertakeList = returnData
-            vm.$refs.scroll.update(true)
-          } else if (returnData.length > 0 && returnData.length < 10) {
-            vum.forEach(returnData, function (data, index, array) {
-              vm.undertakeList = returnData
-            })
-            vm.$refs.scroll.update(true)
-          } else if (returnData.length === 10) {
-            vum.forEach(returnData, function (data, index, array) {
-              vm.undertakeList.push(array[index])
-            })
-            vm.pageNumSearch++
-            vm.$refs.scroll.update(false)
-          }
-        } else {
-          hlsPopup.showLongCenter(res.message)
-        }
-      })
-    },
-    getUndertake () { // 担保人查询
-      let vm = this
-      let randomString = Math.floor(Math.random() * 21)
-      let url =
-        process.env.basePath +
-        'prj_bp_guta_query' +
-        '&index' +
-        `'${randomString}'`
-      let param = {
-        bp_agent_id: vm.bp_agent_id,
-        pagesize: 10,
-        pagenum: vm.pageNum,
-        searchInput: vm.keyWord,
-      }
-      hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          let returnData = []
-          returnData = res.lists
-          if (returnData.length === 0) {
-            vm.$refs.scroll.update(true)
-          } else if (returnData.length > 0 && returnData.length < 10) {
-            vum.forEach(returnData, function (data, index, array) {
-              vm.undertakeList.push(array[index])
-            })
-            vm.pagenum++
-            vm.$refs.scroll.update(true)
-          } else if (returnData.length === 10) {
-            vum.forEach(returnData, function (data, index, array) {
-              vm.undertakeList.push(array[index])
-            })
-            vm.pagenum++
-            vm.$refs.scroll.update(false)
-          }
-        } else {
-          hlsPopup.showLongCenter(res.message)
-        }
-      })
-    },
+
     getNPInfo () {
       let vm = this
       let url = process.env.basePath + 'bp_np_info_query'

src/pages/pay/firstPay/contract-record.vue

@@ -125,7 +125,8 @@ export default {
           vm.prj_lists = res.prj_lists
           vm.prj_lists.forEach(i => {
             i.cf_lists.forEach(j => {
-              let num = parseFloat(j.due_amount) - parseFloat(j.received_amount)
+              // let num = parseFloat(j.due_amount) - parseFloat(j.received_amount)
+              let num = ''
               vm.$set(j, 'amount', num)
             })
           })

src/pages/pay/payment/contract-record.vue

@@ -219,7 +219,8 @@ export default {
           vm.info = res.prj_lists
           vm.info.forEach(i => {
             i.con_lists.forEach(j => {
-              let num = (parseFloat(j.due_amount) - parseFloat(j.received_amount))
+              // let num = (parseFloat(j.due_amount) - parseFloat(j.received_amount))
+              let num = ''
               vm.$set(j, 'amount', num)
             })
           })

src/router/index.js

@@ -296,7 +296,6 @@ export default new Router({
     {path: '/create-base-info', component: CreateBaseInfo, name: 'CreateBaseInfo', meta: {keepAlive: true}},
     {path: '/create-rent-info', component: CreateRentInfo, name: 'CreateRentInfo', meta: {keepAlive: true}},
     {path: '/create-enclosure-info', component: CreateEnclosureInfo, name: 'CreateEnclosureInfo', meta: {keepAlive: true}},
-
     // 我的发票
     {path: '/invoice', component: MyInvoice, name: 'MyInvoice', meta: {keepAlive: false}},
   ],