From 3fbc1153db8ee61d6efa3f374d3f6b9365ce16dc Mon Sep 17 00:00:00 2001
From: liyuetong <li.yuetong@ebiz-fooge.com>
Date: Fri, 10 Sep 2021 17:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=A5=E8=B4=B4=E7=94=B3=E8=AF=B7-=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ebiz/allowance/allowance.js           |  10 +-
 src/views/ebiz/allowance/Detail.vue           |  15 +-
 src/views/ebiz/allowance/application/List.vue | 445 ++++++------------
 .../ebiz/allowance/application/process.vue    |  62 ++-
 4 files changed, 217 insertions(+), 315 deletions(-)

diff --git a/src/api/ebiz/allowance/allowance.js b/src/api/ebiz/allowance/allowance.js
index b2426fc80..5c1f25cd1 100644
--- a/src/api/ebiz/allowance/allowance.js
+++ b/src/api/ebiz/allowance/allowance.js
@@ -29,7 +29,7 @@ export function getApproveList(data) {
 // 津贴申请-列表
 export function getAllowanceLst(data) {
   return request({
-    url: getUrl('agent/allowance/getAllowanceLst', 1),
+    url: getUrl('/agent/allowance/getAllowanceLst', 1),
     method: 'post',
     data
   })
@@ -82,6 +82,14 @@ export function myDataremind(data) {
     data
   })
 }
+// 津贴-津贴申请人撤销接口
+export function revokerApprove(data) {
+  return request({
+    url: getUrl('/agent/allowance/approve/revokerApprove', 1),
+    method: 'post',
+    data
+  })
+}
 
 
 
diff --git a/src/views/ebiz/allowance/Detail.vue b/src/views/ebiz/allowance/Detail.vue
index d67866f0f..2e55abab4 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 pb100">
+  <div :class="['orderDetail-container', 'bg-white', type == '1' ? 'pb50' : 'pb10']">
     <van-collapse v-model="activeNames">
       <!-- 基本信息 开始 -->
       <van-collapse-item class="main-title" name="baseInfo">
@@ -256,8 +256,8 @@ export default {
 </script>
 <style lang="scss">
 #app .van-radio__icon--checked .van-icon {
-    border-color: #2e4591 !important;
-    background-color: #2e4591 !important;
+  border-color: #2e4591 !important;
+  background-color: #2e4591 !important;
 }
 </style>
 <style lang="scss" scoped>
@@ -286,7 +286,7 @@ export default {
   }
 
   /deep/.sex-radio .radio-area {
-    margin-left: 55px;
+    margin-left: 15px;
   }
   /deep/.van-cell.m-textarea .van-field__label {
     width: 0;
@@ -295,5 +295,12 @@ export default {
     border: 1px solid #eee;
     padding: 5px;
   }
+
+  /deep/.van-cell .van-cell__value {
+    -webkit-box-flex: 2;
+    -webkit-flex: 2;
+    flex: 2;
+    text-align: left;
+  }
 }
 </style>
diff --git a/src/views/ebiz/allowance/application/List.vue b/src/views/ebiz/allowance/application/List.vue
index 650400840..6ea3fb3d8 100644
--- a/src/views/ebiz/allowance/application/List.vue
+++ b/src/views/ebiz/allowance/application/List.vue
@@ -4,129 +4,68 @@
       <van-tabs :line-width="45" v-model="active" @change="tabChange" sticky>
         <van-tab name="uncommit" title="未提交"></van-tab>
         <van-tab name="commit" title="审批中"></van-tab>
-        <van-tab name="waitUnderwritten" title="审批通过"></van-tab>
+        <van-tab name="pass" title="审批通过"></van-tab>
       </van-tabs>
     </van-sticky>
