diff --git a/src/components/ebiz/sale/IndexBar.vue b/src/components/ebiz/sale/IndexBar.vue index 2ea1da64b..7822bdfef 100644 --- a/src/components/ebiz/sale/IndexBar.vue +++ b/src/components/ebiz/sale/IndexBar.vue @@ -45,11 +45,12 @@ export default { { pageNo: 2, pageItem: '被保人信息', urlStr: '/sale/insuredPerson', tabClass: '' }, { pageNo: 3, pageItem: '选择产品', urlStr: '/common/selectedProduct', tabClass: '' }, { pageNo: 4, pageItem: '受益人信息', urlStr: '/sale/beneficiary', tabClass: '' }, - { pageNo: 5, pageItem: '告知信息', urlStr: '/sale/NotifyingMessage', tabClass: '' }, - { pageNo: 6, pageItem: '账户信息', urlStr: '/sale/AccountInformation', tabClass: '' }, - { pageNo: 7, pageItem: '附件上传', urlStr: '/sale/AttachmentManagement', tabClass: '' }, - { pageNo: 8, pageItem: '签名确认', urlStr: '/sale/SignatureConfirmation', tabClass: '' } + { pageNo: 5, pageItem: '告知信息', urlStr: '/sale/notifyingMessage', tabClass: '' }, + { pageNo: 6, pageItem: '账户信息', urlStr: '/sale/accountInformation', tabClass: '' }, + { pageNo: 7, pageItem: '附件上传', urlStr: '/sale/attachmentManagement', tabClass: '' }, + { pageNo: 8, pageItem: '签名确认', urlStr: '/sale/signatureConfirmation', tabClass: '' } ], + //localStorage.salePageFlag: 1-投保人信息 2-被保人信息 3-选择产品 4-受益人信息 5-告知信息 6-账户信息 7-附件上传 8-签名确认 salePageFlag: Number(localStorage.salePageFlag) } }, @@ -59,6 +60,7 @@ export default { methods: { changePage(pageIndex) { let url = '' + //由 localStorage.salePageFlag 来控制是否可跳到指定页面 if (this.salePageFlag < pageIndex) return switch (pageIndex) { case 1: //跳到投保人页面 @@ -74,16 +76,16 @@ export default { url = `/sale/beneficiary?edit=1&salePageFlag=${pageIndex}` break case 5: //跳到告知信息页面 - url = `/sale/NotifyingMessage?edit=1&salePageFlag=${pageIndex}` + url = `/sale/notifyingMessage?edit=1&salePageFlag=${pageIndex}` break case 6: //跳到账户信息页面 - url = `/sale/AccountInformation?edit=1&salePageFlag=${pageIndex}` + url = `/sale/accountInformation?edit=1&salePageFlag=${pageIndex}` break case 7: //跳到附件上传页面 - url = `/sale/AttachmentManagement?edit=1&salePageFlag=${pageIndex}` + url = `/sale/attachmentManagement?edit=1&salePageFlag=${pageIndex}` break case 8: //跳到签名确认页面 - url = `/sale/SignatureConfirmation?edit=1&salePageFlag=${pageIndex}` + url = `/sale/signatureConfirmation?edit=1&salePageFlag=${pageIndex}` break default: break diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index b5af19ae4..bf1b7ada6 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -924,8 +924,12 @@ export default { trialInfo['payEndYear'] = '1000' trialInfo['payEndYearFlag'] = 'Y' // 福宝宝和万能险传A - if (item.mainRiskCode != 'GFRS_M0006' && item.mainRiskCode != 'GFRS_M0017' - && item.mainRiskCode != 'GFRS_M0003' && item.mainRiskCode != 'GFRS_M0013') { + if ( + item.mainRiskCode != 'GFRS_M0006' && + item.mainRiskCode != 'GFRS_M0017' && + item.mainRiskCode != 'GFRS_M0003' && + item.mainRiskCode != 'GFRS_M0013' + ) { trialInfo['insuYearFlag'] = 'Y' } } @@ -1151,9 +1155,11 @@ export default { //万能型产品保费赋值给保额 //增加判断是否是从建议书跳转过来了的 if (localStorage.isFrom != 'proposal') { - if (this.trialList[index].productCode == 'GFRS_M0003' - || this.trialList[index].productCode == 'GFRS_M0015' - || this.trialList[index].productCode == 'GFRS_M0017') { + if ( + this.trialList[index].productCode == 'GFRS_M0003' || + this.trialList[index].productCode == 'GFRS_M0015' || + this.trialList[index].productCode == 'GFRS_M0017' + ) { riskItem['amt'] = this.trialList[index].prem } } @@ -1195,6 +1201,10 @@ export default { } if (resultData.result == 0) { + //电投 + if (localStorage.isFrom == 'sale' && resultData.deleteFlag == '0') { + localStorage.salePageFlag = '4' + } //建议书 if (localStorage.isFrom == 'proposal' && resultData.content.id) { this.saleInsuredPersonInfo.insuredId = resultData.content.id diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue index 6077d5eb1..806898192 100644 --- a/src/views/ebiz/common/SelectedProduct.vue +++ b/src/views/ebiz/common/SelectedProduct.vue @@ -57,7 +57,8 @@ export default { chooseProducts: [], total: 0, nextStepFlag: true, - isShow: true + isShow: true, + salePageFlag: '3' } }, components: { @@ -70,6 +71,18 @@ export default { mounted() { document.body.style.backgroundColor = '#fff' this.getProductList() + if (!this.$route.query.edit) { + //如果不是编辑/导航条跳转进来的 + localStorage.setItem('salePageFlag', this.salePageFlag) + } else if (this.$route.query.edit && !this.$route.query.salePageFlag) { + //如果从保单列表点击编辑按钮进入 + this.salePageFlag = '3' + localStorage.setItem('salePageFlag', this.salePageFlag) + } else if (this.$route.query.salePageFlag) { + //如果是从导航栏点击进入 + this.salePageFlag = localStorage.salePageFlag + } + // localStorage.orderNo = '19090510425500178912' // localStorage.saleInsuredPersonInfo = JSON.stringify({ // birthday: '2015-08-31', @@ -215,6 +228,11 @@ export default { }, //下一步 nextStep() { + localStorage.salePageFlag = '8' //当前后台接口及前端代码不完善,仅调试观察现象使用,调试完成后删除 + console.log('this.chooseProducts', this.chooseProducts) + if (this.chooseProducts.length == 0) { + return this.$toast('请添加产品') + } //930折中方案,豁免险选择 let oldAddRiskCodes = JSON.parse(localStorage.oldAddRiskCodes) if (oldAddRiskCodes.includes('DCRS_A0001')) { diff --git a/src/views/ebiz/sale/AccountInformation.vue b/src/views/ebiz/sale/AccountInformation.vue index 7381c699d..93894d442 100644 --- a/src/views/ebiz/sale/AccountInformation.vue +++ b/src/views/ebiz/sale/AccountInformation.vue @@ -1,5 +1,6 @@