diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index d5883c171..5ad33bdeb 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -627,9 +627,9 @@ export default { this.cvalidateFlag = this.activeType && this.isFrom != 'proposal' //构建提交数据、渲染险种 - if(this.$route.query.insuanceId){ + if(this.$route.query.insuanceId && this.isFrom == 'proposal'){ // 获取试算记录详情 - getTrialRecordInfo({ + await getTrialRecordInfo({ serialNo:this.$CacheUtils.getLocItem('proposalNo'), mainRiskId:this.$route.query.insuanceId }).then(res => { @@ -2600,7 +2600,8 @@ export default { prem: this.trialList[index] && this.trialList[index].prem, standPrem: this.trialList[index] && this.trialList[index].standPrem, predictTransferPrem: item.predictTransferPrem, - thirdInsuraceNo: this.policyNo + thirdInsuraceNo: this.policyNo, + insuanceId:this.$route.query.insuanceId //编辑时,添加主险id // mult: this.mult } if (item.hasPredictTransferPrem && item.hasPredictTransferPrem === '0') { diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue index bcb00e9a8..194accdf2 100644 --- a/src/views/ebiz/common/SelectedProduct.vue +++ b/src/views/ebiz/common/SelectedProduct.vue @@ -178,6 +178,16 @@ export default { }) }, 100) } + //建议书--右上角为退出流程键(到建议书列表)×,并清除浏览记录 + if (localStorage.isFrom == 'proposal') { + setTimeout(() => { + // eslint-disable-next-line no-undef + EWebBridge.webCallAppInJs('webview_right_button', { + img: this.$assetsUrl + 'images/del-close-btn@3x.png', + intercept: '1' //是否拦截原生返回事件 1是 其他否 + }) + }, 100) + } window.appCallBack = this.appCallBack document.body.style.backgroundColor = '#fff' this.getProductList() @@ -238,6 +248,32 @@ export default { .catch(() => { return }) + }else 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' + } + }) + }) + .catch(() => { + return + }) } }, //获取已选产品列表 diff --git a/src/views/ebiz/proposal/Appnt.vue b/src/views/ebiz/proposal/Appnt.vue index 621214f48..03aedd6c7 100644 --- a/src/views/ebiz/proposal/Appnt.vue +++ b/src/views/ebiz/proposal/Appnt.vue @@ -150,6 +150,13 @@ export default { window.EWebBridge.webCallAppInJs("webview_left_button",{ reset:"1" //1:重制 其他值不变 }) + setTimeout(() => { + // eslint-disable-next-line no-undef + EWebBridge.webCallAppInJs('webview_right_button', { + img: this.$assetsUrl + 'images/del-close-btn@3x.png', + intercept: '1' //是否拦截原生返回事件 1是 其他否 + }) + }, 100) // 筛选按钮的点击事件 window.appCallBack = this.appCallBack }, @@ -187,7 +194,7 @@ export default { } }) }, - appCallBack() { + appCallBack(data) { // 筛选按钮的点击事件 this.$jump({ flag: 'navigation', @@ -201,6 +208,33 @@ export default { } else if (this.currentPopupIndex == 2) { this.occupationShowPicker = false } + if (data.trigger == 'right_button_click') { + 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' + } + }) + }) + .catch(() => { + return + }) + } }, chooseOccupation() { this.$jump({ diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue index 7ebc33494..fbed30270 100644 --- a/src/views/ebiz/proposal/InsuredPerson.vue +++ b/src/views/ebiz/proposal/InsuredPerson.vue @@ -142,6 +142,13 @@ export default { }, methods: { init() { + setTimeout(() => { + // eslint-disable-next-line no-undef + EWebBridge.webCallAppInJs('webview_right_button', { + img: this.$assetsUrl + 'images/del-close-btn@3x.png', + intercept: '1' //是否拦截原生返回事件 1是 其他否 + }) + }, 100) window.appCallBack = this.appCallBack this.localInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')) let { relationToAppnt, relationName } = this.localInfo @@ -223,7 +230,7 @@ export default { } }) }, - appCallBack() { + appCallBack(data) { // 筛选按钮的点击事件 this.$jump({ flag: 'navigation', @@ -237,6 +244,33 @@ export default { } else if (this.currentPopupIndex == 2) { this.occupationShowPicker = false } + if (data.trigger == 'right_button_click') { + 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' + } + }) + }) + .catch(() => { + return + }) + } }, chooseOccupation() { this.$jump({