'fujian'

src/pages/userBindNew/np/accessory-info.vue

@@ -451,15 +451,34 @@ export default {
         vm.$post(url, param).then(function (res) {
           vm.hlsPopup.hideLoading()
           if (res.result === 'S') {
-            vm.$router.push({
+            /*vm.$router.push({
               name: 'NPBankInfo',
-            })
+            })*/
+            vm.attachmentCheck()
           } else {
             hlsPopup.showLongCenter(res.message)
           }
         })
       }
     },
+    attachmentCheck(){
+      let vm = this
+      let url = process.env.basePath + 'bp_attachment_check'
+      let param = {
+        bp_id: window.localStorage.getItem('bp_id'),
+      }
+      vm.hlsPopup.showLoading('正在校验数据')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.$router.push({
+            name: 'NPBankInfo',
+          })
+        } else {
+          hlsPopup.showError(res.message)
+        }
+      })
+    },
     getHouseInfo () {
       let vm = this
       let url = process.env.basePath + 'bp_house_info_query'

src/pages/userBindNew/org/bankInfo.vue

@@ -304,32 +304,6 @@ export default {
           }
         },
       })
-      // this.hlsPopup.showConfirm({
-      //   title: '提示',
-      //   content: '您确认提交吗？',
-      //   onConfirm: data => {
-      //     if (data) {
-      //       let url = $config.basePath + 'bp_bind_submit'
-      //       let param = {
-      //         master: {
-      //           bp_id: this.$route.params.bp_id,
-      //           company_id: '2145',
-      //         },
-      //       }
-      //       let vm = this
-      //       vm.hlsPopup.showLoading('请稍候')
-      //       this.hlsHttp.post(url, param).then(function (res) {
-      //         vm.hlsPopup.hideLoading()
-      //         if (res.result === 'S') {
-      //           vm.hlsPopup.showSuccess('提交成功')
-      //           vm.$router.push({
-      //             name: 'MyInfo',
-      //           })
-      //         }
-      //       })
-      //     }
-      //   },
-      // })
     },
     // 获取个人认证url
     getNpCertificationUrl () {

src/pages/userBindNew/org/enclosure.vue

@@ -414,6 +414,9 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       if (from.name === 'Invoice') {
+        vm.carImg = '',
+        vm.houseImg = '',
+        vm.propertyImg = '', // 不动产识别图片
         vm.propertyInfo = { // 不动产证
           bp_id: vm.$route.params.bp_id,
           right_person: '',
@@ -515,8 +518,8 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-           Object.assign(vm.hauseInfo, res.info)
-          //vm.hauseInfo = res.info
+          Object.assign(vm.hauseInfo, res.info)
+          // vm.hauseInfo = res.info
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -534,8 +537,8 @@ export default {
         vm.hlsPopup.hideLoading()
         console.log('行驶证信息查询', res)
         if (res.result === 'S') {
-           Object.assign(vm.carInfo, res.info)
-         // vm.carInfo = res.info
+          Object.assign(vm.carInfo, res.info)
+          // vm.carInfo = res.info
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -553,72 +556,86 @@ export default {
         vm.hlsPopup.hideLoading()
         console.log('不动产权证查询', res)
         if (res.result === 'S') {
-           Object.assign(vm.propertyInfo, res.info)
-         // vm.propertyInfo = res.info
+          Object.assign(vm.propertyInfo, res.info)
+          // vm.propertyInfo = res.info
         } else {
           hlsPopup.showLongCenter(res.message)
         }
       })
     },
     // 行驶证信息保存
-    saveCarInfo () {
+    async saveCarInfo () {
       let vm = this
       let url = process.env.basePath + 'bp_vehicleLicense_save'
       let param = {
         master: vm.carInfo,
       }
       hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
+      let res = await vm.$post(url, param)
+      if (res.result === 'S') {
         vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          vm.$router.push({
-            name: 'BankInfo',
-            params: {
-              bp_id: vm.bp_id,
-            },
-          })
-        } else {
-          hlsPopup.showLongCenter(res.message)
-        }
-      })
+        return true
+      } else {
+        hlsPopup.showLongCenter(res.message)
+      }
     },
     // 不动产信息保存
-    savePropertyInfo () {
+    async savePropertyInfo () {
       let vm = this
       let url = process.env.basePath + 'bp_real_estate_save'
       let param = {
         master: vm.propertyInfo,
       }
-      // hlsPopup.showLoading('请稍候')
+      let res = await vm.$post(url, param)
+      if (res.result === 'S') {
+        return true
+      } else {
+        hlsPopup.showLongCenter(res.message)
+      }
+    },
+    // 房产证信息保存
+    async saveHouseInfo () {
+      let vm = this
+      let url = process.env.basePath + 'bp_house_info_save'
+      let isSaveCar = await vm.saveCarInfo()
+      let isSaveEstate = await vm.savePropertyInfo()
+      let param = {
+        master: vm.hauseInfo,
+      }
+      hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
-        // vm.hlsPopup.hideLoading()
+        vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-
+         /* vm.$router.push({
+            name: 'BankInfo',
+            params: {
+              bp_id: vm.bp_id,
+            },
+          })*/
+          vm.attachmentCheck()
         } else {
           hlsPopup.showLongCenter(res.message)
         }
       })
     },
-    // 房产证信息保存
-    saveHouseInfo () {
+    attachmentCheck () {
       let vm = this
-      let url = process.env.basePath + 'bp_house_info_save'
-      // vm.hauseInfo.regist_date.substr(0, 10)
-      console.log('regist_date', vm.hauseInfo.regist_date)
+      let url = process.env.basePath + 'bp_attachment_check'
       let param = {
-        /*master: {
-          ...vm.hauseInfo,
-          regist_date: vm.hauseInfo.regist_date.substr(0, 10),
-        },*/
-        master: vm.hauseInfo,
+        bp_id: vm.bp_id,
       }
-      // hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
-        // vm.hlsPopup.hideLoading()
+      vm.hlsPopup.showLoading('正在校验数据')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.saveCarInfo()
+          vm.$router.push({
+            name: 'BankInfo',
+            params: {
+              bp_id: vm.bp_id,
+            },
+          })
         } else {
-          hlsPopup.showLongCenter(res.message)
+          hlsPopup.showError(res.message)
         }
       })
     },
@@ -678,7 +695,7 @@ export default {
         vm.save_picture(list)
         vm.isUploadProperty = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
       }
-      vm.savePropertyInfo()
+      //  vm.savePropertyInfo()
       vm.saveHouseInfo()
     },
     // 房产证/车辆证识别