Merge branch 'liuxin' into develop

src/pages/carConfirm/confirm-detail.vue

@@ -11,7 +11,7 @@
           <div class="down-content">
             <span>请上传照片</span>
             <div class="photo">
-              <!-- <img src=""> -->
+              <img :src="vehicleImg">
             </div>
             <list-item :item-height="44">
               <item>
@@ -107,7 +107,7 @@
           v-for="(item,index) in equip"
           :key="index"
           class="equipment"
-          @click="downNum=true;getRent(item.contract_id)"
+          @click="downNum=true;getRent(item.contract_id,item.contract_lease_item_id)"
         >
           <div class="left">
             <span>
@@ -194,6 +194,7 @@ export default {
       downNum: false,
       show: false,
       flag: false, // 判断是否为已确认
+      vehicleImg: '', // 查询到的合格证
       leasePic: '', // 租赁合同图片
       agentPic: '', // 经销商担保协议图片
       bankPic: '', // 农行代扣授权书图片
@@ -257,6 +258,30 @@ export default {
     })
   },
   methods: {
+    getImg (id) { // 获取合格证
+      let vm = this
+      let randomString = Math.floor(Math.random() * 21)
+      let url =
+        process.env.basePath +
+        'app_attment_query' +
+        '&index' +
+        `'${randomString}'`
+      let param = {
+        'master': {
+          'source_type': 'CON_CONTRACT_LEASE_ITEM',
+          'pkvalue': id,
+        },
+      }
+      vm.$post(url, param).then(function (res) {
+        if (res.result === 'S') {
+          if (res.info) {
+            vm.vehicleImg = process.env.filePath + 'attachment_id=' + res.info.attachment_id + '&access_token=' + window.localStorage.access_token
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     // 签约校验
     async signCheck () {
       let vm = this
@@ -276,9 +301,6 @@ export default {
     },
     getTabNum (i) {
       this.tabNum = i
-    },
-    getImg () {
-
     },
     takePhonto () {
       let vm = this
@@ -503,7 +525,7 @@ export default {
         }
       })
     },
-    getRent (e) {
+    getRent (e, id) {
       let vm = this
       let url = process.env.basePath + 'leases_info_query'
       let param = {
@@ -514,6 +536,7 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           Object.assign(vm.rentInfo, res.info)
+          vm.getImg(id)
         } else {
           hlsPopup.showLongCenter(res.message)
         }