From 2d93faa6544de6b80420d3e340246deab5f36f65 Mon Sep 17 00:00:00 2001
From: liyuetong <li.yuetong@ebiz-fooge.com>
Date: Sat, 18 Sep 2021 16:29:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8--=E5=B7=B2?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=B7=B3=E8=BD=AC=E5=8F=AF=E4=BB=A5=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=90=8E=E5=8F=8D=E6=98=BE=E5=AE=A1=E6=89=B9=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E5=92=8C=E5=AE=A1=E6=89=B9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/parentList/Parent.vue          |  3 +--
 src/views/ebiz/allowance/Detail.vue                | 12 ++++++++----
 src/views/ebiz/allowance/application/List.vue      | 14 ++++++--------
 src/views/ebiz/allowance/application/process.vue   |  6 ++++--
 src/views/ebiz/allowance/approval/List.vue         | 14 +++++++-------
 .../allowance/myInfo/SignatureConfirmation.vue     |  0
 6 files changed, 26 insertions(+), 23 deletions(-)
 delete mode 100644 src/views/ebiz/allowance/myInfo/SignatureConfirmation.vue

diff --git a/src/components/ebiz/parentList/Parent.vue b/src/components/ebiz/parentList/Parent.vue
index 82a73e4d1..3b380dc06 100644
--- a/src/components/ebiz/parentList/Parent.vue
+++ b/src/components/ebiz/parentList/Parent.vue
@@ -15,7 +15,7 @@
       </div>
       <div v-else class='text-center'>
         <img class='mt40 w200' src='../../../assets/images/pic_page-non.png' />
-        <p class='mt15'>暂无数据</p>
+        <p class='mt15'>{{ locationHashFlag !== -1 ? '暂无数据':'暂无数据，请在我的资料或申请流程中添加父母信息' }}</p>
       </div>
     </van-index-bar>
 
@@ -34,7 +34,6 @@
 import { getAllowanceBaseList, check } from '@/api/ebiz/parentList/parentList'
 import { getAllowanceBaseDetail } from '@/api/ebiz/allowance/myInfo'
 import dataDictionary from '@/assets/js/utils/data-dictionary' //根据数据字典找到用户等级
