Merge branch 'ren' into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-23 18:37:15
+ * @LastEditTime: 2019-10-24 10:21:55
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -126,7 +126,7 @@
             <img src="@/assets/constractSigning/read.png" alt="" class="read">
           </div>
           <div slot="content" class="in-all">
-            <div v-show="confirm_status === 'SUBMIT'" @click="entryInfo"><img src="@/assets/constractSigning/scan.png" alt=""></div>
+            <div @click="entryInfo"><img src="@/assets/constractSigning/scan.png" alt=""></div>
             <div @click="goContractContent('农行代扣授权书')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
           </div>
 
@@ -197,11 +197,11 @@ export default {
   },
   activated () {
     // console.log('...........', this.$route.params.confirm_status)
-    if (window.sessionStorage.getItem('add_status') === 'true') { // 根据add_status值改变entry_info_flag，传入银行卡录入页面，负责重置数据与否
-      this.entry_info_flag = true
-    } else {
-      this.entry_info_flag = false
-    }
+    // if (window.sessionStorage.getItem('add_status') === 'true') { // 根据add_status值改变entry_info_flag，传入银行卡录入页面，负责重置数据与否
+    //   this.entry_info_flag = true
+    // } else {
+    //   this.entry_info_flag = false
+    // }
   },
   methods: {
     // 合同商务条件查询

src/pages/contractSigning/entry-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-24 09:24:21
+ * @LastEditTime: 2019-10-24 10:32:12
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -100,7 +100,8 @@ export default {
   activated () {
     this.name = this.$route.params.name
     this.bankCardQuery()
-    if (this.project_id !== this.$route.params.project_id || !this.$route.params.entry_info_flag) {
+    //  || !this.$route.params.entry_info_flag
+    if (this.project_id !== this.$route.params.project_id) {
       this.project_id = this.$route.params.project_id
       this.bankImg = ''
       this.bank_lists = [
@@ -233,6 +234,9 @@ 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
+        }
       })
     },
   },

src/pages/financingTrial/financing-trial.vue

@@ -2,7 +2,7 @@
  * @Descrip 融资试算
  * @Author: your name
  * @Date: 2019-09-29 17:09:49
- * @LastEditTime: 2019-10-18 10:11:01
+ * @LastEditTime: 2019-10-24 10:52:13
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -70,6 +70,19 @@ export default {
     }
     next()
   },
+  activated () {
+    // let vm = this
+    // let url = $config.basePath + 'con_bank_query'
+    // let param = {
+    //   project_id: vm.$route.params.project_id,
+    // }
+    // vm.hlsHttp.post(url, param).then(function (res) {
+    //   console.log('bankcardinfo。。。。。。。。。。。。', res)
+    //   if (!(JSON.stringify(res.info) === '{}')) {
+    //     vm.bank_lists[0] = res.info
+    //   }
+    // })
+  },
   created () {
 
   },

src/pages/myProductCollection/my-product-list.Vue

+<!--
+ * @Author: your name
+ * @Date: 2019-10-22 20:26:28
+ * @LastEditTime: 2019-10-24 12:28:54
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \hls-xcmg-vue-app\src\pages\myProductCollection\my-product-list.Vue
+ -->
+
 /**
 * @Author Sean
 * @Date 2019/10/22
@@ -46,8 +55,8 @@
 </template>
 
 <script>
-    export default {
-        data() {
+export default {
+  data () {
     return {
       productList: [],
     }
@@ -68,7 +77,7 @@
     })
   },
   methods: {
-          getList(){
+    getList () {
       let vm = this
       let url = $config.basePath + 'my_collection_query'
       let param = {
@@ -93,8 +102,8 @@
         },
       })
     },
-        }
-    }
+  },
+}
 </script>
 
 <style scoped lang="less" rel="stylesheet">

src/pages/userBind/org/enterprise.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-10-23 14:04:33
+ * @LastEditTime: 2019-10-24 10:00:33
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -781,6 +781,9 @@ export default {
               case 'bp_type':
                 vm.hlsPopup.showLongCenter('客户类型未填写')
                 break
+              case 'agent_username':
+                vm.hlsPopup.showLongCenter('业务经办员工代码未填写')
+                break
               case 'bp_name':
                 vm.hlsPopup.showLongCenter('公司名称未填写')
                 break