Merge branch 'liuxin' into develop

src/pages/myInfo/my-info.vue

@@ -451,6 +451,7 @@ export default {
             window.localStorage.setItem('width', width)
             window.localStorage.setItem('height', height)
             vm.$router.push('/login')
+            location.reload()
           }
         },
       })

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

@@ -7,15 +7,8 @@
       </div>
     </h-header>
     <h-content>
-      <div
-        class="userInfo"
-      >附件信息
-      </div>
-      <div
-        v-for="(list, index) in cddItemList"
-        :key="index"
-        class="card"
-      >
+      <div class="userInfo">附件信息</div>
+      <div v-for="(list, index) in cddItemList" :key="index" class="card">
         <span style="color:#1D3FFF">{{ list.description }}</span>
         <div class="img-content">
           <!--待上传图片列表-->
@@ -33,11 +26,7 @@
             </div>
             <!--从服务器上下载的图片-->
             <div v-for="(pic, index) in dowload_list">
-              <div
-                v-if="pic.check_id==list.check_id"
-                :key="index"
-                class="card-upload"
-              >
+              <div v-if="pic.check_id==list.check_id" :key="index" class="card-upload">
                 <img :src="pic.url" @click="showBigPicture(pic.url)" >
                 <div class="close" @click="delete_pic(pic.attachment_id)">
                   <img src="@/assets/userBind/deleteIcon.png" >
@@ -52,22 +41,34 @@
             <div v-if="!carImg" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
               <img src="@/assets/userBind/camera.png" class="upload-btn" >
             </div>
-            <div v-if="carImg&&!isApproved" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
-              <img :src="carImg" style="width:100%;height:100%">
+            <div
+              v-if="carImg&&!isApproved"
+              class="card-upload plus"
+              @click="ocrShow(list.cdd_item, '')"
+            >
+              <img :src="carImg" style="width:100%;height:100%" >
             </div>
             <div v-if="carImg&&isApproved" class="card-upload plus" @click="showBigPicture(carImg)">
-              <img :src="carImg" style="width:100%;height:100%">
+              <img :src="carImg" style="width:100%;height:100%" >
             </div>
           </div>
           <div v-if="list.cdd_item==='HOUSE_CARD'">
             <div v-if="!houseImg" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
               <img src="@/assets/userBind/camera.png" class="upload-btn" >
             </div>
-            <div v-if="houseImg&&!isApproved" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
-              <img :src="houseImg" style="width:100%;height:100%">
+            <div
+              v-if="houseImg&&!isApproved"
+              class="card-upload plus"
+              @click="ocrShow(list.cdd_item, '')"
+            >
+              <img :src="houseImg" style="width:100%;height:100%" >
             </div>
-            <div v-if="houseImg&&isApproved" class="card-upload plus" @click="showBigPicture(houseImg)">
-              <img :src="houseImg" style="width:100%;height:100%">
+            <div
+              v-if="houseImg&&isApproved"
+              class="card-upload plus"
+              @click="showBigPicture(houseImg)"
+            >
+              <img :src="houseImg" style="width:100%;height:100%" >
             </div>
           </div>
           <div v-if="list.cdd_item==='HOUSE_CARD'">
@@ -83,35 +84,75 @@
               </item>
               <item>
                 <div slot="name">共有情况</div>
