From bea756a35007ba50083ae1a0fe3d6178d6f9e6d1 Mon Sep 17 00:00:00 2001 From: "liu.xiaofeng@ebiz-digits.com" Date: Thu, 29 Jun 2023 20:42:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=B9=A6-=E4=BF=9D=E8=B4=B9?= =?UTF-8?q?=E8=AF=95=E7=AE=97=E9=A1=B5=E9=9D=A2-=E8=AF=95=E7=AE=97?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=9D=E5=AD=98=E6=9B=B4=E6=96=B0--?= =?UTF-8?q?=E7=BC=96=E8=BE=912?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 98 +++++++++++----------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 71b3bc226..ce2c4e214 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -610,29 +610,29 @@ export default { appCallBack(data) { if (data.trigger == 'right_button_click' && localStorage.isFrom == 'proposal') { return this.$dialog - .confirm({ - className: 'dialog-delete', - title: '提示', - message: '退出流程可能会丢失部分数据，是否确认退出？', - cancelButtonColor: '#E9332E', - confirmButtonColor: '#FFFFFF' - }) - .then(() => { - this.$jump({ - flag: 'h5', - extra: { - title: '建议书列表', - forbidSwipeBack: 1, //当前页面禁止右滑返回 - url: location.origin + `/#/proposal/list` - }, - routerInfo: { - path: `/proposal/list`, - type: '1' - } - }) + .confirm({ + className: 'dialog-delete', + title: '提示', + message: '退出流程可能会丢失部分数据，是否确认退出？', + cancelButtonColor: '#E9332E', + confirmButtonColor: '#FFFFFF' }) - .catch(() => { - return + .then(() => { + this.$jump({ + flag: 'h5', + extra: { + title: '建议书列表', + forbidSwipeBack: 1, //当前页面禁止右滑返回 + url: location.origin + `/#/proposal/list` + }, + routerInfo: { + path: `/proposal/list`, + type: '1' + } + }) + }) + .catch(() => { + return }) } }, @@ -666,7 +666,6 @@ export default { //GFRS-2552【需求】关于金掌桂投保流程增设指定生效日按钮的申请 const orderNo = this.$route.query.orderNo let detailPromise = this.isFrom === 'proposal' ? localStorage.proposalMedical : await getOrderDetail({ orderNo }) - let collect = (data,code) => { data.forEach(item => { if (item.code == code) { @@ -679,8 +678,6 @@ export default { } }) } - - if (this.isFrom != 'proposal') { collect(occupationList,detailPromise.orderDTO.insuredDTOs[0].occupationCode) //活动生效日期 @@ -690,7 +687,7 @@ export default { this.cvalidateFlag = this.activeType && this.isFrom != 'proposal' //构建提交数据、渲染险种 - if(this.$route.query.insuanceIdInfo && this.isFrom == 'proposal'){ + if(this.$route.query.insuanceIdInfo && this.isFrom == 'proposal' && !localStorage.editproposaladdrisk){ // 获取试算记录详情 let serialNo = '' if (this.$route.query.orderNo) { @@ -718,6 +715,7 @@ export default { }) }else{ this.chooseProducts = JSON.parse(localStorage.chooseProducts) + localStorage.editproposaladdrisk = false } this.chooseProducts.forEach((item, index) => { if (item.isCrossChannel == '1') { @@ -2371,25 +2369,26 @@ export default { return riskCode != 'DCRS_A0001' }) - localStorage.addRiskCodes = JSON.stringify(addRiskCodes) - let thismyurl = '' - if (this.$route.query.orderNo) { - thismyurl = '/?orderNo=' + this.$route.query.orderNo - } else if (this.$route.query.proposalOrderNo) { - thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo + localStorage.addRiskCodes = JSON.stringify(addRiskCodes) + let thismyurl = '' + if (this.$route.query.orderNo) { + thismyurl = '/?orderNo=' + this.$route.query.orderNo + } else if (this.$route.query.proposalOrderNo) { + thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo + } + localStorage.editproposaladdrisk = true + this.$jump({ + flag: 'h5', + extra: { + url: location.origin + '/#/common/addRiskList' + thismyurl + }, + routerInfo: { + path: '/common/addRiskList' + thismyurl } - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + '/#/common/addRiskList' + thismyurl - }, - routerInfo: { - path: '/common/addRiskList' + thismyurl - } - }) - }, - //保额份数变化 - stepperChange(defalutValue, productIndex, calFactorIndex, min, max, riskFactor) { + }) + }, + //保额份数变化 + stepperChange(defalutValue, productIndex, calFactorIndex, min, max, riskFactor) { let currentEle = localStorage.isTrial !== '1' && this.chooseProducts[productIndex].isMainRisk == '0' ? this.chooseProducts[productIndex].productTrialYearDTOS[calFactorIndex] @@ -2661,8 +2660,8 @@ export default { console.log('进来几次') this.mult = Math.ceil(Number(defalutValue) / Number(riskFactor.defaultValue)) }, - //下一步 - async nextStep(isFrom) { + //下一步 + async nextStep(isFrom) { //GFRS_M0016需要验证责任 if (this.mainRiskCode === 'GFRS_M0016' || this.mainRiskCode === 'GFRS_M0070') { let calFactorLst = this.chooseProducts[0].calFactorLst @@ -2892,6 +2891,7 @@ export default { } if (resultData.result == 0) { + localStorage.editproposaladdrisk = false //电投 if (isFrom != 'orderTrial' && localStorage.isFrom == 'sale') { if (resultData.deleteFlag == '0') { @@ -2932,8 +2932,8 @@ export default { } } }, - //建议书试算记录保存更新--编辑功能 - saveOrUpdateTrialRecordInfoFunc(riskDTO){ + //建议书试算记录保存更新--编辑功能 + saveOrUpdateTrialRecordInfoFunc(riskDTO){ let insuanceId riskDTO.forEach(item => { if (item.isMainRisk == '0') { @@ -2986,7 +2986,7 @@ export default { } }) }, - rollInCheck(value) { + rollInCheck(value) { let regExp = /^[1-9]+[0-9]*$/ let result = regExp.test(value) if (result) {