'解决冲突'

src/pages/contractCreate/contract-create-list.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime : 2019-12-27 09:44:12
+ * @LastEditTime : 2019-12-27 10:28:37
  * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->

src/pages/contractCreate/creat-rent-info.vue

@@ -404,6 +404,9 @@ export default {
     },
     save () {
       let vm = this
+      // vm.$router.push({
+      //   name: 'CreateEnclosureInfo',
+      // })
       let url = process.env.basePath + 'prj_lease_info_save'
       vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
       vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2)
@@ -426,6 +429,9 @@ export default {
     },
     next () {
       let vm = this
+      // vm.$router.push({
+      //   name: 'CreateEnclosureInfo',
+      // })
       if (vm.isComputed) {
         let url = process.env.basePath + 'prj_product_info_save'
         let param = {

src/pages/contractCreate/create-enclosure-info.vue

@@ -94,7 +94,7 @@
             </div>
           </div>
         </div>
-        <div class="card-upload plus" @click="ocrShow('','')">
+        <div class="card-upload plus" @click="ocrShow('特批申请书',checkId)">
           <img src="@/assets/userBind/camera.png" class="upload-btn" >
         </div>
       </div>
@@ -125,7 +125,6 @@ export default {
       houseImg: '',
       carImg: '',
       marryImg: '',
-      applicationImg: '',
       licenseImg: '',
       house_id: '',
       car_id: '',
@@ -140,16 +139,56 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       if (from.name === 'CreateRentInfo') {
+        vm.idCardFront = ''
+        vm.idCardBack = ''
+        vm.houseImg = ''
+        vm.carImg = ''
+        vm.marryImg = ''
+        vm.licenseImg = ''
         vm.upload_list = []
         vm.dowload_list = []
+        vm.cddItemList = []
         vm.bpClass = window.localStorage.bp_class
         vm.status = window.localStorage.user_bp_status
         vm.loadItemList()
-        // vm.getPrjId()
+        vm.queryCheckId()
       }
     })
   },
   methods: {
+    // 特批证书check_id查询
+    queryCheckId () {
+      let vm = this
+      let url = process.env.basePath + 'prj_atm_query'
+      let param = {
+        project_id: window.localStorage.project_id,
+      }
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        console.log('特批证书check_id查询', res)
+        if (res.result === 'S') {
+          vm.checkId = res.info.check_id
+          vm.certificateQuery()
+        }
+      })
+    },
+    // 特批证书查询
+    certificateQuery () {
+      let vm = this
+      let url =
+        process.env.basePath + 'attachment_list_query' // 附件查询
+      let param = {
+        check_id: vm.checkId,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.dowload_list = res.lists
+        }
+      })
+    },
     // 查看大图
     showBigPicture (pic) {
       let vm = this
@@ -441,9 +480,6 @@ export default {
               }
               // vm.house_id = res.lists[0].attachment_id
               break
-            case 'XXX': // 特批申请书
-              vm.dowload_list = [...res.lists]
-              break
             default:
           }
         } else {