-
-    <van-list
-      v-model="loading"
-      :immediate-check="false"
-      :finished="finished"
-      :finished-text="finishedText"
-      error-text="请求失败，点击重新加载"
-      :error.sync="error"
-      @load="loadMore"
-      class="pb45"
-    >
-      <div v-if="isSuccess">
-        <div v-if="saleList.length > 0">
-          <div v-for="(order, index) in saleList" :key="index">
-            <!-- <div class="fs12 mt20 mb5 text-center">{{ order.orderInfoDTO.createDate }}</div> -->
-            <div class="bg-white m15 pv15 pr15 pl10">
-              <div class="flex justify-content-s  align-items-c">
-                <div>
-                  <div class="w70 inline-b">
-                    <van-tag plain color="#5CA7DE">申请人</van-tag>
-                  </div>
-                  <span class="fs15 c-gray-dark">{{ order.appntDTO.name }}</span>
+    <div v-if="isSuccess">
+      <div v-if="saleList.length > 0">
+        <div v-for="(order, index) in saleList" :key="index">
+          <div class="bg-white m15 pv15 pr15 pl10">
+            <div class="flex justify-content-s align-items-c">
+              <div>
+                <div class="w70 inline-b">
+                  <van-tag plain color="#5CA7DE">申请人</van-tag>
                 </div>
+                <span class="fs15 c-gray-dark">{{ order.name }}</span>
               </div>
+            </div>
 
-                <div class="mv15">
-                  <div class="w70 inline-b">
-                    <van-tag plain color="#5CA7DE
-                    ">申请时间</van-tag>
-                  </div>
-                  <span class="fs15 c-gray-dark">{{ order.orderInfoDTO.createDate }}</span>
-                </div>
-
-              <div class="text-right mt15 ">
-                <van-button v-if="active == 'uncommit'" round @click="goEdit(order)" size="small" class="mr5" type="danger" v-no-more-click="1000"
-                  >编辑</van-button
-                >
-                <van-button
-                  v-if="active == 'uncommit'"
+            <div class="mv15">
+              <div class="w70 inline-b">
+                <van-tag
                   plain
-                  round
-                  @click.stop="del(order, index)"
-                  size="small"
-                  class="mr5"
-                  type="danger"
-                  v-no-more-click="1000"
-                  >删除</van-button
+                  color="#5CA7DE
+                    "
+                  >申请时间</van-tag
                 >
-                <van-button
-                  @click="revokeOrder(order)"
-                  v-if="active == 'commit'"
-                  plain
-                  size="small"
-                  class="mr5"
-                  type="danger"
-                  round
-                  >撤销</van-button
-                >
-                <van-button @click="seeDetail(order)" v-if="active == 'commit'" size="small" type="danger" round class="mr5" >查看详情</van-button>
-                <van-button @click="seeProcess(order)" v-if="active == 'commit'" size="small" type="danger" round>查看审批流程</van-button>
-                <van-button
-                  @click="applicationAgainFunc(order)"
-                  v-if="active == 'waitUnderwritten'"
-                  size="small"
-                  class="mr5"
-                  type="danger"
-                  round
-                  >再次申请</van-button
-                >
-                <van-button plain @click="seeProcess(order)" v-if="active == 'waitUnderwritten'" size="small" type="danger" round>查看审批流程</van-button>
               </div>
+              <span class="fs15 c-gray-dark">{{ order.applyMonth }}</span>
+            </div>
+
+            <div class="text-right mt15">
+              <van-button v-if="active == 'uncommit'" round @click="goEdit(order)" size="small" class="mr5" type="danger" v-no-more-click="1000"
+                >编辑</van-button
+              >
+              <van-button v-if="active == 'uncommit'" plain round @click.stop="del(order, index)" size="small" class="mr5" type="danger" v-no-more-click="1000"
+                >删除</van-button
+              >
+              <van-button @click="revokeOrder(order)" v-if="active == 'commit'" plain size="small" class="mr5" type="danger" round>撤销</van-button>
+              <van-button @click="seeDetail(order)" v-if="active == 'commit'" size="small" type="danger" round class="mr5">查看详情</van-button>
+              <van-button @click="seeProcess(order)" v-if="active == 'commit'" size="small" type="danger" round>查看审批流程</van-button>
+              <van-button @click="applicationAgainFunc(order)" v-if="active == 'waitUnderwritten'" size="small" class="mr5" type="danger" round
+                >再次申请</van-button
+              >
+              <van-button plain @click="seeProcess(order)" v-if="active == 'waitUnderwritten'" size="small" type="danger" round>查看审批流程</van-button>
             </div>
           </div>
         </div>
-
-        <div v-else class="text-center">
-          <img class="mt40 w100 h100" src="@/assets/images/allowance/no_data.png" />
-          <div class="fs17 mt40 gray">暂无申请记录</div>
-        </div>
       </div>
