fixConflict

src/pages/contractCreate/sales-info.vue

@@ -186,6 +186,12 @@ export default {
       },
       immediate: true,
     },
+    // '$route' (to, from) {
+    //   debugger
+    //   if (from.fullPath !== '/contract-create-list' && to.fullPath === '/sales-info') {
+    //     this.$router.go(0)
+    //   }
+    // },
   },
   activated () {
 
@@ -222,7 +228,8 @@ export default {
         }
         vm.businessQuery().then(res => {
           vm.agentQuery().then(res => {
-            vm.factoryQuery()
+            vm.factoryQuery().then(res => {
+            })
           })
         })
       } else if (from.name === 'CreateBaseInfo') {
@@ -327,7 +334,7 @@ export default {
         phone: window.localStorage.getItem('user_phone'),
       }
       vm.hlsPopup.showLoading('请稍候')
-      vm.hlsHttp.post(url, param).then(function (res) {
+      return vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         vm.factoty = res.lists
         if (res.result === 'S') {

src/pages/contractSigning/contract-detail.vue

@@ -118,6 +118,19 @@
       </div>
     </h-content>
     <h-content v-if="num === 2">
+      <list-item :item-height="56" class="contract-text" style="background-color:rgb(250,250,250);">
+        <item v-for="(item,index) in attachArray" :proportion="[7,1]" :key="index">
+          <div slot="name" class="aguremrnt-list">
+            <img src="@/assets/constractSigning/npack.png" alt class="pics" >
+            <p class="second first">{{ item.attachment_file }}</p>
+          </div>
+          <div slot="content" class="in-detail" @click="goContent(item.attachment_file_path)">
+            <img src="@/assets/constractSigning/detail.png" alt >
+          </div>
+        </item>
+      </list-item>
+    </h-content>
+    <!-- <h-content v-if="num === 2">
       <list-item :item-height="56" class="contract-text" style="background-color:rgb(250,250,250);">
         <item :proportion="[7,1]">
           <div slot="name" class="aguremrnt-list">
@@ -129,7 +142,6 @@
           </div>
         </item>
 
-        <!-- 农行代扣授权书 -->
     <item v-if="abc_deduction_flag === 'Y'" :proportion="[7,1]" :class="{'border-red':isshow}">
       <div slot="name" class="aguremrnt-list">
         <img src="@/assets/constractSigning/pack.png" alt class="pics" >
@@ -166,7 +178,7 @@
       </div>
     </item>
       </list-item>
-    </h-content>
+    </h-content>-->
     <h-content v-if="num === 1">
       <list-item :item-height="44" class="second-part">
         <item>
@@ -302,12 +314,11 @@
       </h-view>
     </h-modal>
     <!--活体检测-->
-    <body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id"/>
+    <body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id" />
   </h-view>
 </template>
 
 <script>
-
 import Check1 from '@/assets/constractSigning/business.png'
 import Check2 from '@/assets/constractSigning/constract.png'
 import Check3 from '@/assets/constractSigning/lease.png'
@@ -334,6 +345,7 @@ export default {
       showModalValue: false,
       credit_status: 'N', // 一个月内是否查过征信 N查过
       guarantorInfo: [], // 担保人信息
+      attachArray: [], // 附件数组
       bp_class: this.$route.params.item.bp_class, // 承租人性质(自然人，企业)
       info: {}, // 租赁信息
       baseInfo: {}, // 基本信息
@@ -366,6 +378,7 @@ export default {
     }
   },
   computed: {},
+
   watch: {
     $route (to, from) {
       hlsPopup.hideConfirm()
@@ -418,6 +431,8 @@ export default {
         vm.getLease()
         vm.getGuarantor()
         vm.getContractLists() // 合同列表
+        // 合同文本附件查询
+        vm.getAttachment()
       } else if (from.name === 'EntryInfo') {
         vm.bankCardQuery()
       }
@@ -459,6 +474,29 @@ export default {
         // vm.hlsPopup.showLongCenter(res.message)
       }
     },
+    goContent (url) {
+      // 详情
+      // window.open(url)
+      cordova.InAppBrowser.open(url, '_blank', 'location=yes')
+    },
+    // 合同文本详情附件查询
+    getAttachment () {
+      let vm = this
+      let url = process.env.basePath + 'get_content_app'
+      let param = {
+        confirm_id: vm.confirm_id,
+        data_class: 'PRJ_PROJECT',
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(res => {
+        hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.attachArray = res.attachments
+        } else {
+          vm.hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     // 征信查询
     creditCheck () {
       let vm = this
@@ -477,7 +515,8 @@ export default {
         }
       })
     },
-    goBodyCheck (confirm_id) { // 活体检测
+    goBodyCheck (confirm_id) {
+      // 活体检测
       this.$refs.body.show()
       /* this.$router.push({
         name: 'BodyCheck',
@@ -532,7 +571,6 @@ export default {
           if (index === 1) {
             vm.takePhontoOpenCamera()
           } else {
-
           }
         },
       })
@@ -859,7 +897,8 @@ export default {
     },
     async inSure () {
       let flag = await this.signCheck()
-      if (flag) { // 只有认证通过后方可进行签约操作
+      if (flag) {
+        // 只有认证通过后方可进行签约操作
         if (!this.bank_flag && this.abc_deduction_flag === 'Y') {
           this.isshow = true // 未查到农行卡给出提示且勾选农行代扣
         } else {
@@ -898,10 +937,10 @@ export default {
 }
 </script>
 <style lang="less" rel="stylesheet">
-  #contract-details {
+#contract-details {
   .sign-elect {
-      width:100%;
-      height:1.1rem;
+    width: 100%;
+    height: 1.1rem;
     position: fixed;
     bottom: 43px;
     // margin-top: 20px;
@@ -921,9 +960,9 @@ export default {
       letter-spacing: 0.2rem;
     }
   }
-    .bodyCheck{
-      width:100%;
-      height:1.1rem;
+  .bodyCheck {
+    width: 100%;
+    height: 1.1rem;
     position: fixed;
     bottom: 92px;
     background: #fff;
@@ -1506,7 +1545,7 @@ export default {
       border: 1px solid #fdb62f;
       border-radius: 4px;
       color: #fdb62f;
-        img{
+      img {
         width: 18px;
       }
     }
@@ -1514,13 +1553,13 @@ export default {
       background: #1d3fff;
       border-radius: 4px;
       color: #fff;
-        img{
+      img {
         width: 18px;
       }
     }
   }
-  }
-  .modal {
+}
+.modal {
   background-color: rgba(0, 0, 0, 0) !important;
-  }
+}
 </style>