Merge branch 'ren' into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-18 09:25:05
+ * @LastEditTime: 2019-12-18 10:43:37
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -330,7 +330,7 @@ export default {
       tabNum: null,
       bp_name: '',
       showModalValue: false,
-      credit_status: '', // 一个月内是否查过征信
+      credit_status: 'N', // 一个月内是否查过征信 N查过
       guarantorInfo: [], // 担保人信息
       bp_class: this.$route.params.item.bp_class, // 承租人性质(自然人，企业)
       info: {}, // 租赁信息
@@ -349,7 +349,7 @@ export default {
       uncheck1: unCheck1,
       uncheck2: unCheck2,
       uncheck3: unCheck3,
-      con_confirm_status: this.$route.params.item.confirm_status,
+      con_confirm_status: '',
       entry_info_flag: false,
       faceListUpload: [], // 自拍照上传
       auth_credit_flag: 'N', // 征信授权书确认状态
@@ -387,7 +387,6 @@ export default {
         vm.bank_flag = false
         vm.isConfirm = false
         vm.ischecked = false
-        vm.credit_status = ''
         vm.showModalValue = false
         vm.tabNum = vm.$route.params.num
         vm.confirm_note = '' // 审批意见
@@ -398,7 +397,7 @@ export default {
         vm.abc_deduction_flag = vm.$route.params.item.abc_deduction_flag
         vm.project_id = vm.$route.params.item.project_id
         vm.confirm_id = vm.$route.params.item.confirm_id
-        vm.con_confirm_status = vm.$route.params.item.confirm_status
+        vm.con_confirm_status = vm.$route.params.item.confirm_status // 提交状态
         vm.agentPic = vm.unRead
         vm.leasePic = vm.unRead
         if (vm.$route.params.item.bp_class === 'NP') {
@@ -422,7 +421,7 @@ export default {
   },
   mounted () {
     if (this.con_confirm_status !== 'APPROVED') {
-      this.popProtocol()
+      // this.popProtocol()
     }
   },
   methods: {
@@ -434,7 +433,7 @@ export default {
         bp_class: vm.baseInfo.bp_class,
         bp_id: vm.baseInfo.bp_id,
       }
-      vm.hlsPopup.showLoading('提交数据中!')
+      vm.hlsPopup.showLoading('请稍后!')
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         console.log('征信查询', res)
@@ -455,6 +454,7 @@ export default {
       let url = process.env.basePath + 'get_sign_url'
       let param = {
         confirm_id: vm.confirm_id,
+        data_class: 'PRJ_PROJECT',
       }
       vm.hlsPopup.showLoading('请稍后')
       vm.hlsHttp.post(url, param).then(function (res) {
@@ -649,17 +649,17 @@ export default {
         hlsPopup.hideLoading()
       }
     },
-    popProtocol () {
-      let modal = document.querySelector('.myModal')
-      let alpha = 0
-      let addOpacity = setInterval(() => {
-        alpha += 1
-        modal.style.backgroundColor = `rgba(56,63,69,${alpha / 100})`
-        if (alpha >= 30) {
-          clearInterval(addOpacity)
-        }
-      }, 10)
-    },
+    // popProtocol () {
+    //   let modal = document.querySelector('.myModal')
+    //   let alpha = 0
+    //   let addOpacity = setInterval(() => {
+    //     alpha += 1
+    //     modal.style.backgroundColor = `rgba(56,63,69,${alpha / 100})`
+    //     if (alpha >= 30) {
+    //       clearInterval(addOpacity)
+    //     }
+    //   }, 10)
+    // },
     // 授权书勾选
     select () {
       this.ischecked = !this.ischecked

src/pages/myInfo/my-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-11-07 17:48:53
- * @LastEditTime: 2019-12-16 17:31:46
+ * @LastEditTime: 2019-12-18 13:41:07
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->

src/pages/userBindNew/org/bankInfo.vue

@@ -136,6 +136,7 @@ export default {
       },
       showModalValue: false,
       bank_card_flag: false, // 银行卡信息是否完整
+      certification_status: '', // 电子签认证状态值Y/N
     }
   },
   beforeRouteEnter (to, from, next) {
@@ -144,7 +145,9 @@ export default {
         vm.bankImg = '' // 银行卡图片
         vm.showModalValue = false
         vm.bank_card_flag = false
+        vm.certification_status = ''
         vm.getBankInfo()
+        vm.electQuery()
       }
     })
   },
@@ -164,6 +167,21 @@ export default {
         }
       })
     },
+    // 电子签认证状态查询
+    electQuery () {
+      let vm = this
+      let url = process.env.basePath + 'bp_elec_check'
+      let param = {
+        bp_id: vm.$route.params.bp_id,
+      }
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.certification_status = res.info.certification_status
+        }
+      })
+    },
     hideModal () {
       this.showModalValue = false
     },
