Merge branch 'ren' into develop

src/pages/userBind/userBind.vue

@@ -10,7 +10,7 @@
       <div class="info">
         <div class="info-icon">
           <img src="@/assets/userBind/info.png" >
-          <span @click="goEnterprise">温馨提示</span>
+          <span>温馨提示</span>
         </div>
         <p>绑定成功后，您即可使用APP中合同查询、还款查询等功能。</p>
       </div>
@@ -66,11 +66,6 @@ export default {
         },
       })
     },
-    goEnterprise () {
-      this.$router.push({
-        name: 'EnterpriseNew',
-      })
-    },
   },
 }
 </script>

src/pages/userBindNew/org/baseInfo.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-12-13 10:53:10
+ * @LastEditTime: 2019-12-16 16:22:55
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -1411,7 +1411,7 @@ export default {
           if (vm.idCardFrontEditFlag) { // 法定代表人身份证正面图片已修改，重新上传
             vm.idCardFrontUrlFlag = true
             vm.delete_pic_to_ocr(vm.idCardFrontAttachmentId)// 先删除之前识别的图片
-            var list = []
+            let list = []
             let obj = {
               'pkvalue': vm.idCardFrontCheck_id,
               'source_type': 'PRJ_CDD_ITEM_CHECK',
@@ -1429,7 +1429,7 @@ export default {
           if (vm.idCardBackEditFlag) { // 法定代表人身份证背面图片已修改，重新上传
             vm.idCardBackUrlFlag = true
             vm.delete_pic_to_ocr(vm.idCardBackAttachmentId)// 先删除之前识别的图片
-            var list = []
+            let list = []
             let obj = {
               'pkvalue': vm.idCardBackCheck_id,
               'source_type': 'PRJ_CDD_ITEM_CHECK',
@@ -1447,7 +1447,7 @@ export default {
           if (vm.authidCardFrontEditFlag) { // 授权人身份证正面图片已修改，重新上传
             vm.authidCardFrontUrlFlag = true
             vm.delete_pic_to_ocr(vm.authidCardFrontAttachmentId)// 先删除之前识别的图片
-            var list = []
+            let list = []
             let obj = {
               'pkvalue': vm.authidCardFrontCheck_id,
               'source_type': 'PRJ_CDD_ITEM_CHECK',
@@ -1465,7 +1465,7 @@ export default {
           if (vm.authidCardBackEditFlag) { // 授权人身份证背面图片已修改，重新上传
             vm.authidCardBackUrlFlag = true
             vm.delete_pic_to_ocr(vm.authidCardBackAttachmentId)// 先删除之前识别的图片
-            var list = []
+            let list = []
             let obj = {
               'pkvalue': vm.authidCardBackCheck_id,
               'source_type': 'PRJ_CDD_ITEM_CHECK',
@@ -1483,7 +1483,7 @@ export default {
           if (vm.licenseEditFlag) { // 营业执照图片已修改，重新上传
             vm.licenseImgUrlFlag = true
             vm.delete_pic_to_ocr(vm.licenseAttachmentId)// 先删除之前识别的图片
-            var list = []
+            let list = []
             let obj = {
               'pkvalue': vm.licenseCheck_id,
               'source_type': 'PRJ_CDD_ITEM_CHECK',
@@ -1501,7 +1501,7 @@ export default {
           if (vm.LaEditFlag) { // 授权书图片已修改，重新上传
             vm.laImgUrlFlag = true
             vm.delete_pic_to_ocr(vm.laAttachmentId)// 先删除之前识别的图片
-            var list = []
+            let list = []
             let obj = {
               'pkvalue': vm.laCheck_id,
               'source_type': 'PRJ_CDD_ITEM_CHECK',

src/pages/userBindNew/org/enclosure.vue

@@ -2,7 +2,7 @@
  * @Description: 附件信息
  * @Author: your name
  * @Date: 2019-09-20 09:35:11
- * @LastEditTime: 2019-12-13 16:15:32
+ * @LastEditTime: 2019-12-16 16:32:08
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -135,6 +135,100 @@
               </item>
             </list-item>
           </div>
+
+          <!-- <div v-if="list.cdd_item==='REAL_EST_CERTIFICATE'">
+            <div v-if="!propertyImg" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
+              <img src="@/assets/userBind/camera.png" class="upload-btn" >
+            </div>
+
+            <div v-if="propertyImg&&isApproved" class="card-upload">
+              <img :src="propertyImg" @click="showBigPicture(propertyImg)">
+            </div>
+
+            <div v-if="propertyImg&&!isApproved" class="card-upload">
+              <img :src="propertyImg" @click="ocrShow(list.cdd_item, '')">
+            </div>
+          </div> -->
+          <!-- <div v-if="list.cdd_item==='REAL_EST_CERTIFICATE'">
+            <list-item :item-height="44" class="card-Info">
+              <item>
+                <div slot="name">权利人</div>
+                <input
+                  slot="content"
+                  v-model="propertyInfo.right_person"
+                  placeholder="识别不动产权证自动填充"
+                >
+              </item>
+              <item>
+                <div slot="name">共有情况</div>
+                <input
+                  slot="content"
+                  v-model="propertyInfo.public_situation"
+                  placeholder="识别不动产权证自动填充"
+                >
+              </item>
+              <item>
+                <div slot="name">坐落</div>
+                <input
+                  slot="content"
+                  v-model="propertyInfo.house_located"
+                  placeholder="识别不动产权证自动填充"
+                >
+              </item>
+              <item>
+                <div slot="name">不动产单元号</div>
+                <input
+                  slot="content"
+                  v-model="propertyInfo.real_unit_number"
+                  placeholder="识别不动产权证自动填充"
+                >
+              </item>
+              <item>
+                <div slot="name">权利类型</div>
+                <input
+                  slot="content"
+                  v-model="propertyInfo.right_type"
+                  placeholder="识别不动产权证自动填充"
+                >
+              </item>
+              <item>
+                <div slot="name">权利性质</div>
+                <input
+                  slot="content"
+                  v-model="propertyInfo.right_property"
+                  placeholder="识别不动产权证自动填充"
+                >
+              </item>
+              <item>
+                <div slot="name">用途</div>
+                <input
+                  slot="content"
+                  v-model="propertyInfo.house_purpose"
+                  placeholder="识别不动产权证自动填充"
+                >
+              </item>
+              <item>
+                <div slot="name">面积</div>
+                <input
+                  slot="content"
+                  v-model="propertyInfo.house_area"
+                  placeholder="识别不动产权证自动填充"
+                >
+              </item>
+              <item>
+                <div slot="name">使用期限</div>
+                <input
+                  slot="content"
+                  v-model="propertyInfo.land_use_limit"
+                  placeholder="识别不动产权证自动填充"
+                >
+              </item>
+              <item>
+                <div slot="name">权利其他状况</div>
+                <input slot="content" v-model="propertyInfo.right_others" placeholder="识别不动产权证自动填充" >
+              </item>
+            </list-item>
+          </div> -->
           <!-- 车辆 -->
           <div v-if="list.cdd_item==='CAR_CARD'">
             <div v-if="!carImg" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
@@ -269,6 +363,7 @@ export default {
       houseFlag: false, // 房产证查看标识，为false则用查询出来的，为true则用拍照出来的
       carImg: '',
       houseImg: '',
+      propertyImg: '', // 不动产识别图片
       from: false,
       bp_id: '',
       flag: false,
@@ -311,6 +406,19 @@ export default {
         land_get_method: '',
         land_use_limit: '',
       },
+      propertyInfo: {
+        bp_id: this.$route.params.bp_id,
+        right_person: '',
+        public_situation: '',
+        house_located: '',
+        real_unit_number: '',
+        right_type: '',
+        right_property: '',
+        house_purpose: '',
+        house_area: '',
+        land_use_limit: '',
+        right_others: '',
+      },
     }
   },
   watch: {},
@@ -325,6 +433,7 @@ export default {
         vm.loadItemList()
         vm.houseQuery()
         vm.carQuery()
+        // vm.propertyQuery() // 不动产权证查询
       }
     })
   },
@@ -357,6 +466,7 @@ export default {
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
+        console.log('行驶证信息查询', res)
         if (res.result === 'S') {
           Object.assign(vm.carInfo, res.info)
         } else {
@@ -364,6 +474,24 @@ export default {
         }
       })
     },
+    // 不动产权证查询
+    propertyQuery () {
+      let vm = this
+      let url = process.env.basePath + 'bp_real_estate_query'
+      let param = {
+        bp_id: vm.bp_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        console.log('不动产权证查询', res)
+        if (res.result === 'S') {
+          Object.assign(vm.propertyInfo, res.info)
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     // 行驶证信息保存
     saveCarInfo () {
       let vm = this
@@ -386,12 +514,34 @@ export default {
         }
       })
     },
+    // 不动产信息保存
+    savePropertyInfo () {
+      let vm = this
+      let url = process.env.basePath + 'bp_real_estate_save'
+      let param = {
+        master: vm.propertyInfo,
+      }
+      // hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        // vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     // 房产证信息保存
     saveHouseInfo () {
       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 param = {
-        master: vm.hauseInfo,
+        master: {
+          ...vm.hauseInfo,
+          regist_date: vm.hauseInfo.regist_date.substr(0, 10),
+        },
       }
       // hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
@@ -584,7 +734,7 @@ export default {
                 break
             }
           })
-          vm.cddItemList = res.lists.filter(item => { return item.cdd_item === 'HOUSE_CARD' || item.cdd_item === 'CAR_CARD' || item.cdd_item === 'ASSETS_CARD' })
+          vm.cddItemList = res.lists.filter(item => { return item.cdd_item === 'HOUSE_CARD' || item.cdd_item === 'CAR_CARD' || item.cdd_item === 'ASSETS_CARD' || item.cdd_item === 'REAL_EST_CERTIFICATE' })
           // 查询图片
           vm.cddItemList.forEach((item, index) => {
             vm.load_picture(item.check_id, index, item.cdd_item)
@@ -843,8 +993,6 @@ export default {
         padding-bottom: 8px;
         height: auto;
         background-color: #fff;
-        margin-bottom: 10px;
-
         display: flex;
         flex-direction: column;
 

src/pages/userBindNew/userBind.vue

@@ -66,11 +66,6 @@ export default {
         },
       })
     },
-    goEnterprise () {
-      this.$router.push({
-        name: 'EnterpriseNew',
-      })
-    },
   },
 }
 </script>