Merge branch 'ren' into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-24 10:21:55
+ * @LastEditTime: 2019-10-24 14:51:39
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -172,6 +172,7 @@ export default {
       isshow: false, // 提示框的显示与隐藏
       num: 0,
       project_id: '',
+      bank_flag: false,
       confirm_id: '',
       conditionInfo: {},
       check1: Check1,
@@ -196,6 +197,7 @@ export default {
     next()
   },
   activated () {
+    this.bankCardQuery()
     // console.log('...........', this.$route.params.confirm_status)
     // if (window.sessionStorage.getItem('add_status') === 'true') { // 根据add_status值改变entry_info_flag，传入银行卡录入页面，负责重置数据与否
     //   this.entry_info_flag = true
@@ -249,8 +251,8 @@ export default {
       })
     },
     inSure () {
-      console.log(typeof window.sessionStorage.getItem('add_status'))
-      if (window.sessionStorage.getItem('add_status') === 'true') {
+      // console.log(typeof window.sessionStorage.getItem('add_status'))
+      if (this.bank_flag) {
         // this.entry_info_flag = true
         let vm = this
         let url = $config.basePath + 'con_bp_confirm'
@@ -273,6 +275,37 @@ export default {
         // this.entry_info_flag = false
       }
     },
+
+    // 银行卡查询
+    bankCardQuery () {
+      let vm = this
+      let url = $config.basePath + 'con_bank_query'
+      let param = {
+        project_id: vm.project_id,
+      }
+      vm.hlsHttp.post(url, param).then(function (res) {
+        console.log('bankcardinfo。。。。。。。。。。。。', res)
+        if (res.result === 'S') {
+          if (!(JSON.stringify(res.info) === '{}')) {
+            // vm.bank_lists = [res.info]
+            // console.log(vm.bank_lists[0])
+            vm.bank_flag = true
+          } else {
+            vm.bank_flag = false
+            // this.bank_lists = [
+            //   {
+            //     bank_full_name: '', // 银行名称
+            //     bank_account_num: '', // 卡号
+            //     bank_account_name: '',
+            //     bank_branch_name: '',
+            //   },
+            // ]
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
   },
 }
 </script>

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-23 18:36:01
+ * @LastEditTime: 2019-10-24 14:51:12
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -127,7 +127,7 @@ export default {
     },
     // val: project_id, status: confirm_status
     goDetails (val, status, id) { // 银行卡录入页面keep alive为true，根据project_id和add_status重置页面
-      window.sessionStorage.setItem('add_status', false)
+      // window.sessionStorage.setItem('add_status', false)
       this.$router.push({
         name: 'ContractDetail',
         params: {

src/pages/contractSigning/entry-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-24 10:32:12
+ * @LastEditTime: 2019-10-24 14:52:02
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -99,7 +99,6 @@ export default {
   watch: {},
   activated () {
     this.name = this.$route.params.name
-    this.bankCardQuery()
     //  || !this.$route.params.entry_info_flag
     if (this.project_id !== this.$route.params.project_id) {
       this.project_id = this.$route.params.project_id
@@ -113,6 +112,7 @@ export default {
         },
       ]
     }
+    this.bankCardQuery()
   },
   methods: {
     // ocr识别入口
@@ -215,7 +215,7 @@ export default {
           console.log('银行信息录入', res)
           if (res.result === 'S') {
             vm.hlsPopup.showSuccess('保存成功')
-            window.sessionStorage.setItem('add_status', true)
+            // window.sessionStorage.setItem('add_status', true)
             vm.$routeGo()
             // vm.$router.push({
             //   name: 'ContractDetail',
@@ -237,8 +237,22 @@ export default {
       }
       vm.hlsHttp.post(url, param).then(function (res) {
         console.log('bankcardinfo。。。。。。。。。。。。', res)
-        if (!(JSON.stringify(res.info) === '{}')) {
-          vm.bank_lists[0] = res.info
+        if (res.result === 'S') {
+          if (!(JSON.stringify(res.info) === '{}')) {
+            vm.bank_lists = [res.info]
+            // console.log(vm.bank_lists[0])
+          } else {
+            this.bank_lists = [
+              {
+                bank_full_name: '', // 银行名称
+                bank_account_num: '', // 卡号
+                bank_account_name: '',
+                bank_branch_name: '',
+              },
+            ]
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
         }
       })
     },

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-10-24 09:10:29
+ * @LastEditTime: 2019-10-24 15:53:19
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -63,9 +63,9 @@
         </div>
         <div class="center">
           <p>业务经办：{{ baseInfo.bp_user_id_n }}</p>
-          <p>联系电话：{{ baseInfo.cell_phone }}</p>
+          <p>联系电话：{{ baseInfo.agent_phone }}</p>
         </div>
-        <div class="right1" @click="callUp(baseInfo.phone)">
+        <div class="right1" @click="callUp(baseInfo.agent_phone)">
           <img src="@/assets/distributorSign/calls.png" alt="">
         </div>
       </div>
@@ -158,9 +158,9 @@
         </div>
         <div class="center">
           <p>业务经办：{{ baseInfo.bp_user_id_n }}</p>
-          <p>联系电话：{{ baseInfo.phone }}</p>
+          <p>联系电话：{{ baseInfo.agent_phone }}</p>
         </div>
-        <div class="right1" @click="callUp(baseInfo.phone)">
+        <div class="right1" @click="callUp(baseInfo.agent_phone)">
           <img src="@/assets/distributorSign/calls.png" alt="">
         </div>
       </div>

src/pages/intoApproval/intoApproval/base.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-25 10:20:35
- * @LastEditTime: 2019-10-09 21:49:42
+ * @LastEditTime: 2019-10-24 16:04:40
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -191,9 +191,9 @@
           </div>
           <div class="center">
             <p>业务经办：{{ bp_user_id_n }}</p>
-            <p>联系电话：{{ cell_phone }}</p>
+            <p>联系电话：{{ personInfo.agent_phone }}</p>
           </div>
-          <div class="right1" @click="callUp(cell_phone)">
+          <div class="right1" @click="callUp(personInfo.agent_phone)">
             <img src="@/assets/distributorSign/calls.png" alt="">
           </div>
         </div>
@@ -318,9 +318,9 @@
           </div>
           <div class="center">
             <p>业务经办：{{ bp_user_id_n }}</p>
-            <p>联系电话：{{ cell_phone }}</p>
+            <p>联系电话：{{ companyInfo.agent_phone }}</p>
           </div>
-          <div class="right1" @click="callUp(cell_phone)">
+          <div class="right1" @click="callUp(companyInfo.agent_phone)">
             <img src="@/assets/distributorSign/calls.png" alt="">
           </div>
         </div>
@@ -416,6 +416,7 @@ export default {
         cell_phone: '',
         marital_status: '',
         bp_name: '',
+        agent_phone: '',
         address_on_resident_booklit: '',
         working_place_sp: '',
         academic_background: '',
@@ -428,6 +429,7 @@ export default {
         registered_capital: '',
         auth_person_name: '',
         auth_flag: '',
+        agent_phone: '',
         bp_name: '',
         registered_place: '',
         phone: '',