方案详情、签约按钮逻辑更改

config/dev.env.js

@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"3.6.6"'
+  currentVersion: '"3.6.11"'
 }

src/pages/contractSigning/contract-detail.vue

@@ -120,68 +120,70 @@
       height="100%" />-->
     </h-content>
     <h-content v-if="num === 1">
+      <Collapse v-model="leaseActive">
+        <CollapseItem v-for="(itemInfo,index) of info" :key="index" :title="`方案信息${index+1}`" :name="index">
           <list-item :item-height="44" class="second-part">
             <item>
               <div slot="name" class="font-color">商务政策</div>
-          <input slot="content" v-model="info.product_plan_id_n" readonly >
+              <input slot="content" v-model="itemInfo.product_plan_id_n" readonly >
             </item>
             <item>
               <div slot="name" class="font-color">设备总价</div>
-          <span slot="content">{{ info.equip_price * info.product_num | currency }}</span>
+              <span slot="content">{{ itemInfo.equip_price * itemInfo.product_num | currency }}</span>
             </item>
             <item>
               <div slot="name" class="font-color">融资金额</div>
-          <span slot="content">{{ info.finance_amount * info.product_num | currency }}</span>
+              <span slot="content">{{ itemInfo.finance_amount * itemInfo.product_num | currency }}</span>
             </item>
             <item>
               <div slot="name" class="font-color">首付款</div>
-          <span slot="content">{{ info.down_payment * info.product_num | currency }}</span>
+              <span slot="content">{{ itemInfo.down_payment * itemInfo.product_num | currency }}</span>
             </item>
             <item>
               <div slot="name" class="font-color">保证金比例</div>
-          <span slot="content">{{ info.deposit_ratio_n }}</span>
+              <span slot="content">{{ itemInfo.deposit_ratio_n }}</span>
             </item>
             <item>
               <div slot="name" class="font-color">保证金</div>
-          <span slot="content">{{ info.deposit * info.product_num | currency }}</span>
+              <span slot="content">{{ itemInfo.deposit * itemInfo.product_num | currency }}</span>
             </item>
             <item>
               <div slot="name" class="font-color">手续费比例</div>
-          <input slot="content" v-model="info.lease_charge_ratio_n" readonly >
+              <input slot="content" v-model="itemInfo.lease_charge_ratio_n" readonly >
             </item>
             <item>
               <div slot="name" class="font-color">手续费</div>
               <span
                 slot="content"
-          >{{ parseFloat(info.lease_charge * info.product_num).toFixed(2) | currency }}</span>
+              >{{ parseFloat(itemInfo.lease_charge * itemInfo.product_num).toFixed(2) | currency }}</span>
             </item>
             <item>
               <div slot="name" class="font-color">保险押金</div>
-          <span slot="content">{{ info.insurance_fee * info.product_num | currency }}</span>
+              <span slot="content">{{ itemInfo.insurance_fee * itemInfo.product_num | currency }}</span>
             </item>
             <item>
               <div slot="name" class="font-color">GPS费用</div>
-          <span slot="content">{{ info.gps_fee * info.product_num | currency }}</span>
+              <span slot="content">{{ itemInfo.gps_fee * itemInfo.product_num | currency }}</span>
             </item>
             <item>
               <div slot="name">首次付款合计</div>
-          <span slot="content">{{ parseFloat(info.first_pay).toFixed(2) | currency }}</span>
+              <span slot="content">{{ parseFloat(itemInfo.first_pay).toFixed(2) | currency }}</span>
             </item>
             <item>
               <div slot="name" class="font-color">预计付款日</div>
-          <span slot="content">{{ dateConverse(info.lease_start_date) }}</span>
+              <span slot="content">{{ dateConverse(itemInfo.lease_start_date) }}</span>
             </item>
             <item>
               <div slot="name" class="font-color">还款周期</div>
-          <input slot="content" v-model="info.annual_pay_times_n" readonly >
+              <input slot="content" v-model="itemInfo.annual_pay_times_n" readonly >
             </item>
             <item>
               <div slot="name" class="font-color">租赁期数</div>
-          <input slot="content" v-model="info.lease_times" readonly >
+              <input slot="content" v-model="itemInfo.lease_times" readonly >
             </item>
             <item>
               <div slot="name" class="font-color">年利率</div>
-          <input slot="content" v-model="info.int_rate_n" readonly >
+              <input slot="content" v-model="itemInfo.int_rate_n" readonly >
             </item>
           </list-item>
           <div class="repay-plan">
@@ -194,15 +196,15 @@
           <list-item :item-height="44" class="second-part">
             <item>
               <div slot="name" class="font-color">设备识别号</div>
-          <input slot="content" v-model="info.product_code" readonly >
+              <input slot="content" v-model="itemInfo.product_code" readonly >
             </item>
             <item>
               <div slot="name" class="font-color">产品名称</div>
-          <input slot="content" v-model="info.product_name" readonly >
+              <input slot="content" v-model="itemInfo.product_name" readonly >
             </item>
             <item>
               <div slot="name" class="font-color">产品数量</div>
-          <input slot="content" v-model="info.product_num" readonly >
+              <input slot="content" v-model="itemInfo.product_num" readonly >
             </item>
           </list-item>
           <div class="alert alert-fund">
@@ -217,12 +219,14 @@
               </p>
             </div>
           </div>
+        </CollapseItem>
+      </Collapse>
     </h-content>
     <bottom-tab v-if="con_confirm_status !== 'APPROVED'" class="add-box">