-                <input slot="content" v-model="hauseInfo.public_situation" readonly placeholder="识别房产证自动填充" >
+                <input
+                  slot="content"
+                  v-model="hauseInfo.public_situation"
+                  readonly
+                  placeholder="识别房产证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">房屋坐落</div>
-                <input slot="content" v-model="hauseInfo.house_located" readonly placeholder="识别房产证自动填充" >
+                <input
+                  slot="content"
+                  v-model="hauseInfo.house_located"
+                  readonly
+                  placeholder="识别房产证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">登记时间</div>
-                <input slot="content" v-model="hauseInfo.regist_date" readonly placeholder="识别房产证自动填充" >
+                <input
+                  slot="content"
+                  v-model="hauseInfo.regist_date"
+                  readonly
+                  placeholder="识别房产证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">房屋性质</div>
-                <input slot="content" v-model="hauseInfo.house_property" readonly placeholder="识别房产证自动填充" >
+                <input
+                  slot="content"
+                  v-model="hauseInfo.house_property"
+                  readonly
+                  placeholder="识别房产证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">规划用途</div>
-                <input slot="content" v-model="hauseInfo.plan_purpose" readonly placeholder="识别房产证自动填充" >
+                <input
+                  slot="content"
+                  v-model="hauseInfo.plan_purpose"
+                  readonly
+                  placeholder="识别房产证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">总层数</div>
-                <input slot="content" v-model="hauseInfo.house_layers" readonly placeholder="识别房产证自动填充" >
+                <input
+                  slot="content"
+                  v-model="hauseInfo.house_layers"
+                  readonly
+                  placeholder="识别房产证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">建筑面积</div>
-                <input slot="content" v-model="hauseInfo.built_area" readonly placeholder="识别房产证自动填充" >
+                <input
+                  slot="content"
+                  v-model="hauseInfo.built_area"
+                  readonly
+                  placeholder="识别房产证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">套内建筑面积</div>
-                <input slot="content" v-model="hauseInfo.built_in_area" readonly placeholder="识别房产证自动填充" >
+                <input
+                  slot="content"
+                  v-model="hauseInfo.built_in_area"
+                  readonly
+                  placeholder="识别房产证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">其他</div>
@@ -119,15 +160,30 @@
               </item>
               <item>
                 <div slot="name">地号</div>
-                <input slot="content" v-model="hauseInfo.land_number" readonly placeholder="识别房产证自动填充" >
+                <input
+                  slot="content"
+                  v-model="hauseInfo.land_number"
+                  readonly
+                  placeholder="识别房产证自动填充"
+                >
               </item>
               <item :proportion="[1,1]">
                 <div slot="name">土地使用权取得方式</div>
-                <input slot="content" v-model="hauseInfo.land_get_method" readonly placeholder="识别房产证自动填充" >
+                <input
+                  slot="content"
+                  v-model="hauseInfo.land_get_method"
+                  readonly
+                  placeholder="识别房产证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">土地使用年限</div>
-                <input slot="content" v-model="hauseInfo.land_use_limit" readonly placeholder="识别房产证自动填充" >
+                <input
+                  slot="content"
+                  v-model="hauseInfo.land_use_limit"
+                  readonly
+                  placeholder="识别房产证自动填充"
+                >
               </item>
             </list-item>
           </div>
@@ -135,47 +191,79 @@
             <list-item :item-height="44" class="card-Info">
               <item>
                 <div slot="name">车辆识别代号</div>
-                <input slot="content" v-model="hauseInfo.public_situation" readonly placeholder="识别行驶证自动填充" >
+                <input
+                  slot="content"
+                  v-model="carInfo.vehicle_identify_num"
+                  readonly
+                  placeholder="识别行驶证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">住址</div>
-                <input slot="content" v-model="hauseInfo.house_located" readonly placeholder="识别行驶证自动填充" >
+                <input slot="content" v-model="carInfo.address" readonly placeholder="识别行驶证自动填充" >
               </item>
               <item>
                 <div slot="name">品牌型号</div>
-                <input slot="content" v-model="hauseInfo.regist_date" readonly placeholder="识别行驶证自动填充" >
+                <input
+                  slot="content"
+                  v-model="carInfo.brand_model_number"
+                  readonly
+                  placeholder="识别行驶证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">发证日期"</div>
-                <input slot="content" v-model="hauseInfo.public_situation" readonly placeholder="识别行驶证自动填充" >
+                <input slot="content" v-model="carInfo.start_date" readonly placeholder="识别行驶证自动填充" >
               </item>
               <item>
                 <div slot="name">车辆类型</div>
-                <input slot="content" v-model="hauseInfo.house_located" readonly placeholder="识别行驶证自动填充" >
+                <input
+                  slot="content"
+                  v-model="carInfo.vehicle_type"
+                  readonly
+                  placeholder="识别行驶证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">所有人</div>
-                <input slot="content" v-model="hauseInfo.regist_date" readonly placeholder="识别行驶证自动填充" >
+                <input slot="content" v-model="carInfo.owner" readonly placeholder="识别行驶证自动填充" >
               </item>
               <item>
                 <div slot="name">使用性质</div>
