Merge branch 'liuxin' into develop

src/pages/userBindNew/org/bankInfo.vue

@@ -57,7 +57,7 @@
       </div>
     </div>
     <bottom-tab class="footer-button">
-      <tab-button class="save" @click.native="putData">提交</tab-button>
+      <tab-button class="save" @click.native="handSubmit">提交</tab-button>
     </bottom-tab>
     <h-modal ref="modal" v-model="showModalValue" position="bottom">
       <h-view>

src/pages/userBindNew/org/baseInfo.vue

@@ -856,6 +856,37 @@ export default {
         this.hlsPopup.showLongCenter('请先保存！')
       }
     },
+    // 基本信息保存前校验
+    bindCheck () {
+      let vm = this
+      var business_num = ''
+      if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') {
+        business_num = vm.baseInfo.agent_username
+      }
+      let url = process.env.basePath + 'bp_bind_check'
+      let param = {
+        bp_class: 'ORG',
+        bp_type: vm.baseInfo.bp_type,
+        business_num: business_num,
+      }
+      vm.hlsPopup.showLoading('正在校验数据有效性')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.$router.push({
+            name: 'Invoice',
+            params: {
+              bp_id: vm.bp_id,
+              organization_code: vm.baseInfo.organization_code,
+              from: vm.from,
+              bp_name: vm.baseInfo.bp_name,
+            },
+          })
+        } else {
+          hlsPopup.showError(res.message)
+        }
+      })
+    },
     // 校验手机号
     phoneCheck (phone) {
       if (!hlsUtil.phoneNumber(phone) && !hlsUtil.phoneNumber86(phone)) {
@@ -1102,15 +1133,7 @@ export default {
           if (res.result === 'S') {
             // vm.hlsPopup.showSuccess('保存成功,请去维护附件信息')
             vm.bp_id = res.bp_id
-            vm.$router.push({
-              name: 'Invoice',
-              params: {
-                bp_id: vm.bp_id,
-                organization_code: vm.baseInfo.organization_code,
-                from: vm.from,
-                bp_name: vm.baseInfo.bp_name,
-              },
-            })
+            vm.bindCheck()
             // 查询资料清单
             vm.loadItemList()
           } else {