-    </van-list>
-
+      <div v-else class="text-center">
+        <img class="mt40 w100 h100" src="@/assets/images/allowance/no_data.png" />
+        <div class="fs17 mt40 gray">暂无申请记录</div>
+      </div>
+    </div>
     <van-button type="danger" class="bottom-btn" @click="applicationFunc" v-no-more-click="1000">点击申请</van-button>
-    <!-- <van-dialog
-      class="dialog-delete"
-      @confirm="checkCaptchaCode"
-      @cancel="cancelCaptchaCode"
-      :before-close="beforeClose"
-      confirm-button-color="#fff"
-      v-model="revokePanelShow"
-      title="短信验证"
-      show-cancel-button
-    >
-      <p class="captchaReceiver">投保人手机号: {{ captchaReceiver | phoneNumFilter }}</p>
-      <van-field v-model="sms" center clearable placeholder="请输入短信验证码">
-        <template #button>
-          <van-button :disabled="sendTime !== 0" v-no-more-click="1000" @click="getCaptchaCode" size="small" type="danger">{{
-            sendTime ? `${sendTime}s后获取` : '获取验证码'
-          }}</van-button>
-        </template>
-      </van-field>
-    </van-dialog> -->
-
-    <!-- 短信验证 -->
-    <!-- <check-agent @checModelSuccessMethod="initThisPage" /> -->
   </div>
 </template>
 
 <script>
 import { Search, Tabs, Tab, List, Tag, Sticky, Toast, Dialog, Field } from 'vant'
-import { orderList, deleteOrderInfo, getAuthCode, revokeOrder } from '@/api/ebiz/sale/sale'
-import { funcPermCheck } from '@/api/ebiz/common/common'
-import { formatRiskList } from '@/assets/js/utils/formatRiskList.js'
-import dataDictionary from '@/assets/js/utils/data-dictionary' //根据数据字典找到用户等级
-import CheckAgent from '@/components/common/CheckAgent'
+import { getAllowanceLst, revokerApprove, myDataremind, allowanceCheck } from '@/api/ebiz/allowance/allowance'
 
 export default {
   name: 'applicationList',
   components: {
-    [CheckAgent.name]: CheckAgent,
     [Field.name]: Field,
     [Search.name]: Search,
     [Tabs.name]: Tabs,
@@ -140,36 +79,9 @@ export default {
     return {
       isCheck: 0, //查看是否有权限
       searchName: '',
-      active: 'uncommit', //uncommit 表示未提交  commit表示已提交  waitUnderwritten审批通过
+      active: 'uncommit', //状态 uncommit - 未提交; commit - 审批中; pass - 已通过
       saleList: [],
-      loading: false,
-      finished: false,
-      total: '', //总页数
-      currentPage: 1, //当前页数
-      error: false,
-      finishedText: '没有更多了',
-      pageSize: 5, //每页数据条数
-      isSuccess: false,
-      canRevoke: {
-        '19': true,
-        '02': true,
-        '48': true,
-        '49': true,
-        '55': true,
-        '58': true,
-        '46': true,
-        '50': true,
-        '51': true
-      },
-      revokePanelShow: false,
-      sms: '',
-      smsId: '',
-      sendTime: 0,
-      getCaptcha: false,
-      captchaTimer: null,
-      captchaReceiver: '',
-      revokeOrderNo: '',
-      captchaMaped: false
+      isSuccess: false
     }
   },
   mounted() {
@@ -180,7 +92,8 @@ export default {
       })
     }, 100)
     window.appCallBack = this.appCallBack
-      this.loadMore()
+    this.getList()
+    this.remindFunc()
   },
   methods: {
     appCallBack(data) {
@@ -190,56 +103,19 @@ export default {
         })
       }
     },
-    //分页用
-    loadMore() {
-      let pageInfo = {
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-        orderType: this.active,
-        name: this.searchName,
-        desensitizType: this.active === 'uncommit' ? 1 : 0
-      }
-      this.getOrderList(pageInfo)
-    },
     //初始化保单列表