-                <input slot="content" v-model="hauseInfo.public_situation" readonly placeholder="识别行驶证自动填充" >
+                <input slot="content" v-model="carInfo.use_nature" readonly placeholder="识别行驶证自动填充" >
               </item>
               <item>
                 <div slot="name">发动机号码</div>
-                <input slot="content" v-model="hauseInfo.house_located" readonly placeholder="识别行驶证自动填充" >
+                <input
+                  slot="content"
+                  v-model="carInfo.engine_number"
+                  readonly
+                  placeholder="识别行驶证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">号牌号码</div>
-                <input slot="content" v-model="hauseInfo.regist_date" readonly placeholder="识别行驶证自动填充" >
+                <input
+                  slot="content"
+                  v-model="carInfo.plate_number"
+                  readonly
+                  placeholder="识别行驶证自动填充"
+                >
               </item>
               <item>
                 <div slot="name">注册日期</div>
-                <input slot="content" v-model="hauseInfo.regist_date" readonly placeholder="识别行驶证自动填充" >
+                <input
+                  slot="content"
+                  v-model="carInfo.regist_date"
+                  readonly
+                  placeholder="识别行驶证自动填充"
+                >
               </item>
             </list-item>
           </div>
-    </div></div></div></h-content>
+        </div>
+      </div>
+    </h-content>
     <bottom-tab class="footer-button">
       <tab-button class="save" @click.native="save">下一步</tab-button>
     </bottom-tab>
