Merge branch 'ren' into develop

src/pages/userBind/np/naturePerson.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: liuxin
  * @Date: 2019-09-19 09:18:14
- * @LastEditTime: 2019-09-26 11:30:03
+ * @LastEditTime: 2019-09-26 19:54:05
  * @LastEditors: Please set LastEditors
  -->
 <template>

src/pages/userBind/org/bankInfo.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-24 21:29:35
- * @LastEditTime: 2019-09-26 17:41:15
+ * @LastEditTime: 2019-09-27 10:15:09
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -80,6 +80,7 @@ export default {
       }
     },
     selectLast (item) {
+      console.log('item', item)
       let num = item.bank_account_num
       return num.substring(num.length - 4)
     },

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-09-26 17:28:42
+ * @LastEditTime: 2019-09-27 10:33:31
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -195,7 +195,8 @@
           </div>
         </div>
       </div>
-      <BankInfo v-show="tabNum==1" :bp_id="bp_id" @getInfo="getInfo" />
+      <!-- <BankInfo v-show="tabNum==1" :bp_id="bp_id" @getInfo="getInfo" /> -->
+      <BankInfo v-show="tabNum==1" :getBankList="getBankList" @getInfo="getInfo" />
       <InvoiceInfo v-show="tabNum==2" @getinvoiceList="getinvoiceList" />
     </h-content>
     <bottom-tab class="footer-button">
@@ -276,6 +277,7 @@ export default {
       msg_flag: false,
       invoiceInfo: {},
       maritalList: [],
+      getBankList: [],
       academic_bg_n: '',
       text: '法人代表信息',
       bp_type_flag: false,
@@ -307,7 +309,7 @@ export default {
       bank_lists: {
         bank_account_num: '',
         bank_account_name: '',
-        bank_card_type: '0',
+        bank_card_type: '储蓄卡',
         bank_full_name: '',
         bank_branch_name: '',
       },
@@ -358,14 +360,30 @@ export default {
   },
   created () {
     this.getBpType()
+    this.getBankInfo()
   },
   methods: {
+    getBankInfo () {
+      let vm = this
+      let bpId = window.localStorage.getItem('user_id')
+      let url = process.env.basePath + 'bp_bank_query'
+      let param = {
+        bp_id: bpId,
+      }
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.getBankList = [...vm.getBankList, ...res.lists]
+        }
+      })
+    },
     handSubmit () {
       let url = $config.basePath + 'bp_bind_submit'
       let param = {
-        'master': {
-          'bp_id': this.bp_id,
-          'company_id': '2145',
+        master: {
+          bp_id: window.localStorage.getItem('user_id'),
+          company_id: '2145',
         },
       }
       let vm = this
@@ -415,11 +433,12 @@ export default {
             vm.hlsPopup.showSuccess('添加成功')
             let url = $config.basePath + 'bp_bank_query'
             let param = {
-              'bp_id': vm.bp_id,
+              bp_id: vm.bp_id,
             }
 
             vm.hlsHttp.post(url, param).then(function (res) {
               console.log('银行卡查询', res)
+              vm.getBankList = [...vm.getBankList, ...res.lists]
             })
           }
         })
@@ -427,7 +446,7 @@ export default {
     },
 
     verified () {
-      debugger
+      // debugger
       if (this.flag) {
         this.baseInfo.auth_flag = 'N'
         this.lastInfo = { ...this.baseInfo, ...this.legal_personMsg, ...this.invoiceInfo }
@@ -440,17 +459,68 @@ export default {
       console.log('last', this.lastInfo, this.invoiceInfo)
       let vm = this
       // 校验开票信息
-      let arr = Object.keys(vm.invoiceInfo)
-      if (arr.length !== 6) {
-        vm.msg_flag = false
-        vm.hlsPopup.showLongCenter('开票信息不完整！')
-      } else {
-        vm.msg_flag = true
-      }
+      // let arr = Object.keys(vm.invoiceInfo)
+      // if (arr.length !== 6) {
+      //   vm.msg_flag = false
+      //   vm.hlsPopup.showLongCenter('开票信息不完整！')
+      // } else {
+      //   vm.msg_flag = true
+      // }
       // 校验基本信息
       for (var key in vm.lastInfo) {
         if (!vm.lastInfo[key]) {
-          vm.hlsPopup.showLongCenter('基本信息不完整！')
+          console.log('key', key)
+          switch (key) {
+            case 'bp_type':
+              vm.hlsPopup.showLongCenter('客户类型未填写')
+              break
+            case 'bp_name':
+              vm.hlsPopup.showLongCenter('公司名称未填写')
+              break
+            case 'enterprise_type':
+              vm.hlsPopup.showLongCenter('企业类型未填写')
+              break
+            case 'organization_code':
+              vm.hlsPopup.showLongCenter('统一社会信用代码未填写')
+              break
+            case 'registered_capital':
+              vm.hlsPopup.showLongCenter('注册资本未填写')
+              break
+            case 'legal_person':
+              vm.hlsPopup.showLongCenter('法定代表人未填写')
+              break
+            case 'registered_place':
+              vm.hlsPopup.showLongCenter('注册地址未填写')
+              break
+            case 'business_address':
+              vm.hlsPopup.showLongCenter('经营地址未填写')
+              break
+            case 'phone':
+              vm.hlsPopup.showLongCenter('固定电话未填写')
+              break
+            case 'id_card_no':
+              vm.hlsPopup.showLongCenter('身份证未填写')
+              break
+            case 'cell_phone':
+              vm.hlsPopup.showLongCenter('手机号未填写')
+              break
+            case 'living_address':
+              vm.hlsPopup.showLongCenter('居住地址未填写')
+              break
+            case 'auth_person_name':
+              vm.hlsPopup.showLongCenter('授权人姓名未填写')
+              break
+            case 'auth_person_id_card':
+              vm.hlsPopup.showLongCenter('身份证号未填写')
+              break
+            case 'auth_person_position':
+              vm.hlsPopup.showLongCenter('公司职务未填写')
+              break
+            case 'auth_person_matter':
+              vm.hlsPopup.showLongCenter('授权事项未填写')
+              break
+          }
+          // vm.hlsPopup.showLongCenter('基本信息不完整！')
           vm.msg_flag = false
           return
         } else {