-    getOrderList(pageInfo) {
-      orderList(pageInfo).then(res => {
+    getList() {
+      getAllowanceLst({
+        status: this.active
+      }).then((res) => {
         if (res.result == '0') {
+          this.checkboxResult = []
           this.isSuccess = true
-          this.currentPage++
-          if (res.orderDTOPageInfo == null || res.orderDTOPageInfo == '' || res.orderDTOPageInfo == undefined) {
-            this.finished = true
-            this.loading = false
-            this.finishedText = ''
-            return
-          }
-          let list = res.orderDTOPageInfo.list
-          if (list.length == 0) {
-            this.finishedText = ''
-          } else {
-            this.finishedText = '已经全部加载'
-          }
-          list = formatRiskList(list, 'insuredDTOs', 'riskDTOLst') //根据后面两个参数 来格式化数据
-          dataDictionary.policyState.forEach(state => {
-            list.forEach(order => {
-              if (state.id == order.orderInfoDTO.orderStatus) {
-                order.stateName = state.text
-              }
-            })
-          })
-          this.saleList = this.saleList.concat(list)
+          this.saleList = res.content
           if (this.saleList.length == 0) {
             this.isSuccess = false
           }
           this.loading = false
-          if (res.orderDTOPageInfo.nextPage == 0) {
-            //当下一页为0时  表示全部数据加载完毕
-            this.finished = true
-          }
-        } else {
-          this.finished = true
-          this.loading = false
-          this.finishedText = res.resultMessage
         }
       })
     },
@@ -247,60 +123,29 @@ export default {
       this.currentPage = 1
       this.active = name
       this.saleList = []
-      ;[this.loading, this.finished] = [true, false]
-      this.finishedText = '正在加载...'
-      this.loadMore()
+      this.getList()
     },
     //编辑--详情
     goEdit(order) {
       //判断是否符合条件
       let isConditions = this.isConditionsFunc()
-      if(isConditions == false){
+      if (isConditions == false) {
         return false
       }
-      window.localStorage.setItem('detailJump', '')
-      if (order.insuredDTOs[0]) {
-        if (order.insuredDTOs[0].riskDTOLst[0]) {
-          localStorage.setItem('productCode', order.insuredDTOs[0].riskDTOLst[0].mainRiskCode)
-        }
-      }
-      let orderStatus = order.orderInfoDTO.orderStatus
-      let orderNo = order.orderInfoDTO.orderNo
+      let orderStatus = order.orderStatus
       let url = ''
-      //保存对应的订单号
-      localStorage.orderNo = orderNo
-      localStorage.isFrom = 'sale'
-      localStorage.removeItem('changeCard')
       switch (orderStatus) {
-        case '01': //已签名待客户确认, 跳到签名确认页面
-          url = '/sale/SignatureConfirmation?edit=1'
+        case '01': //基本信息
+          url = '/allowance/application/BaseInfo?allowanceNo=' + order.allowanceNo + '&type=edit'
           break
-        case '43': //未签名待客户确认, 跳到签名确认页面
-          url = '/sale/SignatureConfirmation?edit=1'
+        case '43': //账户信息
+          url = '/allowance/application/AccountInfo?allowanceNo=' + order.allowanceNo + '&type=edit'
           break
-        case '35': //投保人保存成功, 跳到被保险人页面--
-          url = '/sale/insuredPerson?edit=1'
+        case '33': //影像附件
+          url = '/allowance/application/AttachmentManagement?allowanceNo=' + order.allowanceNo + '&type=edit'
           break
-        case '36': //被保险人保存成功, 跳到已选产品列表
-          url = '/common/selectedProduct?edit=1'
-          break
-        case '37': //受益人保存成功, 跳到告知信息--
-          url = '/sale/NotifyingMessage?edit=1'
-          break
-        case '38': //账户信息保存成功, 跳到附件管理--
-          url = '/sale/AttachmentManagement?edit=1'
-          break
-        case '39': //险种信息保存成功, 跳到已选产品列表
-          url = '/common/selectedProduct?edit=1'
-          break
-        case '40': //告知信息保存成功, 跳到账户信息--
-          url = '/sale/AccountInformation?edit=1'
-          break
-        case '': //跳到投保人
-          url = '/sale/insuredInfo?edit=1'
-          break
-        case '44': //建议书转投保, 跳到投保人
-          url = '/sale/insuredInfo?edit=1'
+        case '35': //签字页面
+          url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&type=edit'
           break
         default:
           break
@@ -311,7 +156,13 @@ export default {
           forbidSwipeBack: '1',
           url: location.origin + `/#${url}`
         },
-        routerInfo: { path: url }
+        routerInfo: {
+          path: url,
+          query: {
+            allowanceNo: order.allowanceNo,
+            type: 'edit'
+          }
+        }
       })
     },
     //删除投保单
@@ -329,23 +180,16 @@ export default {
         .confirm({
           className: 'dialog-blue',
           title: '提示',
-          message: '确认删除投保单吗？',
+          message: '确认删除投保单吗？'
           // cancelButtonColor: '#2e4591',
           // confirmButtonColor: '#FFFFFF'
         })
         .then(() => {
-          deleteOrderInfo(params).then(res => {
+          deleteOrderInfo(params).then((res) => {
             if (res.result == 0) {
-              this.saleList = []
-              this.isSuccess = false
-              this.currentPage = 1
-              ;[this.loading, this.finished] = [true, false]
-              let pageInfo = {
-                pageNum: this.currentPage,
-                pageSize: this.pageSize,
-                orderType: this.active
-              }
-              this.loadMore(pageInfo)
+              // this.saleList = []
+              // this.isSuccess = false
+              this.getList()
             } else {
               Toast.fail(res.resultMessage)
             }
@@ -355,52 +199,51 @@ export default {
     },
     //撤销
     revokeOrder(order) {
-      console.dir(order)
       this.$dialog
         .confirm({
-          className: 'dialog-delete',
+          className: 'dialog-blue',
           title: '提示',
-          message: '撤单后,数据将不可恢复,您确定要撤单吗?',
-          cancelButtonColor: '#2e4591',
-          confirmButtonColor: '#FFFFFF'
+          message: '当前申请正在审批中，是否撤销申请？'
         })
         .then(() => {
-          this.revokePanelShow = true
-          this.captchaReceiver = order.appntDTO.mobile
-          this.revokeOrderNo = order.orderInfoDTO.orderNo
+          revokerApprove({
+            allowanceNo: order.allowanceNo
+          }).then((res) => {
+            if (res.result == '0') {
+              this.getList()
+            } else {
+              this.$toast(res.resultMessage)
+            }
+          })
         })
     },
     //查看详情
     seeDetail(order) {
-      localStorage.orderNo = order.orderInfoDTO.orderNo
-      localStorage.removeItem('changeCard')
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + '/#/allowance/detail?type=1'
+          url: location.origin + '/#/allowance/detail?type=0&allowanceNo=' + order.allowanceNo
         },
         routerInfo: {
           path: '/allowance/detail',
           query: {
-            type: 1
+            type: 0,
+            allowanceNo: order.allowanceNo
           }
         }
       })
     },
     //查看审批流程
     seeProcess(order) {
-      localStorage.orderNo = order.orderInfoDTO.orderNo
-      localStorage.removeItem('changeCard')
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + '/#/allowance/application/process?submitTime='+ order.orderInfoDTO.createDate+'&allowanceNo='+'1002'
+          url: location.origin + '/#/allowance/application/process?allowanceNo=' + order.allowanceNo
         },
         routerInfo: {
           path: '/allowance/application/process',
           query: {
-            submitTime: order.orderInfoDTO.createDate,
-            allowanceNo:'1002'
+            allowanceNo: order.allowanceNo
           }
         }
       })
@@ -409,77 +252,108 @@ export default {
     applicationAgainFunc(order) {
       //判断是否符合条件
       let isConditions = this.isConditionsFunc()
-      if(isConditions == false){
+      if (isConditions == false) {
         return false
       }
-      localStorage.orderNo = order.orderInfoDTO.orderNo
-      localStorage.removeItem('changeCard')
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + '/#/allowance/application/BaseInfo'
+          url: location.origin + '/#/allowance/application/BaseInfo?allowanceNo=' + order.allowanceNo + '&type=reapply'
         },
         routerInfo: {
           path: '/allowance/application/BaseInfo',
           query: {
-            type: 1
+            allowanceNo: order.allowanceNo,
+            type: 'reapply'
           }
         }
       })
     },
+    // 1、3个月定期提醒申请人，更新资料，第四个月的21日提醒；
+    // 2、点击【暂不更新】关闭弹窗，点击【去更新】，跳转至“填写津贴申请信息”页面，反显，不清空历史数据。
+    remindFunc() {
+      myDataremind({}).then((res) => {
+        if (res.result == '1') {
+          this.$dialog
+            .confirm({
+              className: 'dialog-blue',
+              title: '提示',
+              message: res.resultMessage,
+              confirmButtonText: '去更新',
+              cancelButtonText: '暂不需要'
+            })
+            .then(() => {
+              //todo
+              // this.$jump({
+              //   flag: 'h5',
+              //   extra: {
+              //     url: location.origin + '/#/allowance/application/BaseInfo?type=add'
+              //   },
+              //   routerInfo: {
+              //     path: '/allowance/application/BaseInfo',
+              //     query: {
+              //       type: 'add'
+              //     }
+              //   }
+              // })
+            })
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
+    },
     //不符合条件时，阻断toast提示，触发按钮包括“津贴申请列表-未审批”【编辑】、“津贴申请列表-审批通过”【再次申请】、【点击申请】
     isConditionsFunc() {
-       Toast({
-      className:'textLeft',
-      duration: 3000, // 持续展示 toast
-      forbidClick: true,
-      message: '您当前暂不具备申请条件。\n需符合以下标准，方可申请津贴：\n1.连续达成36个月桂冠人力或连续达成\n24个月双冠人力；\n2.达成当月个人综合继续率：80%及以\n上；\n3.最近1年内没有被确认属实的品质投\n诉；\n4.父母其中一方年满60周岁，且在世，\n仅发放父母其中一人。',
-    });
-    // Toast('每月只能申请一次津贴，您当月已申请津贴，请下月再次申请。')
-      return false
+      allowanceCheck({}).then((res) => {
+        if (res.result == '1') {
+          Toast({
+            className: 'textLeft',
+            duration: 3000, // 持续展示 toast
+            forbidClick: true,
+            message: res.resultMessage
+          })
+          return false
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
     },
     //点击申请，跳转到津贴申请信息页面
     applicationFunc() {
       //判断是否符合条件
       let isConditions = this.isConditionsFunc()
-      if(isConditions == false){
+      if (isConditions == false) {
         return false
       }
-      localStorage.orderNo = ''
-      localStorage.chooseProductCodes = '' //置空所选险种
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + '/#/allowance/application/BaseInfo'
+          url: location.origin + '/#/allowance/application/BaseInfo?type=add'
         },
-        routerInfo: { path: '/allowance/application/BaseInfo' }
+        routerInfo: {
+          path: '/allowance/application/BaseInfo',
+          query: {
+            type: 'add'
+          }
+        }
       })
-      
-    },
-  },
-  filters: {
-    encryCheckModelMobile(code) {
-      return code.replace(/^(\d{3})\d{4}(\d{4})$/, '$1****$2')
-    },
-    phoneNumFilter(phoneNum) {
-      let num = phoneNum.split('')
-      num.splice(3, 4, '****')
-      return num.join('')
     }
   }
 }
 </script>
 <style lang="scss" scoped>
 #app .van-button--danger {
-    background: #2e4591;
-    border: 1px solid #2e4591;
+  background: #2e4591;
+  border: 1px solid #2e4591;
 }
-#app .van-button--plain.van-button--danger, #app .van-tag--plain.van-tag--danger {
-    color: #2e4591;
-    background: transparent;
+#app .van-button--plain.van-button--danger,
+#app .van-tag--plain.van-tag--danger {
+  color: #2e4591;
+  background: transparent;
 }
-/deep/ .van-tabs__line, #app .van-tag--danger {
-    background-color: #2e4591 !important;
+/deep/ .van-tabs__line,
+#app .van-tag--danger {
+  background-color: #2e4591 !important;
 }
 /deep/ .dialog-delete .van-dialog__header {
   padding: 0.5em;
@@ -497,13 +371,6 @@ export default {
   padding: 1em;
 }
 
-.captchaReceiver {
-  margin-bottom: 1em;
-  padding-bottom: 1em;
-  border-bottom: 1px solid #eaeaea;
-  font-size: 14px;
-}
-
 .van-search__content {
   background: #fff !important;
   border-radius: 10px;
diff --git a/src/views/ebiz/allowance/application/process.vue b/src/views/ebiz/allowance/application/process.vue
index 3bffd20ca..183487a35 100644
--- a/src/views/ebiz/allowance/application/process.vue
+++ b/src/views/ebiz/allowance/application/process.vue
@@ -1,7 +1,9 @@
 <template>
   <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">{{submitTime}}</span></div>
+      <div class="w110 inline-b text-center">
+        提交申请<br /><span class="grey">{{ approveMapping[0].createdDate }}</span>
+      </div>
       <van-tag class="w45" color="green" plain style="margin-top: -14px">已完成</van-tag>
     </div>
     <div class="ml80 w100 flex path relative" style="flex-wrap: wrap">
@@ -17,7 +19,9 @@
           <div class="flex nowrap align-items-c text-center relative pv5" style="left: -10%">
             <div class="relative">
               <div>
-                <div class="w110 inline-b text-center">{{ item.approveLevel | filterName }}<br /><span class="grey">{{item.modifiedDate}}</span></div>
+                <div class="w110 inline-b text-center">
+                  {{ item.approveLevel | filterName }}<br /><span class="grey">{{ item.modifiedDate }}</span>
+                </div>
                 <van-tag
                   class="w45 v-top"
                   v-if="item.approveStatus == '1' || item.approveStatus == '2'"
@@ -25,7 +29,13 @@
                   plain
                   >{{ item.approveStatus | statusFormat(approveStatus, approveResult) }}</van-tag
                 >
-                <span v-if="item.approveStatus == '1'" class="ml15 buttonYellow v-top" @click="urgeFunc">催办</span>
+                <!-- "urgeStatus": "1"   0--催办  1--已催办 -->
+                <span
+                  v-if="item.approveStatus == '1'"
+                  :class="['ml15', 'v-top', item.urgeStatus == '0' ? 'buttonYellow' : 'buttonHasUrge']"
+                  @click="urgeFunc(item.approveLevel)"
+                  >{{ item.urgeStatus | filterUrgeStatus }}</span
+                >
                 <van-button
                   v-if="item.approveStatus == '2' && item.approveResult == '0'"
                   @click="goSeeCause(item.approveMsg)"
@@ -34,7 +44,6 @@
                   type="danger"
                   >点击查看原因</van-button
                 >
-                
               </div>
             </div>
           </div>
@@ -71,15 +80,14 @@
 
 <script>
 import { Tag, Dialog } from 'vant'
-import { approveList } from '@/api/ebiz/allowance/allowance'
+import { approveList, approveUrge } from '@/api/ebiz/allowance/allowance'
 
 export default {
   data() {
     return {
-      submitTime: this.$route.query.submitTime,
       allowanceNo: this.$route.query.allowanceNo,
       approveMapping: [], //审批流程链
-      ebizExamineApproveDtoList: [], //历史审批信息链
+      ebizExamineApproveDtoList: [] //历史审批信息链
     }
   },
   components: {
@@ -121,18 +129,6 @@ export default {
         }
       })
     },
-    goBaseInfo() {
-      console.log('click上传')
-      this.$jump({
-        flag: 'h5',
-        extra: {
-          url: location.origin + `/#/agentEenter/AgentEenterBasicInfor`
-        },
-        routerInfo: {
-          path: `/agentEenter/AgentEenterBasicInfor`
-        }
-      })
-    },
     goSeeCause(approveMsg) {
       Dialog.confirm({
         className: 'dialog-check',
@@ -154,8 +150,19 @@ export default {
         })
         .catch(() => {})
     },
-    urgeFunc() {
-      this.$toast('每天只可催办一次')
+    urgeFunc(approveLevel) {
+      approveUrge({
+        allowanceNo: this.allowanceNo,
+        approveLevel: approveLevel
+      }).then((res) => {
+        if (res.result == '0') {
+          if (res.resultMessage) {
+            this.$toast(res.resultMessage)
+          }
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
     }
   },
   filters: {
@@ -186,6 +193,19 @@ export default {
           break
       }
       return text
+    },
+    filterUrgeStatus: function (value) {
+      // 0--催办  1--已催办
+      let text
+      switch (value) {
+        case '0':
+          text = '催办'
+          break
+        case '1':
+          text = '已催办'
+          break
+      }
+      return text
     }
   }
 }