@@ -246,9 +264,15 @@ export default {
             this.hlsHttp.post(url, param).then(function (res) {
               if (res.result === 'S') {
                 vm.hlsPopup.showSuccess('提交成功')
+                if (vm.certification_status === 'Y') {
                   vm.$router.push({
                     name: 'MyInfo',
                   })
+                } else {
+                  vm.$router.push({
+                    name: 'ElectronicSign',
+                  })
+                }
               }
             })
           }

src/pages/userBindNew/org/enclosure.vue

@@ -2,7 +2,7 @@
  * @Description: 附件信息
  * @Author: your name
  * @Date: 2019-09-20 09:35:11
- * @LastEditTime: 2019-12-17 17:12:58
+ * @LastEditTime: 2019-12-18 11:13:47
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -353,8 +353,10 @@ export default {
     return {
       house_id: '', // 房产证checkid
       car_id: '', // 车辆证checkid
+      property_id: '', // 不动产checkid
       carFlag: false, // 行驶证查看标识，为false则用查询出来的，为true则用拍照出来的
       houseFlag: false, // 房产证查看标识，为false则用查询出来的，为true则用拍照出来的
+      propertyFlag: false, // 不动产证查看标识，为false则用查询出来的，为true则用拍照出来的
       carImg: '',
       houseImg: '',
       propertyImg: '', // 不动产识别图片
@@ -364,9 +366,10 @@ export default {
       isApproved: false,
       isUploadCar: false,
       isUploadHouse: false,
-      isProperty: false,
+      isUploadProperty: false,
       carAttachmentId: '', // 车辆证id
       houseAttachmentId: '', // 房产证id
+      propertyAttachmentId: '', // 不动产证id
       cddItemList: [], // 资料清单列表
       dowload_list: [], // 下载图片列表
       upload_list: [], // 上传图片列表
@@ -428,7 +431,7 @@ export default {
         vm.loadItemList()
         vm.houseQuery()
         vm.carQuery()
-        // vm.propertyQuery() // 不动产权证查询
+        vm.propertyQuery() // 不动产权证查询
       }
     })
   },
@@ -586,6 +589,25 @@ export default {
         vm.save_picture(list)
         vm.isUploadCar = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
       }
+      if (vm.isUploadProperty) {
+        vm.propertyFlag = true
+        vm.delete_pic_to_ocr(vm.propertyAttachmentId) // 房产证修改，重新上传
+        let list = []
+        let obj = {
+          pkvalue: vm.property_id,
+          source_type: 'PRJ_CDD_ITEM_CHECK',
+          picture: '',
+          check_id: vm.property_id,
+          filePath: vm.propertyImg,
+          attachment_id: '',
+          user_id: 1,
+          fileName: '不动产权证',
+        }
+        list.push(obj)
+        vm.save_picture(list)
+        vm.isUploadProperty = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
+      }
+      vm.savePropertyInfo()
       vm.saveHouseInfo()
     },
     // 房产证/车辆证识别
@@ -623,7 +645,7 @@ export default {
             vm.carImg = imgdata
             vm.carCardIdentify(imgdata)
           } else if (ocrType === 'REAL_EST_CERTIFICATE') {
-            vm.isProperty = true
+            vm.isUploadProperty = true
             vm.propertyImg = imgdata
             vm.propertyIdentify(imgdata)
           }
@@ -655,7 +677,7 @@ export default {
             vm.isUploadCar = true
             vm.carCardIdentify(imgUrl[0])
           } else if (ocrType === 'REAL_EST_CERTIFICATE') {
-            vm.isProperty = true
+            vm.isUploadProperty = true
             vm.propertyImg = imgUrl[0]
             vm.propertyIdentify(imgUrl[0])
           }
@@ -753,6 +775,9 @@ export default {
               case 'CAR_CARD': // 行驶证
                 vm.car_id = item.check_id
                 break
+              case 'REAL_EST_CERTIFICATE': // 不动产
+                vm.property_id = item.check_id
+                break
               default:
                 break
             }
@@ -795,6 +820,12 @@ export default {
               }
               vm.carAttachmentId = res.lists[0].attachment_id
               break
+            case 'REAL_EST_CERTIFICATE': // 行驶证
+              if (!vm.propertyFlag) {
+                vm.propertyImg = res.lists[0].url
+              }
+              vm.propertyAttachmentId = res.lists[0].attachment_id
+              break
             case 'ASSETS_CARD':
               console.log('ASSETS_CARD............', res.lists)
               vm.dowload_list = [...res.lists]