-import utils from '@/assets/js/business-common'
 import { IndexBar, IndexAnchor, Tag, Icon, Dialog } from 'vant'
 
 export default {
diff --git a/src/views/ebiz/allowance/Detail.vue b/src/views/ebiz/allowance/Detail.vue
index 64dea4ac9..16d34cc75 100644
--- a/src/views/ebiz/allowance/Detail.vue
+++ b/src/views/ebiz/allowance/Detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="['orderDetail-container', 'bg-white', type == '1' ? 'pb50' : 'pb30']">
+  <div :class="['orderDetail-container', 'bg-white', (type == '1'||type == '2') ? 'pb50' : 'pb30']">
     <van-collapse v-model="activeNames">
       <!-- 基本信息 开始 -->
       <van-collapse-item class="main-title" name="baseInfo">
@@ -111,12 +111,12 @@
       </van-collapse-item>
       <!-- 签名信息 结束 -->
       <!-- 审批结论 开始 -->
-      <van-collapse-item class="main-title bg-white" name="signInfo" v-if="type == '1'">
+      <van-collapse-item class="main-title bg-white" name="signInfo" v-if="type == '1'||type == '2'">
         <template slot="title">
           <span>审批结论</span>
         </template>
         <div class="ml15 mt20 mb10">
-          <van-radio-group v-model="approveResult">
+          <van-radio-group v-model="approveResult" :disabled="type == '2'">
             <van-radio class="mb10" name="1" checked-color="#2E4591">通过</van-radio>
             <van-radio name="0" checked-color="#2E4591">驳回</van-radio>
           </van-radio-group>
@@ -126,6 +126,7 @@
           v-if="approveResult == '0'"
           v-model="approveMsg"
           rows="2"
+          :disabled="type == '2'"
           autosize
           label=""
           type="textarea"
@@ -172,7 +173,7 @@ export default {
       colorButton: '#2E4591', //select-radio中按钮颜色
       typeButton: 'default',
       allowanceNo: this.$route.query.allowanceNo, //数据流水号
-      type: this.$route.query.type, //type 0申请详情 1审批详情
+      type: this.$route.query.type, //type 0申请详情 1去审批 2审批详情
       areaList,
       areaStr: '',
       border: true,
@@ -184,6 +185,7 @@ export default {
       mediaDTOSList: [], //影像信息--证件类型
       allowanceBankDTO: {},
       allowanceSignDTOLst: [],
+      approveNodeDTO: {},  //审批相关信息
       activeNames: ['baseInfo', 'accountInfo', 'MediaInfo', 'signInfo'],
       sexRadio: [
         {
@@ -246,6 +248,8 @@ export default {
           this.mediaUploadDTOLst = allowanceDTO.mediaUploadDTOLst
           this.allowanceBankDTO = allowanceDTO.allowanceBankDTO //银行卡相关信息
           this.allowanceSignDTOLst = allowanceDTO.allowanceSignDTOLst //签字相关信息
+          this.approveResult = allowanceDTO.approveNodeDTO.approveResult, //审批结果 (0-审批拒绝,1-审批通过)
+          this.approveMsg = allowanceDTO.approveNodeDTO.approveMsg, //审批信息
           this.showbackBankAddressStr(this.allowanceBankDTO.bankProvinceCode, this.allowanceBankDTO.bankAreaCode) // provinceCode, cityCode查询省市，数据反显
           //处理影像中的关系证明
           if (this.mediaUploadDTOLst != null) {
diff --git a/src/views/ebiz/allowance/application/List.vue b/src/views/ebiz/allowance/application/List.vue
index 7dc24c534..21dac6e27 100644
--- a/src/views/ebiz/allowance/application/List.vue
+++ b/src/views/ebiz/allowance/application/List.vue
@@ -14,7 +14,7 @@
             <div class="flex justify-content-s align-items-c">
               <div>
                 <div class="w70 inline-b">
-                  <van-tag plain color="#5CA7DE">申请人</van-tag>
+                  <van-tag plain color="#2e4591">申请人</van-tag>
                 </div>
                 <span class="fs15 c-gray-dark">{{ order.name }}</span>
               </div>
@@ -24,7 +24,7 @@
               <div class="w70 inline-b">
                 <van-tag
                   plain
-                  color="#5CA7DE
+                  color="#2e4591
                     "
                   >申请时间</van-tag
                 >
@@ -113,12 +113,11 @@ export default {
         this.$jump({
           flag: 'h5',
           extra: {
-            url: location.origin + '/#/allowance/application/BaseInfo?type=add&parentShowPicker=true'
+            url: location.origin + '/#/allowance/myInfo/BaseInfo?parentShowPicker=true'
           },
           routerInfo: {
-            path: '/allowance/application/BaseInfo',
+            path: '/allowance/myInfo/BaseInfo',
             query: {
-              type: 'add',
               parentShowPicker: true
             }
           }
@@ -307,12 +306,11 @@ export default {
                 this.$jump({
                   flag: 'h5',
                   extra: {
-                    url: location.origin + '/#/allowance/application/BaseInfo?type=add&parentShowPicker=true'
+                    url: location.origin + '/#/allowance/myInfo/BaseInfo?parentShowPicker=true'
                   },
                   routerInfo: {
-                    path: '/allowance/application/BaseInfo',
+                    path: '/allowance/myInfo/BaseInfo',
                     query: {
-                      type: 'add',
                       parentShowPicker: true
                     }
                   }
diff --git a/src/views/ebiz/allowance/application/process.vue b/src/views/ebiz/allowance/application/process.vue
index 22e57c890..701c3e3b9 100644
--- a/src/views/ebiz/allowance/application/process.vue
+++ b/src/views/ebiz/allowance/application/process.vue
@@ -2,7 +2,7 @@
   <div class="entry-container pt60 pb30 bg-white">
     <div class="ml130 w200 nowrap flex align-items-c text-center">
       <div class="w110 inline-b text-center">
-        提交申请<br /><span class="grey">{{ approveMapping[0].createdDate }}</span>
+        提交申请<br /><span class="grey"></span>
       </div>
       <van-tag class="w45" color="green" plain style="margin-top: -14px">已完成</van-tag>
     </div>
@@ -133,7 +133,9 @@ export default {
       Dialog.confirm({
         className: 'dialog-check',
         title: '*驳回原因',
-        message: approveMsg
+        message: approveMsg,
+        confirmButtonText:'去修改',
+        cancelButtonText:'关闭'
         // cancelButtonColor: '#E9332E',
         // confirmButtonColor: '#FFFFFF'
       })
diff --git a/src/views/ebiz/allowance/approval/List.vue b/src/views/ebiz/allowance/approval/List.vue
index e5ea88e20..4c3f17782 100644
--- a/src/views/ebiz/allowance/approval/List.vue
+++ b/src/views/ebiz/allowance/approval/List.vue
@@ -18,7 +18,7 @@
               <div class="flex justify-content-s align-items-c">
                 <div>
                   <div class="w70 inline-b">
-                    <van-tag plain color="#5CA7DE">申请人</van-tag>
+                    <van-tag plain color="#2e4591">申请人</van-tag>
                   </div>
                   <span class="fs15 c-gray-dark">{{ order.name }}</span>
                 </div>
@@ -28,7 +28,7 @@
                 <div class="w70 inline-b">
                   <van-tag
                     plain
-                    color="#5CA7DE
+                    color="#2e4591
                     "
                     >申请时间</van-tag
                   >
@@ -55,12 +55,12 @@
         > 
       </div>
 
-      <div class="bottom-btn bg-white pt10 pb10 flex justify-content-s" style="border-top: 1px solid #dadada" v-if="active == 'uncommit'">
+      <div class="bottom-btn bg-white flex justify-content-s" style="border-top: 1px solid #2e4591" v-if="active == 'uncommit'">
         <div>
-          <van-checkbox class="ml10" v-model="checkedAll" checked-color="#2e4591" @click="checkAll">全选</van-checkbox>
+          <van-checkbox class="ml10 mt15" v-model="checkedAll" checked-color="#2e4591" @click="checkAll">全选</van-checkbox>
         </div>
         <div>
-          <van-button class="ffcb6b" type="danger" round size="small" @click="passHandle" v-no-more-click="1000">审批通过</van-button>
+          <van-button class="ffcb6b pl10 pr10" type="danger" size="large" @click="passHandle" v-no-more-click="1000">审批通过</van-button>
         </div>
       </div>
     </div>
@@ -163,13 +163,13 @@ export default {
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + `/#/allowance/detail?allowanceNo=${order.allowanceNo}&type=0`
+          url: location.origin + `/#/allowance/detail?allowanceNo=${order.allowanceNo}&type=2`
         },
         routerInfo: {
           path: '/allowance/detail',
           query: {
             allowanceNo: order.allowanceNo,
-            type: '0'
+            type: '2'
           }
         }
       })
diff --git a/src/views/ebiz/allowance/myInfo/SignatureConfirmation.vue b/src/views/ebiz/allowance/myInfo/SignatureConfirmation.vue
deleted file mode 100644
index e69de29bb..000000000