解决冲突

src/views/ebiz/allowance/Detail.vue

@@ -1,5 +1,11 @@
 <template>
-  <div class="orderDetail-container bg-white">
+  <div class="orderDetail-container bg-white relative">
+    <div v-if="approvalApplyStatus == '4'" style="height: 100vh;">
+      <p class="fs16 gray text-center pt210">申请人已撤销申请</p>
+    </div>
+    <div v-else>
+      <img v-if="approveResult == '0'" class='mt40 w100 h100 absolute top10 right25' style="z-index: 9;" src='@/assets/images/allowance/icon_reject.png' />
+      <img v-else-if="approveResult == '1'" class='mt40 w100 h100 absolute top10 right25' style="z-index: 9;" src='@/assets/images/allowance/icon_pass.png' />
       <van-collapse v-model="activeNames">
         <!-- 基本信息 开始 -->
         <van-collapse-item class="main-title" name="baseInfo">
@@ -145,6 +151,7 @@
       </van-collapse>
       <van-button v-if="type == '1' && approvalStatus == '1'" type="danger" class="bottom-btn" @click="nextStep" v-no-more-click="1000">提交审批 </van-button>
     </div>
+  </div>
 </template>
 <script>
 import { Toast, CellGroup, Field, Dialog, Collapse, CollapseItem, Cell, Popup, Divider, RadioGroup, Radio, ImagePreview } from 'vant'
@@ -173,6 +180,7 @@ export default {
   },
   data() {
     return {
+      approvalApplyStatus: '', // 申请状态：0未提交, 1审批中 ,2 已同意, 3已驳回, 4已撤销
       approvalStatus: '', //审批状态 (0-不可审批,1-可审批(审批中),2-已审批)
       imgUrl: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=`,
       approveResult: '1', //审批结果 (0-审批拒绝,1-审批通过)
@@ -251,8 +259,9 @@ export default {
         if (res.result == '0') {
           let allowanceDTO = res.content.allowanceDTO
           if (allowanceDTO.approveNodeDTO) {
-            this.approvalStatus = allowanceDTO.approveNodeDTO.approveStatus
+            this.approvalStatus = allowanceDTO.approveNodeDTO.approveStatus //审批状态
           }
+          this.approvalApplyStatus = allowanceDTO.allowanceApplyDTO.approvalStatus //申请状态
           this.allowanceApplyDTO = allowanceDTO.allowanceApplyDTO
           this.allowanceEnjoyDTO = allowanceDTO.allowanceEnjoyDTO
           this.mediaUploadDTOLst = allowanceDTO.mediaUploadDTOLst

src/views/ebiz/allowance/application/List.vue

@@ -180,19 +180,33 @@ export default {
        * SIGN_ALLOWANCE   签名
        */
       let allowanceType = order.infoStatus //上一个节点页面
+      let allowancePageFlag = ''
+      switch (allowanceType) {
+        case 'APPLY_ALLOWANCE': //账户信息
+          allowancePageFlag = '2'
+          break
+        case 'BANK_ALLOWANCE': //影像附件
+          allowancePageFlag = '3'
+          break
+        case 'MEDIA_ALLOWANCE': //签字页面
+          allowancePageFlag = '4'
+          break
+        default:
+          break
+      }
       let url = ''
       switch (allowanceType) {
         case 'APPLY_ALLOWANCE': //账户信息
-          url = '/allowance/application/AccountInfo?allowanceNo=' + order.allowanceNo + '&type=edit&edit=1'
+          url = '/allowance/application/AccountInfo?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
           break
         case 'BANK_ALLOWANCE': //影像附件
-          url = '/allowance/application/AttachmentManagement?allowanceNo=' + order.allowanceNo + '&type=edit&edit=1'
+          url = '/allowance/application/AttachmentManagement?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
           break
         case 'MEDIA_ALLOWANCE': //签字页面
-          url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&type=edit&edit=1'
+          url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
           break
         case 'SIGN_ALLOWANCE': //签字页面
-          url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&type=edit&edit=1'
+          url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
           break
         default:
           break
@@ -201,13 +215,15 @@ export default {
         flag: 'h5',
         extra: {
           forbidSwipeBack: '1',
+          pullRefresh: '0',  //1:需要下拉刷新 
           url: location.origin + `/#${url}`
         },
         routerInfo: {
           path: url,
           query: {
             allowanceNo: order.allowanceNo,
-            type: 'edit'
+            edit: '1',
+            allowancePageFlag:allowancePageFlag
           }
         }
       })

src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue

@@ -32,6 +32,7 @@
         <p v-if='!isWeixin' class='fw600 border-gb'>
           <span>享受人</span><span class='ml60'>{{ allowanceEnjoyDTO.name }}</span>
         </p>
+<<<<<<< HEAD
         <p v-if='!isWeixin'>点击【签名】按钮，进行享受人签名</p>
         <p class='border-gb'>
           <span v-if='!isWeixin'>享受人：</span>
@@ -42,6 +43,15 @@
           </van-button>
           <img class='w60 h40 v-middle ml10' v-if='item.signPath' :src="imgUrl + item.signPath.replace(/\+/g, '%2B')"
                alt='' /><br />
+=======
+        <p v-if="!isWeixin">点击【签名】按钮，进行享受人签名</p>
+        <p class="border-gb">
+          <span>享受人：</span>
+          <van-button type="danger" color="#2E4591" class="ml5" size="small" @click="signFunc(item.type, item.id)" :disabled="isSure" v-no-more-click="1000">{{
+            item.signStatus == '0' ? '签名' : '已签名'
+          }}</van-button>
+          <img class="w60 h40 v-middle ml10" v-if="item.signPath" :src="imgUrl + item.signPath.replace(/\+/g, '%2B')" alt="" /><br />
+>>>>>>> c7b1b0ed... 【金掌桂父母津贴】申请人已提交申请，且链接未失效，享受人点击了分享链接，要求：提示亲，当前申请已在审批流程中，请耐心等待~
           <!-- 享受人有分享功能 -->
           <van-button
             type='danger'
@@ -563,6 +573,7 @@ export default {
     },
     // 获取订单详情
     getAllowanceDetail() {
+      let that = this
       let data = {
         allowanceNo: this.allowanceNo
       }
@@ -584,7 +595,23 @@ export default {
            * 审批状态
            * 0未提交, 1审批中 ,2 已同意, 3已驳回, 4已撤销
            */
+          // "type" --1:申请人; 2:享受人
+          let isSignPathEnjoy = false
+          that.allowanceSignDTOLst.forEach(function (item) {
+            if (item.type == '2' && item.signPath) {
+              isSignPathEnjoy = true
+            }
+          })
           if (this.isWeixin && this.allowanceApplyDTO.approvalStatus == '1') {
+            Dialog.alert({
+              title: '提示',
+              confirmButtonText: '退出',
+              message: '亲，当前申请已在审批流程中，请耐心等待~'
+            }).then(() => {
+              window.close()
+              WeixinJSBridge.call('closeWindow')
+            })
+          }else if (this.isWeixin && isSignPathEnjoy){
             Dialog.alert({
               title: '提示',
               confirmButtonText: '退出',