diff --git a/src/views/ebiz/allowance/Detail.vue b/src/views/ebiz/allowance/Detail.vue index 0155e8503..31c9dd8bc 100644 --- a/src/views/ebiz/allowance/Detail.vue +++ b/src/views/ebiz/allowance/Detail.vue @@ -111,7 +111,7 @@ - + @@ -186,7 +186,7 @@ export default { allowanceBankDTO: {}, allowanceSignDTOLst: [], approveNodeDTO: {}, //审批相关信息 - activeNames: ['baseInfo', 'accountInfo', 'MediaInfo', 'signInfo'], + activeNames: ['baseInfo', 'accountInfo', 'MediaInfo', 'signInfo','resultInfo'], sexRadio: [ { label: '男', @@ -248,7 +248,7 @@ export default { this.mediaUploadDTOLst = allowanceDTO.mediaUploadDTOLst this.allowanceBankDTO = allowanceDTO.allowanceBankDTO //银行卡相关信息 this.allowanceSignDTOLst = allowanceDTO.allowanceSignDTOLst //签字相关信息 - this.approveResult = allowanceDTO.approveNodeDTO.approveResult, //审批结果 (0-审批拒绝,1-审批通过) + this.approveResult = allowanceDTO.approveNodeDTO.approveResult ='1', //审批结果 (0-审批拒绝,1-审批通过) this.approveMsg = allowanceDTO.approveNodeDTO.approveMsg, //审批信息 this.showbackBankAddressStr(this.allowanceBankDTO.bankProvinceCode, this.allowanceBankDTO.bankAreaCode) // provinceCode, cityCode查询省市,数据反显 //处理影像中的关系证明 @@ -275,6 +275,7 @@ export default { }, // provinceCode, cityCode查询省市,数据反显 showbackBankAddressStr(provinceCode, cityCode) { + console.log(provinceCode,cityCode,'dfasdf') let provinces = areaList.province_list let cities = areaList.city_list this.areaStr = `${provinces[provinceCode]}-${cities[cityCode]}` diff --git a/src/views/ebiz/allowance/application/List.vue b/src/views/ebiz/allowance/application/List.vue index 21dac6e27..9dd0aa750 100644 --- a/src/views/ebiz/allowance/application/List.vue +++ b/src/views/ebiz/allowance/application/List.vue @@ -29,7 +29,7 @@ >申请时间 - {{ order.applyMonth }} + {{ order.createdDate }}
@@ -194,7 +194,7 @@ export default { .confirm({ className: 'dialog-blue', title: '提示', - message: '确认删除投保单吗?' + message: '是否删除该申请?' // cancelButtonColor: '#2e4591', // confirmButtonColor: '#FFFFFF' }) @@ -325,16 +325,16 @@ export default { //不符合条件时,阻断toast提示,触发按钮包括“津贴申请列表-未审批”【编辑】、“津贴申请列表-审批通过”【再次申请】、【点击申请】 async isConditionsFunc(type, order) { // type 0点击申请 1编辑 2再次申请 - // const res = await allowanceCheck({}) - // if (res.result == '1') { - // Toast({ - // className: 'textLeft', - // duration: 3000, // 持续展示 toast - // forbidClick: true, - // message: res.resultMessage - // }) - // return - // } + const res = await allowanceCheck({}) + if (res.result == '1') { + Toast({ + className: 'textLeft', + duration: 3000, // 持续展示 toast + forbidClick: true, + message: res.resultMessage + }) + return + } if (type == 0) { this.applicationFunc() diff --git a/src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue b/src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue index abec49116..e493e1e7f 100644 --- a/src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue +++ b/src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue @@ -600,6 +600,7 @@ export default { extra: { title: `国富人寿桂冠专属父母赡养津贴申请`, content: '点击去签字', + shareScene:0,// 0只分享好友,1 只分享朋友圈 不传默认所有 url: location.origin + '/#/allowance/application/signatureConfirmation?allowanceNo=' + this.allowanceNo + '&token=' + res.content, // '&relationToAppnt=' + // JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt + diff --git a/src/views/ebiz/allowance/application/process.vue b/src/views/ebiz/allowance/application/process.vue index 701c3e3b9..d600c0c45 100644 --- a/src/views/ebiz/allowance/application/process.vue +++ b/src/views/ebiz/allowance/application/process.vue @@ -2,7 +2,7 @@
- 提交申请
+ 提交申请
{{approveMapping[0].createdDate}}
已完成
@@ -164,6 +164,7 @@ export default { this.$toast(res.resultMessage) } } else { + this.processCheck() this.$toast(res.resultMessage) } })