-      <tab-button class="before" @click.native="takePhonto">
+      <tab-button v-if="!signFlag" class="before" @click.native="takePhonto">
         <img src="@/assets/constractSigning/certification.png" >征信签约
       </tab-button>
-      <tab-button class="next" @click.native="inSure">
+      <tab-button v-else class="next" @click.native="inSure">
         <img src="@/assets/intoApproval/approve.png" >提交审核
       </tab-button>
     </bottom-tab>
@@ -265,7 +269,10 @@ import unCheck2 from '@/assets/constractSigning/unconstract.png'
 import unCheck3 from '@/assets/constractSigning/unLease.png'
 import LegalPerson from '@/pages/distributorSign/legal-person'
 import Personal from '@/pages/distributorSign/personal'
+import { Collapse, CollapseItem } from 'vant'
 // import bodyCheck from './body-check'
+import 'vant/lib/collapse/style'
+import 'vant/lib/collapse-item/style'
 import axios from 'axios'
 import PDFJS from 'pdfjs-dist'
 export default {
@@ -273,6 +280,8 @@ export default {
   components: {
     Personal,
     LegalPerson,
+    Collapse,
+    CollapseItem,
     // bodyCheck,
   },
   data () {
@@ -325,6 +334,9 @@ export default {
       legalPic: '', // 法人授权书图片
       abc_deduction_flag: 'N', // 代扣授权书状态
       signCheckFlag: false, // 签约校验，为true已认证通过可进行签约，否则不可签约
+      leaseActive: ['0'],
+      signFlag: false,
+      isReadFlag: false,
     }
   },
   computed: {},
@@ -351,9 +363,11 @@ export default {
     },
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
+    next(async vm => {
       if (from.name === 'ContractSigning') {
         // vm.$refs.body.hideBody()
+        vm.signFlag = false
+        vm.isReadFlag = false
         vm.bank_flag = false
         vm.isConfirm = false
         vm.ischecked = false
@@ -372,12 +386,15 @@ export default {
         vm.con_confirm_status = vm.$route.params.item.confirm_status // 提交状态
         vm.agentPic = vm.unRead
         vm.leasePic = vm.unRead
+        window.localStorage.removeItem('confirm_id')
+        window.localStorage.setItem('confirm_id', vm.confirm_id)
         if (vm.$route.params.item.bp_class === 'NP') {
           vm.bp_flag = false
         } else {
           vm.bp_flag = true
         }
         // vm.conditionQuery()
+        vm.signCheck()
         vm.bankCardQuery()
         vm.getBseMsg()
         vm.getLease()
@@ -387,6 +404,26 @@ export default {
         vm.getAttachment()
       } else if (from.name === 'EntryInfo') {
         vm.bankCardQuery()
+      } else if (from.name === 'ElectronicSign') {
+        // 征信签署完后查看是否签署成功，成功就直接提交审批--同意通过
+        vm.confirm_id = window.localStorage.getItem('confirm_id')
+        vm.isReadFlag = false
+        hlsPopup.showLoading('请稍候')
+        let url = process.env.basePath + 'sign_check'
+        let param = {
+          confirm_id: vm.confirm_id,
+          data_class: 'PRJ_CONFIRM',
+        }
+        let res = await vm.hlsHttp.post(url, param)
+        hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.signFlag = true
+          vm.confirm_note = '同意'
+          vm.doConfirm('APPROVED')
+        } else {
+          vm.signMsg = res.message
+          vm.signFlag = false
+        }
       }
     })
   },
@@ -421,10 +458,10 @@ export default {
       let res = await vm.hlsHttp.post(url, param)
       hlsPopup.hideLoading()
       if (res.result === 'S') {
-        return true
+        vm.signFlag = true
       } else {
         vm.signMsg = res.message
-        return false
+        vm.signFlag = false
       }
     },
     async goContent (item, index, isJump = true) {
@@ -455,6 +492,7 @@ export default {
           })
         }
         vm.attachArray.splice(index, 1, temp)
+        vm.isReadFlag = true
         // debugger
       } else {
         vm.hlsPopup.showLongCenter(res.message)
@@ -472,8 +510,10 @@ export default {
       hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(res => {
         hlsPopup.hideLoading()
+        console.log('@@', res)
         if (res.result === 'S') {
           vm.attachArray = res.attachments
+          vm.isReadFlag = res.attachments[0].read_status === 'Y' ? true : false
           // vm.getBook()
         } else {
           vm.hlsPopup.showLongCenter(res.message)
@@ -562,7 +602,6 @@ export default {
         }
       })
     },
-
     goElectronicSign () { // 电子签
       let vm = this
       let url = process.env.basePath + 'get_sign_url'
@@ -603,6 +642,10 @@ export default {
     },
     async takePhonto () {
       let vm = this
+      if (!vm.isReadFlag) {
+        vm.hlsPopup.showLongCenter('请先阅读征信授权书')
+        return
+      }
       vm.goElectronicSign()
     },
     // async takePhonto () {
@@ -773,7 +816,7 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.info = res.info
+          vm.info = res.quotation_lists
         }
       })
     },
@@ -870,8 +913,7 @@ export default {
       })
     },
     async inSure () {
-      let flag = await this.signCheck()
-      if (flag) {
+      if (this.signFlag) {
         // 只有认证通过后方可进行签约操作
         // window.localStorage.bp_type === 'TENANT'
         if (JSON.parse(window.localStorage.now_user_bp_bind_id).bp_type === 'TENANT') {