Merge branch 'ren' into develop

src/pages/userBind/org/bankInfo.vue

@@ -230,7 +230,7 @@ export default {
     border-radius: 6px;
     width: 54px;
     height: 190px;
-    background: url("../../../assets/userBind/delete.png") 16px 84.9px #fde5e8
+    background: url("../../assets/homeImage/delete.png") 16px 84.9px #fde5e8
       no-repeat;
     background-size: 20px 20px;
   }

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-23 17:44:14
+ * @LastEditTime: 2019-09-24 21:39:33
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -54,7 +54,7 @@
             <div slot="name" class="font-color">企业类型</div>
             <input
               slot="content"
-              v-model="baseInfo.legal_property"
+              v-model="baseInfo.enterprise_type"
               placeholder="上传营业执照自动填充"
               class="auto"
             >
@@ -77,7 +77,7 @@
           </item>
           <item>
             <div slot="name" class="font-color">经营地址</div>
-            <input slot="content" v-model="baseInfo.park_address" placeholder="请输入经营地址" >
+            <input slot="content" v-model="baseInfo.business_address" placeholder="请输入经营地址" >
           </item>
           <item>
             <div slot="name" class="font-color">固定电话</div>
@@ -117,7 +117,6 @@
             <input
               slot="content"
               v-model="authMsg.auth_person_name"
-              readonly
               placeholder="上传身份证自动填充"
             >
           </item>
@@ -126,7 +125,6 @@
             <input
               slot="content"
               v-model="authMsg.auth_person_id_card"
-              readonly
               placeholder="上传身份证自动填充"
             >
           </item>
@@ -201,7 +199,7 @@
       <InvoiceInfo v-show="tabNum==2" @getinvoiceList="getinvoiceList" />
     </h-content>
     <bottom-tab class="footer-button">
-      <tab-button class="put">提交</tab-button>
+      <tab-button class="put" @click.native="handSubmit">提交</tab-button>
       <tab-button class="save" @click.native="verified">保存</tab-button>
     </bottom-tab>
     <h-modal ref="modal" v-model="showModalValue" position="bottom" cus-class="search-modal">
@@ -247,7 +245,7 @@
         </list-item>
       </h-content>
       <bottom-tab class="add-box">
-        <tab-button class="add-card">添加</tab-button>
+        <tab-button class="add-card" @click.native="addBankInfo">添加</tab-button>
       </bottom-tab>
     </h-modal>
   </h-view>
