From cf40071c886604967b162c55b7a1e7ab55c4771a Mon Sep 17 00:00:00 2001
From: zhangqi1 <zhang.qi1@ebiz-digits.com>
Date: Thu, 30 Sep 2021 22:10:01 +0800
Subject: [PATCH] =?UTF-8?q?GFRS-2618=E3=80=90=E5=89=8D=E7=AB=AF=E3=80=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AFbug=EF=BC=8C9=E6=9C=8830?=
 =?UTF-8?q?=E6=97=A5=E6=99=9A=E6=8F=90=E4=BA=A4=E5=B9=B6=E5=B0=86=E6=AD=A4?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=90=88=E5=B9=B6dev=20--=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=9A=E5=BC=A0=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebiz/allowance/application/IndexBar.vue   | 60 ++++++++++++++-----
 .../allowance/application/AccountInfo.vue     | 43 ++++++++++---
 .../application/AttachmentManagement.vue      | 24 ++++++--
 .../ebiz/allowance/application/BaseInfo.vue   | 20 ++++---
 src/views/ebiz/allowance/application/List.vue |  4 +-
 .../SignatureConfirmation.vue                 | 38 ++++++++----
 6 files changed, 137 insertions(+), 52 deletions(-)

diff --git a/src/components/ebiz/allowance/application/IndexBar.vue b/src/components/ebiz/allowance/application/IndexBar.vue
index 9c0f5b33b..9e9522e6b 100644
--- a/src/components/ebiz/allowance/application/IndexBar.vue
+++ b/src/components/ebiz/allowance/application/IndexBar.vue
@@ -50,6 +50,11 @@ export default {
     allowanceNo: {
       type: String,
       default: ''
+    },
+    // 当再次申请的操作时，保存的之前旧的津贴申请流水单号
+    reapplyNo: {
+      type: String,
+      default: ''
     }
   },
   components: {
@@ -108,24 +113,47 @@ export default {
       // if (localStorage.allowancePageFlag == '-10' && pageIndex != 4) {
       //   this.$toast('已到达签名确认流程，不可以回到前面的流程')
       // }
+
       if (!localStorage.allowancePageFlag) return
-      if (Number(localStorage.allowancePageFlag) < Number(pageIndex)) return
-      switch (pageIndex) {
-        case 1: //跳到基本信息页面
-          url = `/allowance/application/BaseInfo?edit=1&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}`
-          break
-        case 2: //跳到账户信息页面
-          url = `/allowance/application/AccountInfo?edit=1&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}`
-          break
-        case 3: //跳到影像资料页面
-          url = `/allowance/application/AttachmentManagement?edit=1&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}`
-          break
-        case 4: //跳到签名确认页面
-          url = `/allowance/application/SignatureConfirmation?edit=1&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}`
-          break
-        default:
-          break
+      if (Number(localStorage.allowancePageFlag) <= Number(pageIndex)) return
+
+      // 判断当前是否是再次申请的操作，因为再次申请的操作会跳转不同的路由地址
+      if (this.$route.query.reapply) {
+        switch (pageIndex) {
+          case 1: //跳到基本信息页面
+            url = `/allowance/application/BaseInfo?edit=1&reapply=${this.reapplyNo}&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}`
+            break
+          case 2: //跳到账户信息页面
+            url = `/allowance/application/AccountInfo?edit=1&reapply=${this.reapplyNo}&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}`
+            break
+          case 3: //跳到影像资料页面
+            url = `/allowance/application/AttachmentManagement?edit=1&reapply=${this.reapplyNo}&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}`
+            break
+          case 4: //跳到签名确认页面
+            url = `/allowance/application/SignatureConfirmation?edit=1&reapply=${this.reapplyNo}&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}`
+            break
+          default:
+            break
+        }
+      } else {
+        switch (pageIndex) {
+          case 1: //跳到基本信息页面
+            url = `/allowance/application/BaseInfo?edit=1&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}`
+            break
+          case 2: //跳到账户信息页面
+            url = `/allowance/application/AccountInfo?edit=1&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}`
+            break
+          case 3: //跳到影像资料页面
+            url = `/allowance/application/AttachmentManagement?edit=1&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}`
+            break
+          case 4: //跳到签名确认页面
+            url = `/allowance/application/SignatureConfirmation?edit=1&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}`
+            break
+          default:
+            break
+        }
       }
+
       let str = location.hash
       let i = str.search(/AttachmentManagement/i)
       let k = str.search(/SignatureConfirmation/i)
diff --git a/src/views/ebiz/allowance/application/AccountInfo.vue b/src/views/ebiz/allowance/application/AccountInfo.vue
index 24a01bc2c..b9283c7b9 100644
--- a/src/views/ebiz/allowance/application/AccountInfo.vue
+++ b/src/views/ebiz/allowance/application/AccountInfo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class='accountInfo-container buleRadioCheckbox'>
-    <index-bar :allowance-no='$route.query.allowanceNo'></index-bar>
+    <index-bar :allowance-no='$route.query.allowanceNo' :reapply-no='$route.query.reapply'></index-bar>
     <div v-if='!isScan'>
       <van-radio-group v-model='radio' class='flex pl30 pr30 pt15 pb15 justify-content-s bg-white mt10'>
         <van-radio name='0' class='fs14 global-checked-color-blue'>
@@ -170,9 +170,23 @@ export default {
         loadingType: 'spinner',
         message: '加载中……'
       })
-      // 从路由参数中获取'allowanceNo'津贴流水号，定义参数格式
-      let params = {
-        allowanceNo: this.$route.query.allowanceNo
+      let params = {}
+      // 区分当前的操作类型，是新增或是编辑或者再次申请的操作
+      if (this.$route.query.edit) { // 编辑操作
+        // 从路由参数中获取'allowanceNo'津贴流水号，定义参数格式
+        params = {
+          allowanceNo: this.$route.query.allowanceNo
+        }
+      } else if (this.$route.query.reapply && !this.$route.query.edit) { // 再次申请操作
+        // 如果是再次申请的操作，从路由参数中获取'reapply'旧的津贴流水号，查询之前的数据，定义参数格式
+        params = {
+          allowanceNo: this.$route.query.reapply
+        }
+      } else if (!this.$route.query.reapply && !this.$route.query.edit) { // 新增操作
+        // 从路由参数中获取'allowanceNo'津贴流水号，定义参数格式
+        params = {
+          allowanceNo: this.$route.query.allowanceNo
+        }
       }
       // 调用接口方法
       getAllowanceDetail(params).then((res) => {
@@ -188,8 +202,8 @@ export default {
           }
           // 赋值持卡人姓名（享受人），获取享受人数据中的享受人姓名，并赋值给变量
           this.accountBankInfo.accountName = this.allowanceUserInfo.enjoyUserInfo.name
-          // 判断是新增操作还是编辑操作的类型，根据不同操作类型执行不同的程序
-          if (this.$route.query.edit) {
+          // 判断是新增操作还是编辑操作或者是再次申请操作的类型，根据不同操作类型执行不同的程序
+          if (this.$route.query.edit || this.$route.query.reapply) {
             // 定义一个新的数据对象
             let data = {}
             // 如果是编辑操作进入的页面，判断是否有点击'下一步'操作而保存过账户信息的数据；如果有，则使用这个保存的数据
@@ -537,9 +551,22 @@ export default {
       saveOrUpdateAllowanceUrl(params).then(res => {
         if (res.result == '0') {
           if (this.$route.query.allowancePageFlag) {
-            str = `edit=1&allowancePageFlag=3&allowanceNo=${this.$route.query.allowanceNo}`
+            if (this.$route.query.reapply) {
+              str = `edit=1&reapply=${this.$route.query.reapply}&allowancePageFlag=3&allowanceNo=${this.$route.query.allowanceNo}`
+            } else {
+              str = `edit=1&allowancePageFlag=3&allowanceNo=${this.$route.query.allowanceNo}`
+            }
           } else {
-            str = `allowanceNo=${this.$route.query.allowanceNo}`
+            if (this.$route.query.reapply) {
+              // 如果根据已审批通过-点击再次申请进入的津贴流程，在跳转到下一页'账户信息'时，路由中还要携带一个reapply参数，
+              // 拼接路由参数，res.content.allowanceNo：接口返回的津贴申请流水号
+              str = `reapply=${this.$route.query.reapply}&allowanceNo=${this.$route.query.allowanceNo}`
+            } else {
+              // 如果从津贴申请列表新增津贴申请进入
+              // 拼接路由参数，res.content.allowanceNo：接口返回的津贴申请流水号
+              str = `allowanceNo=${this.$route.query.allowanceNo}`
+            }
+
             //如果从津贴申请列表编辑按钮或者新增津贴申请进入
             localStorage.allowancePageFlag = '3'
           }
diff --git a/src/views/ebiz/allowance/application/AttachmentManagement.vue b/src/views/ebiz/allowance/application/AttachmentManagement.vue
index c1c3276a1..5ced94657 100644
--- a/src/views/ebiz/allowance/application/AttachmentManagement.vue
+++ b/src/views/ebiz/allowance/application/AttachmentManagement.vue
@@ -1,6 +1,6 @@
 <template>
   <div class='buleRadioCheckbox'>
-    <index-bar :allowance-no='$route.query.allowanceNo'></index-bar>
+    <index-bar :allowance-no='$route.query.allowanceNo' :reapply-no='$route.query.reapply'></index-bar>
     <div>
       <div class='bg-white'>
         <div class='file-list'>
@@ -328,9 +328,23 @@ export default {
         loadingType: 'spinner',
         message: '加载中……'
       })
-      // 从路由参数中获取'allowanceNo'津贴流水号，定义参数格式
-      let params = {
-        allowanceNo: this.$route.query.allowanceNo
+      let params = {}
+      // 区分当前的操作类型，是新增或是编辑或者再次申请的操作
+      if (this.$route.query.edit) {
+        // 从路由参数中获取'allowanceNo'津贴流水号，定义参数格式
+        params = {
+          allowanceNo: this.$route.query.allowanceNo
+        }
+      } else if (this.$route.query.reapply && !this.$route.query.edit) {
+        // 如果是再次申请的操作，从路由参数中获取'reapply'旧的津贴流水号，查询之前的数据，定义参数格式
+        params = {
+          allowanceNo: this.$route.query.reapply
+        }
+      } else if (!this.$route.query.reapply && !this.$route.query.edit) { // 新增操作
+        // 从路由参数中获取'allowanceNo'津贴流水号，定义参数格式
+        params = {
+          allowanceNo: this.$route.query.allowanceNo
+        }
       }
       // 调用接口方法
       getAllowanceDetail(params).then((res) => {
@@ -347,7 +361,7 @@ export default {
             mediaInfo: res.content.allowanceDTO.mediaUploadDTOLst
           }
           // 判断是新增操作还是编辑操作的类型，根据不同操作类型执行不同的程序
-          if (this.$route.query.edit) {
+          if (this.$route.query.edit || this.$route.query.reapply) {
             // 定义一个新的数组集合
             let data = []
             // 如果是编辑操作进入的页面，判断是否有点击'下一步'操作而保存过影像资料的数据；如果有，则使用这个保存的数据
diff --git a/src/views/ebiz/allowance/application/BaseInfo.vue b/src/views/ebiz/allowance/application/BaseInfo.vue
index 5a5037d24..a0d821c56 100644
--- a/src/views/ebiz/allowance/application/BaseInfo.vue
+++ b/src/views/ebiz/allowance/application/BaseInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <div class='base-info-container pb60 redRadioCheckbox'>
     <!-- 基本信息 -->
-    <index-bar :allowance-no='applicantInfo.allowanceNo'></index-bar>
+    <index-bar :allowance-no='applicantInfo.allowanceNo' :reapply-no='$route.query.reapply'></index-bar>
     <van-cell-group class='mt10'>
       <van-field
         v-model='applicantInfo.agentCode'
@@ -288,7 +288,7 @@ export default {
             // 赋值享受人出生日期
             this.enjoyUserInfo.birthday = enjoyData.birthday
             //如果从津贴申请列表点击编辑按钮进入
-            if (this.$route.query.edit && !this.$route.query.allowancePageFlag) {
+            if ((this.$route.query.edit || this.$route.query.reapply) && !this.$route.query.allowancePageFlag) {
               this.allowancePageFlag = '1'
               localStorage.setItem('allowancePageFlag', this.allowancePageFlag)
             }
@@ -556,9 +556,9 @@ export default {
         // 计算享受人年龄
         let age = utilsAge.getAge(this.enjoyUserInfo.birthday, new Date())
         // 享受人年龄需要满60周岁，才能申请津贴
-        // if (age < 60) {
-        //   return this.$toast('享受人需年满60周岁！')
-        // }
+        if (age < 60) {
+          return this.$toast('享受人需年满60周岁！')
+        }
         // 调用保存当前录入的基本信息数据的方法
         this.save()
       } else {
@@ -585,13 +585,17 @@ export default {
       saveOrUpdateAllowanceUrl(params).then(res => {
         if (res.result == '0') {
           if (this.$route.query.allowancePageFlag) {
-            // 拼接路由参数，res.content.allowanceNo：接口返回的津贴申请流水号
-            str = `edit=1&allowancePageFlag=2&allowanceNo=${res.content.allowanceNo}`
+            if (this.$route.query.reapply) {
+              str = `edit=1&reapply=${this.$route.query.reapply}&allowancePageFlag=2&allowanceNo=${res.content.allowanceNo}`
+            } else {
+              // 拼接路由参数，res.content.allowanceNo：接口返回的津贴申请流水号
+              str = `edit=1&allowancePageFlag=2&allowanceNo=${res.content.allowanceNo}`
+            }
           } else {
             if (this.$route.query.reapply) {
               // 如果根据已审批通过-点击再次申请进入的津贴流程，在跳转到下一页'账户信息'时，路由中还要携带一个reapply参数，
               // 拼接路由参数，res.content.allowanceNo：接口返回的津贴申请流水号
-              str = `reapply=1&allowanceNo=${res.content.allowanceNo}`
+              str = `reapply=${this.$route.query.reapply}&allowanceNo=${res.content.allowanceNo}`
             } else {
               // 如果从津贴申请列表新增津贴申请进入
               // 拼接路由参数，res.content.allowanceNo：接口返回的津贴申请流水号
diff --git a/src/views/ebiz/allowance/application/List.vue b/src/views/ebiz/allowance/application/List.vue
index 6513a5d8e..cb1cdffe8 100644
--- a/src/views/ebiz/allowance/application/List.vue
+++ b/src/views/ebiz/allowance/application/List.vue
@@ -316,12 +316,12 @@ export default {
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + '/#/allowance/application/BaseInfo?reapply=1&allowanceNo=' + order.allowanceNo
+          url: location.origin + '/#/allowance/application/BaseInfo?reapply=' + order.allowanceNo + '&allowanceNo=' + order.allowanceNo
         },
         routerInfo: {
           path: '/allowance/application/BaseInfo',
           query: {
-            reapply: 1,
+            reapply: order.allowanceNo,
             allowanceNo: order.allowanceNo
           }
         }
diff --git a/src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue b/src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue
index 3da36625a..66f625451 100644
--- a/src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue
+++ b/src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue
@@ -1,6 +1,6 @@
 <template>
   <div class='orderDetail-container'>
-    <index-bar :allowance-no='$route.query.allowanceNo' v-if='!isWeixin'></index-bar>
+    <index-bar :allowance-no='$route.query.allowanceNo' :reapply-no='$route.query.reapply' v-if='!isWeixin'></index-bar>
     <div v-for='(item, index) in allowanceSignDTOLst' :key='index'>
       <!-- 申请人 -->
       <div v-if='item.type == 1 && !isWeixin'>
@@ -32,13 +32,16 @@
         <p v-if='!isWeixin' class='fw600 border-gb'>
           <span>享受人</span><span class='ml60'>{{ allowanceEnjoyDTO.name }}</span>
         </p>
-        <p v-if="!isWeixin">点击【签名】按钮，进行享受人签名</p>
-        <p class="border-gb">
+        <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 />
+          <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 />
           <!-- 享受人有分享功能 -->
           <van-button
             type='danger'
@@ -589,7 +592,7 @@ export default {
           //     isSignPathEnjoy = true
           //   }
           // })
-           
+
           if (this.isWeixin && this.allowanceApplyDTO.approvalStatus == '1') {
             Dialog.alert({
               title: '提示',
@@ -599,15 +602,24 @@ export default {
               window.close()
               WeixinJSBridge.call('closeWindow')
             })
-          }else if(this.isWeixin && this.allowanceApplyDTO.approvalStatus == '4'){
+          } else if (this.isWeixin && this.allowanceApplyDTO.approvalStatus == '2') {
             Dialog.alert({
               title: '提示',
               confirmButtonText: '退出',
-              message: '当前链接已失效，请您联系业务员获取（重新分享）。',
+              message: '亲，当前申请已完成审批~'
             }).then(() => {
-              window.close();
-              WeixinJSBridge.call('closeWindow');
-            });
+              window.close()
+              WeixinJSBridge.call('closeWindow')
+            })
+          } else if (this.isWeixin && this.allowanceApplyDTO.approvalStatus == '4') {
+            Dialog.alert({
+              title: '提示',
+              confirmButtonText: '退出',
+              message: '当前链接已失效，请您联系业务员获取（重新分享）。'
+            }).then(() => {
+              window.close()
+              WeixinJSBridge.call('closeWindow')
+            })
           }
           // else if (this.isWeixin && isSignPathEnjoy){
           //   Dialog.alert({