Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

aed29c50 · 李晓兵 · 65e459da · d7095fe4 · aed29c50 · aed29c50
Commit aed29c50 authored Dec 17, 2019 by 李晓兵
8 changed files
--- a/src/pages/myInfo/my-info.vue
+++ b/src/pages/myInfo/my-info.vue
 <!--
 * @Author: your name
 * @Date: 2019-11-07 17:48:53
- * @LastEditTime: 2019-12-11 15:25:51
+ * @LastEditTime: 2019-12-16 17:31:46
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 -->
@@ -650,6 +650,7 @@ export default {
              params: {
                bp_id: this.bp_id,
                user_bp_name: this.user_bp_name,
+                bp_class: vm.user_bp_class,
              },
            })
          }
@@ -675,6 +676,7 @@ export default {
                isAGENT: this.isAGENT,
                status: 'APPROVED',
                isMultiRole: this.isMultiRole,
+                bp_class: vm.user_bp_class,
              },
            })
          }

--- a/src/pages/productQuery/product-detailed.vue
+++ b/src/pages/productQuery/product-detailed.vue
@@ -2,7 +2,7 @@
 * @Descrip: 产品明细
 * @Author: your name
 * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-12-06 11:24:24
+ * @LastEditTime: 2019-12-16 18:33:42
 * @LastEditors: Please set LastEditors
   -->
 <template>