@@ -271,8 +269,10 @@ export default {
       img_url: {},
       typeList: [],
       backList: [],
+      saveInfo: {},
       lastInfo: {},
       bp_type_n: '',
+      msg_flag: false,
       invoiceInfo: {},
       maritalList: [],
       academic_bg_n: '',
@@ -280,6 +280,7 @@ export default {
       bp_type_flag: false,
       typeName: '业务经办',
       marital_status_n: '',
+      bank_card_flag: false,
       showModalValue: false,
       type: '请输入业务经办姓名',
       legal_personMsg: {
@@ -293,9 +294,9 @@ export default {
         bp_name: '',
         phone: null,
         auth_flag: '',
-        park_address: '',
+        business_address: '',
         legal_person: '',
-        legal_property: '',
+        enterprise_type: '',
         agent_username: '',
         registered_place: '',
         organization_code: null,
@@ -305,7 +306,7 @@ export default {
       bank_lists: {
         bank_account_num: '',
         bank_account_name: '',
-        bank_card_type: '',
+        bank_card_type: '储蓄卡',
         bank_full_name: '',
         bank_branch_name: '',
       },
@@ -332,6 +333,7 @@ export default {
         vm.baseInfo.bp_type === 'FACTORY'
       ) {
         vm.bp_type_flag = false
+        delete vm.baseInfo.agent_username
       }
     },
     flag () {
@@ -346,22 +348,123 @@ export default {
     this.getBpType()
   },
   methods: {
+    handSubmit () {
+      // let url = $config.basePath + 'bp_bind_submit'
+    },
+    addBankInfo () {
+      for (var key in this.bank_lists) {
+        if (!this.bank_lists[key]) {
+          this.bank_card_flag = false
+          this.hlsPopup.showLongCenter('银行信息不完整！')
+          return
+        } else {
+          this.bank_card_flag = true
+        }
+      }
+      // 银行卡验证this.hlsUtil.isBankAccount(this.bank.bank_account_num)
+      // if (this.hlsUtil.isBankAccount(this.bank_lists.bank_account_num)) {
+      //   this.bank_card_flag = false
+      //   this.hlsPopup.showLongCenter('请输入正确银行卡号！')
+      // }
+      // 验证账户名称与承租人名称一致
+      if (this.bank_lists.bank_account_name !== this.saveInfo.bp_name) {
+        this.bank_card_flag = false
+        this.hlsPopup.showLongCenter('企业名称与账户名称不一致')
+      }
+      if (this.bank_card_flag) {
+        this.hlsPopup.showLoading('请稍后')
+        let url = $config.basePath + 'bp_bank_save'
+        let param = {
+
+          'master': {
+            'bp_id': '7738',
+            'bank_lists': [this.bank_lists],
+          },
+        }
+        let vm = this
+        this.hlsHttp.post(url, param).then(function (res) {
+          console.log(res)
+          if (res.result === 'S') {
+            vm.hlsPopup.hideLoading()
+          }
+        })
+      }
+    },
+
     verified () {
       if (this.flag) {
-        this.baseInfo.auth_flag = '未授权'
-        this.lastInfo = { ...this.baseInfo, ...this.legal_personMsg }
+        this.baseInfo.auth_flag = 'N'
+        this.lastInfo = { ...this.baseInfo, ...this.legal_personMsg, ...this.invoiceInfo }
+        this.saveInfo = {...this.lastInfo, ...this.authMsg}
       } else {
-        this.baseInfo.auth_flag = '已授权'
-        this.lastInfo = { ...this.baseInfo, ...this.authMsg }
+        this.baseInfo.auth_flag = 'Y'
+        this.lastInfo = { ...this.baseInfo, ...this.authMsg, ...this.invoiceInfo }
+        this.saveInfo = { ...this.lastInfo, ...this.legal_personMsg }
       }
-      console.log('last', this.lastInfo)
+      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
+      }
+      // 校验基本信息
       for (var key in vm.lastInfo) {
         if (!vm.lastInfo[key]) {
           vm.hlsPopup.showLongCenter('基本信息不完整！')
+          vm.msg_flag = false
           return
+        } else {
+          vm.msg_flag = true
         }
       }
+      if (!vm.bp_type_flag) {
+        vm.baseInfo.agent_username = ''
+        // vm.saveInfo.agent_username = ''
+      }
+      // 校验电话号
+      let re = this.hlsUtil.phoneNumber(this.invoiceInfo.invoice_bp_address_phone_num)
+      if (!re) {
+        vm.msg_flag = false
+        vm.hlsPopup.showLongCenter('请输入正确电话号')
+      }
+      // 校验身份证号vm.hlsUtil.isCardID(vm.baseInfo.id_card_no)
+      if (vm.flag) {
+        if (vm.hlsUtil.isCardID(vm.saveInfo.id_card_no)) {
+          vm.msg_flag = false
+          vm.hlsPopup.showLongCenter('身份证不正确')
+        }
+      } else {
+        if (vm.hlsUtil.isCardID(vm.saveInfo.auth_person_id_card)) {
+          vm.msg_flag = false
+          vm.hlsPopup.showLongCenter('身份证不正确')
+        }
+      }
+
+      if (vm.msg_flag) {
+        vm.hlsPopup.showLoading('请稍后')
+        let url = $config.basePath + 'bp_org_bind_save'
+        let param = {
+          'master': vm.saveInfo,
+        }
+        vm.hlsHttp.post(url, param).then(function (res) {
+          console.log(res)
+          if (res.result === 'S') {
+            vm.hlsPopup.hideLoading()
+          }
+          // if (res.result === 'S') {
+          //   vm.typeList = res.lists.map(item => {
+          //     return {
+          //       code: item.bp_type,
+          //       code_name: item.bp_type_n,
+          //     }
+          //   })
+          // }
+        })
+      }
     },
     hideModal () {
       this.showModalValue = false
@@ -715,6 +818,9 @@ export default {
   color: #fff;
   // margin-top:-35px;
 }
+.modal {
+  background-color: rgba(0, 0, 0, 0) !important;
+}
 // .add-box{
 //   height: 88px;
 // }