@@ -198,6 +286,7 @@ export default {
       houseAttachmentId: '',
       carAttachmentId: '',
       hauseInfo: {
+        bp_id: window.localStorage.getItem('bp_id'),
         house_owner: '',
         public_situation: '',
         house_located: '',
@@ -213,6 +302,19 @@ export default {
         land_use_limit: '',
       },
       carInfo: {
+        bp_id: window.localStorage.getItem('bp_id'),
+        vehicle_identify_num: '',
+        address: '',
+        brand_model_number: '',
+        start_date: '',
+        vehicle_type: '',
+        owner: '',
+        use_nature: '',
+        engine_number: '',
+        plate_number: '',
+        regist_date: '',
+        words_result_num: '',
+        success: '',
       },
       upload_list: [],
       cddItemList: [], // 资料清单列表
@@ -221,7 +323,7 @@ export default {
   },
   computed: {
     isApproved () {
-      return window.localStorage.user_bp_status === 'APPROVED'
+      return window.localStorage.user_bp_status === 'APPROVED';
     },
   },
   beforeRouteEnter (to, from, next) {
@@ -229,15 +331,83 @@ export default {
       if (from.name === 'NPInvoiceInfo' && window.localStorage.from) {
         vm.bp_type = window.localStorage.bp_type
         vm.loadItemList()
+        vm.getCarInfo()
+        vm.getHouseInfo()
       }
     })
   },
   methods: {
+    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) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.$router.push({
+            name: 'NPBankInfo',
+          })
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    getCarInfo () {
+      let vm = this
+      let url = process.env.basePath + 'bp_vehicleLicense_query';
+      let param = {
+        bp_id: window.localStorage.getItem('bp_id'),
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          Object.assign(vm.carInfo, res.info)
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    saveHouseInfo () {
+      let vm = this
+      let url = process.env.basePath + 'bp_house_info_save';
+      let param = {
+        master: vm.hauseInfo,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.saveCarInfo()
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    getHouseInfo () {
+      let vm = this
+      let url = process.env.basePath + 'bp_house_info_query';
+      let param = {
+        bp_id: window.localStorage.getItem('bp_id'),
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          Object.assign(vm.hauseInfo, res.info)
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     save () {
       let vm = this
       if (vm.isUploadHouse) {
         vm.houseFlag = true
-        vm.delete_pic_to_ocr(vm.houseAttachmentId)// 房产证修改，重新上传
+        vm.delete_pic_to_ocr(vm.houseAttachmentId) // 房产证修改，重新上传
         let list = []
         let obj = {
           pkvalue: vm.house_id,
@@ -255,7 +425,7 @@ export default {
       }
       if (vm.isUploadCar) {
         vm.carFlag = true
-        vm.delete_pic_to_ocr(vm.carAttachmentId)// 房产证修改，重新上传
+        vm.delete_pic_to_ocr(vm.carAttachmentId) // 房产证修改，重新上传
         let list = []
         let obj = {
           pkvalue: vm.car_id,
@@ -271,9 +441,7 @@ export default {
         vm.save_picture(list)
         vm.isUploadCar = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
       }
-      this.$router.push({
-        name: 'NPBankInfo',
-      })
+      vm.saveHouseInfo()
     },
     ocrShow (ocrType, type) {
       let vm = this
@@ -311,7 +479,7 @@ export default {
       }
       let error = function () {
         hlsPopup.showLongCenter('请拍照')
-      }
+      };
       hlsUtil.openCamera(cameraoptions, success, error)
     },
     takePicture (ocrType, type) {
@@ -337,7 +505,7 @@ export default {
       }
       let error = function () {
         hlsPopup.showLongCenter(error)
-      }
+      };
       vm.hlsUtil.takePicture(cameraoptions, success, error)
     },
     imgUploadOpenCamera (description, check_id) {
@@ -363,10 +531,10 @@ export default {
         // vm.upload_list.push(obj)
         // 拍完一张立马执行保存图片逻辑
         vm.save_picture(list)
-      }
+      };
       let error = function () {
         hlsPopup.showLongCenter('请拍照')
-      }
+      };
       hlsUtil.openCamera(cameraoptions, success, error)
     },
     imgUploadTakePicture (description, check_id) {
@@ -393,7 +561,7 @@ export default {
         }
         // 拍完一张立马执行保存图片逻辑
         vm.save_picture(list)
-      }
+      };
       let error = function () {}
       vm.hlsUtil.takePicture(cameraoptions, success, error)
     },
@@ -419,7 +587,7 @@ export default {
                 if (list[j].filePath === res.response.filePath) {
                   list[j].attachment_id = res.response.attachment_id
                   vm.upload_list.push(list[j])
-                  break
+                  break;
                 }
               }
             } else {
@@ -441,7 +609,7 @@ export default {
       var delete_list = []
       let obj = { attachment_id: attachment_id }
       delete_list.push(obj)
-      let url = process.env.basePath + 'app_delete_attment' // 附件删除
+      let url = process.env.basePath + 'app_delete_attment'; // 附件删除
       let param = {
         picturelist: delete_list,
       }
@@ -485,7 +653,7 @@ export default {
       var delete_list = []
       let obj = { attachment_id: attachment_id }
       delete_list.push(obj)
-      let url = process.env.basePath + 'app_delete_attment' // 附件删除
+      let url = process.env.basePath + 'app_delete_attment'; // 附件删除
       let param = {
         picturelist: delete_list,
       }
@@ -504,7 +672,7 @@ export default {
       let vm = this
       vm.dowload_list = []
       let bpId = window.localStorage.getItem('bp_id')
-      let url = process.env.basePath + 'prj_cdd_check_list'
+      let url = process.env.basePath + 'prj_cdd_check_list';
       let param = {
         master: {
           document_id: bpId,
@@ -521,10 +689,10 @@ export default {
             switch (item.cdd_item) {
               case 'HOUSE_CARD': // 房产证
                 vm.house_id = item.check_id
-                break
+                break;
               case 'CAR_CARD': // 承租人身份证背面
                 vm.car_id = item.check_id
-                break
+                break;
               default:
                 break
             }
@@ -544,16 +712,14 @@ export default {
       var delete_list = []
       let obj = { attachment_id: attachment_id }
       delete_list.push(obj)
-      let url = process.env.basePath + 'app_delete_attment' // 附件删除
+      let url = process.env.basePath + 'app_delete_attment'; // 附件删除
       let param = {
         picturelist: delete_list,
       }
       vm.hlsHttp.post(url, param).then(function (res) {
         hlsPopup.hideLoading()
         if (res.result === 'S') {
-
         } else if (res.result === 'E') {
-
         }
       })
     },
@@ -582,13 +748,13 @@ export default {
                 vm.houseImg = res.lists[0].url
               }
               vm.houseAttachmentId = res.lists[0].attachment_id
-              break
+              break;
             case 'CAR_CARD': // 行驶证
               if (!vm.carFlag) {
                 vm.carImg = res.lists[0].url
               }
               vm.carAttachmentId = res.lists[0].attachment_id
-              break
+              break;
             default:
               vm.dowload_list.push(res.lists)
           }
@@ -601,91 +767,91 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-#accessory{
-      .userInfo {
-      height: 45px;
-      line-height: 45px;
-      color: @headerColor;
-      margin-top: -10px;
-      font-size: 15px;
-      margin-left: 16px;
-      position: relative;
-    }
-    .userInfo::before {
-      content: "";
+#accessory {
+  .userInfo {
+    height: 45px;
+    line-height: 45px;
+    color: @headerColor;
+    margin-top: -10px;
+    font-size: 15px;
+    margin-left: 16px;
+    position: relative;
+  }
+  .userInfo::before {
+    content: "";
+    display: block;
+    width: 4px;
+    height: 20px;
+    background-color: @headerColor;
+    position: absolute;
+    left: -15px;
+    top: 12px;
+  }
+  .card {
+    padding-bottom: 8px;
+    height: auto;
+    background-color: #fff;
+    margin-bottom: 10px;
+
+    display: flex;
+    flex-direction: column;
+    span {
+      color: #656464;
+      font-size: 13px;
+      line-height: 18px;
+      padding-top: 8px;
       display: block;
-      width: 4px;
-      height: 20px;
-      background-color: @headerColor;
-      position: absolute;
-      left: -15px;
-      top: 12px;
+      margin-left: 16px;
     }
-      .card {
-      padding-bottom: 8px;
-      height: auto;
-      background-color: #fff;
-      margin-bottom: 10px;
-
-      display: flex;
-      flex-direction: column;
-      span {
-        color: #656464;
-        font-size: 13px;
-        line-height: 18px;
-        padding-top: 8px;
-        display: block;
-        margin-left: 16px;
-      }
-      .img-content {
-        /*display: flex;
+    .img-content {
+      /*display: flex;
         flex-flow: row wrap;
         justify-content: flex-start;
         align-items: center;*/
-      }
-      .plus {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
-      .card-upload {
-        position: relative;
-        width: 80px;
-        height: 80px;
-        border: 1px dashed #dcdcdd;
-        /* display: flex;
+    }
+    .plus {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+    .card-upload {
+      position: relative;
+      width: 80px;
+      height: 80px;
+      border: 1px dashed #dcdcdd;
+      /* display: flex;
          justify-content: center;
          align-items: center;*/
-        margin-top: 12px;
-        margin-left: 16px;
-        float: left;
-        .close {
-          /* position: relative;
+      margin-top: 12px;
+      margin-left: 16px;
+      float: left;
+      .close {
+        /* position: relative;
           color: #F96F68;
           margin-top: -100%;
           margin-left: -10%;*/
-          position: absolute;
-          color: #f96f68;
-          top: -6px;
-          right: -6px;
-          img {
-            width: 14px;
-            height: 14px;
-          }
-        }
+        position: absolute;
+        color: #f96f68;
+        top: -6px;
+        right: -6px;
         img {
-          /*width: 88px;
-          height: 88px;*/
-          width: 100%;
-          height: 100%;
-        }
-        .upload-btn {
-          width: 24px;
-          height: 24px;
+          width: 14px;
+          height: 14px;
         }
       }
+      img {
+        /*width: 88px;
+          height: 88px;*/
+        width: 100%;
+        height: 100%;
+      }
+      .upload-btn {
+        width: 24px;
+        height: 24px;
+      }
     }
-     .save {
+  }
+  .save {
     color: #fff;
     border-radius: 4px;
     background-color: @headerColor;

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

@@ -480,7 +480,7 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          Object.assign(vm.baseInfo, res.info)
+          vm.baseInfo = res.info
           vm.from = true
           vm.addRows(vm.baseInfo.address_on_resident_booklit)
           vm.addRowsLive(vm.baseInfo.living_address)