@@ -257,6 +257,7 @@ export default {
          let param = {
            product_id: vm.$route.params.product_id,
            bp_id: vm.bp_id,
+            user_phone: window.localStorage.user_phone,
          }
          vm.hlsPopup.showLoading('数据加载中')
          vm.$post(url, param).then(function (res) {

--- a/src/pages/userBindNew/np/accessory-info.vue
+++ b/src/pages/userBindNew/np/accessory-info.vue
@@ -747,6 +747,7 @@ export default {
      vm.hlsHttp.post(url, param).then(function (res) {
        hlsPopup.hideLoading()
        if (res.result === 'S') {
+
        } else if (res.result === 'E') {
        }
      })

--- a/src/pages/userBindNew/np/base-info.vue
+++ b/src/pages/userBindNew/np/base-info.vue
@@ -437,6 +437,34 @@ export default {
    // 绑定查询入口
    next(vm => {
      if (from.fullPath === '/tab/my-info') {
+        vm.list = {}
+        vm.multiBpType = {}
+        vm.upload_list = [] // 上传图片列表
+        vm.dowload_list = [] // 下载图片列表
+        vm.img_url = {}
+        vm.baseInfo = {}
+        vm.idCardFront = '' // 身份证正面图片
+        vm.idCardBack = '' // 身份证反面图片
+        vm.idCardFrontSp = '' // 配偶身份证正面图片
+        vm.idCardBackSp = '' // 配偶身份证反面图片
+        vm.idCardFrontUrlFlag = false // 身份证正面图片查看标识，为false则用查询出来的，为true则用拍照出来的
+        vm.idCardBackUrlFlag = false // 身份证反面图片，为false则用查询出来的，为true则用拍照出来的
+        vm.idCardFrontSpUrlFlag = false // 配偶身份证正面图片，为false则用查询出来的，为true则用拍照出来的
+        vm.idCardBackSpUrlFlag = false // 配偶身份证反面图片，为false则用查询出来的，为true则用拍照出来的
+        vm.cddItemList = [] // 资料清单列表
+        vm.idCardFrontCheck_id = '' // 身份证正面check_id
+        vm.idCardBackCheck_id = '' // 身份证反面check_id
+        vm.idCardFrontSpCheck_id = '' // 配偶身份证正面check_id
+        vm.idCardBackSpCheck_id = '' // 配偶身份证反面check_id
+        vm.idCardFrontAttachmentId = '' // 身份证正面AttachmentId
+        vm.idCardBackAttachmentId = '' // 身份证反面AttachmentId
+        vm.idCardFrontSpAttachmentId = '' // 配偶身份证正面AttachmentId
+        vm.idCardBackSpAttachmentId = '' // 配偶身份证反面AttachmentId
+        vm.idCardFrontEditFlag = false // 身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
+        vm.idCardBackEditFlag = false // 身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
+        vm.idCardFrontSpEditFlag = false // 配偶身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
+        vm.idCardBackSpEditFlag = false // 配偶身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
+        vm.isClear = false
        vm.from = true
        vm.basicInfoQuery()
        vm.loadItemList() // 附件查询

--- a/src/pages/userBindNew/org/bankInfo.vue
+++ b/src/pages/userBindNew/org/bankInfo.vue
@@ -2,7 +2,7 @@
 * @Description: In User Settings Edit
 * @Author: your name
 * @Date: 2019-09-24 21:29:35
- * @LastEditTime: 2019-12-11 19:26:10
+ * @LastEditTime: 2019-12-16 17:53:17
 * @LastEditors: Please set LastEditors
 -->
 <template>
@@ -180,8 +180,8 @@ export default {
      this.showModalValue = true
    },
    sendList (a) {
-      this.$emit('getList', a)
-      this.sendFlag(false)
+      this.sendFlag()
+      this.bank_lists = a
    },
    changeBgImg (item) {
      if (item.bank_full_name.indexOf('农业银行') !== -1) {

--- a/src/pages/userBindNew/org/baseInfo.vue
+++ b/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-16 16:22:55
+ * @LastEditTime: 2019-12-16 17:42:13
 * @LastEditors: Please set LastEditors
 -->
 <template>

--- a/src/pages/userBindNew/org/enclosure.vue
+++ b/src/pages/userBindNew/org/enclosure.vue
@@ -2,7 +2,7 @@
 * @Description: 附件信息
 * @Author: your name
 * @Date: 2019-09-20 09:35:11
- * @LastEditTime: 2019-12-16 16:32:08
+ * @LastEditTime: 2019-12-16 17:55:43
 * @LastEditors: Please set LastEditors
 -->
 <template>
@@ -135,7 +135,7 @@
              </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" >
@@ -250,50 +250,46 @@
                <input
                  slot="content"
                  v-model="carInfo.vehicle_identify_num"
-                  readonly
                  placeholder="识别行驶证自动填充"
                >
              </item>
              <item>
                <div slot="name">住址</div>
-                <input slot="content" v-model="carInfo.address" readonly placeholder="识别行驶证自动填充" >
+                <input slot="content" v-model="carInfo.address" placeholder="识别行驶证自动填充" >
              </item>
              <item>
                <div slot="name">品牌型号</div>
                <input
                  slot="content"
                  v-model="carInfo.brand_model_number"
-                  readonly
                  placeholder="识别行驶证自动填充"
                >
              </item>
              <item>
                <div slot="name">发证日期"</div>
-                <input slot="content" v-model="carInfo.start_date" readonly placeholder="识别行驶证自动填充" >
+                <input slot="content" v-model="carInfo.start_date" placeholder="识别行驶证自动填充" >
              </item>
              <item>
                <div slot="name">车辆类型</div>
                <input
                  slot="content"
                  v-model="carInfo.vehicle_type"
-                  readonly
                  placeholder="识别行驶证自动填充"
                >
              </item>
              <item>
                <div slot="name">所有人</div>
-                <input slot="content" v-model="carInfo.owner" readonly placeholder="识别行驶证自动填充" >
+                <input slot="content" v-model="carInfo.owner" placeholder="识别行驶证自动填充" >
              </item>
              <item>
                <div slot="name">使用性质</div>
-                <input slot="content" v-model="carInfo.use_nature" readonly placeholder="识别行驶证自动填充" >
+                <input slot="content" v-model="carInfo.use_nature" placeholder="识别行驶证自动填充" >
              </item>
              <item>
                <div slot="name">发动机号码</div>
                <input
                  slot="content"
                  v-model="carInfo.engine_number"
-                  readonly
                  placeholder="识别行驶证自动填充"
                >
              </item>
@@ -302,7 +298,6 @@
                <input
                  slot="content"
                  v-model="carInfo.plate_number"
-                  readonly
                  placeholder="识别行驶证自动填充"
                >
              </item>
@@ -311,7 +306,6 @@
                <input
                  slot="content"
                  v-model="carInfo.regist_date"
-                  readonly
                  placeholder="识别行驶证自动填充"
                >
              </item>
@@ -370,6 +364,7 @@ export default {
      isApproved: false,
      isUploadCar: false,
      isUploadHouse: false,
+      isProperty: false,
      carAttachmentId: '', // 车辆证id
      houseAttachmentId: '', // 房产证id
      cddItemList: [], // 资料清单列表
@@ -627,6 +622,10 @@ export default {
            vm.isUploadCar = true
            vm.carImg = imgdata
            vm.carCardIdentify(imgdata)
+          } else if (ocrType === 'REAL_EST_CERTIFICATE') {
+            vm.isProperty = true
+            vm.propertyImg = imgdata
+            vm.propertyIdentify(imgdata)
          }
        }
      }
@@ -655,6 +654,10 @@ export default {
            vm.carImg = imgUrl[0]
            vm.isUploadCar = true
            vm.carCardIdentify(imgUrl[0])
+          } else if (ocrType === 'REAL_EST_CERTIFICATE') {
+            vm.isProperty = true
+            vm.propertyImg = imgUrl[0]
+            vm.propertyIdentify(imgUrl[0])
          }
        }
      }
@@ -708,6 +711,26 @@ export default {
        vm.carInfo.success = res.success
      })
    },
+    // 不动产证识别
+    propertyIdentify (fileUrl) {
+      let vm = this
+      hlsPopup.showLoading('正在识别')
+      let url = process.env.ocrPath + '/baidu/ocr/houseRight'
+      hlsUtil.baiduOcr(fileUrl, url, function (res) {
+        hlsPopup.hideLoading()
+        let result = res.result.data
+        vm.propertyInfo.right_person = result.right_person.word
+        vm.propertyInfo.public_situation = result.public_situation.word
+        vm.propertyInfo.house_located = result.house_located.word
+        vm.propertyInfo.real_unit_number = result.real_unit_number.word
+        vm.propertyInfo.right_type = result.right_type.word
+        vm.propertyInfo.right_property = result.right_property.word
+        vm.propertyInfo.house_purpose = result.house_purpose.word
+        vm.propertyInfo.house_area = result.house_area.word
+        vm.propertyInfo.land_use_limit = result.land_use_limit.word
+        vm.propertyInfo.right_others = result.right_others.word
+      })
+    },
    loadItemList () {
      let vm = this
      let url = process.env.basePath + 'prj_cdd_check_list'

--- a/src/pages/userBindNew/org/invoice.vue
+++ b/src/pages/userBindNew/org/invoice.vue
@@ -2,7 +2,7 @@
 * @Description: In User Settings Edit
 * @Author: your name
 * @Date: 2019-09-20 09:35:11
- * @LastEditTime: 2019-12-13 11:12:08
+ * @LastEditTime: 2019-12-16 17:42:00
 * @LastEditors: Please set LastEditors
 -->
 <template>
@@ -215,31 +215,34 @@ export default {
      })
    },
    verified () {
-      console.log('bpid', this.$route.params.bp_id)
-      this.$router.push({
-        name: 'Enclosure',
-        params: {
-          bp_id: this.bp_id,
-        },
-      })
-      // let vm = this
-      // let url = process.env.basePath + 'bp_invoice_save'
-      // let param = {
-      //   bp_id: '',
-      //   bp_class: '',
-      //   ...vm.invoiceInfo,
-      // }
-      // delete param.taxpayer_type_n
-      // delete param.invoice_kind_n
-      // vm.hlsPopup.showLoading('请稍候')
-      // vm.hlsHttp.post(url, param).then(function (res) {
-      //   vm.hlsPopup.hideLoading()
-      //   if (res.result === 'S') {
-      //     vm.$router.push({
-      //       name: 'Enclosure',
-      //     })
-      //   }
+      // console.log('bpid', this.$route.params.bp_id)
+      // this.$router.push({
+      //   name: 'Enclosure',
+      //   params: {
+      //     bp_id: this.bp_id,
+      //   },
      // })
+      let vm = this
+      let url = process.env.basePath + 'bp_invoice_save'
+      let param = {
+        bp_id: vm.bp_id,
+        bp_class: 'ORG',
+        ...vm.invoiceInfo,
+      }
+      delete param.taxpayer_type_n
+      delete param.invoice_kind_n
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.$router.push({
+            name: 'Enclosure',
+            params: {
+              bp_id: vm.bp_id,
+            },
+          })
+        }
+      })
    },
  },
 }