From 1d9ba73cd8cde032d7d5ed4d3f65bd211d25e835 Mon Sep 17 00:00:00 2001 From: "bai.jinyan" Date: Mon, 2 Aug 2021 20:38:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=B9=A6=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98-=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=B9=A6=E8=AE=A2=E5=8D=95=E5=8F=B7=E4=B8=BA?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=BC=A0=E5=8F=82---=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BA=BA=EF=BC=9A=E7=99=BD=E9=87=91=E5=B2=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 5 ++++- src/views/ebiz/common/SelectedProduct.vue | 6 ++++++ src/views/ebiz/proposal/Appnt.vue | 2 +- src/views/ebiz/proposal/ChooseInsuredPerson.vue | 10 ++++++---- src/views/ebiz/proposal/InsuredPerson.vue | 6 ++++-- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index c6ce5dfd1..a5398cd03 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -2130,8 +2130,11 @@ export default { if (localStorage.isFrom == 'sale' && resultData.deleteFlag == '0') { localStorage.salePageFlag = '3' } + let url = '/common/selectedProduct' //建议书 if (localStorage.isFrom == 'proposal' && resultData.content.id) { + let proposalOrderNo = this.$CacheUtils.getLocItem('orderNo') || '' + url += '?proposalOrderNo='+proposalOrderNo this.saleInsuredPersonInfo.insuredId = resultData.content.id this.$CacheUtils.setLocItem('saleInsuredPersonInfo', JSON.stringify(this.saleInsuredPersonInfo)) } @@ -2144,7 +2147,7 @@ export default { routerInfo: { type: 2, index: -2, - path: '/common/selectedProduct' + path: url } }) } else { diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue index e333aaa2e..372a7ec3c 100644 --- a/src/views/ebiz/common/SelectedProduct.vue +++ b/src/views/ebiz/common/SelectedProduct.vue @@ -181,6 +181,8 @@ export default { } else if (this.$route.query.salePageFlag) { //如果是从导航栏点击进入 this.salePageFlag = localStorage.salePageFlag + } else if (this.$route.query.proposalOrderNo) { + this.$CacheUtils.setLocItem('orderNo',this.$route.query.proposalOrderNo) } // localStorage.orderNo = '19090510425500178912' @@ -395,6 +397,10 @@ export default { let routerUrl if (localStorage.isFrom == 'proposal') { routerUrl = '/proposal/chooseInsuredPerson' + if (this.$CacheUtils.getLocItem('orderNo') || this.$route.query.proposalOrderNo) { + let proposalOrderNo = this.$CacheUtils.getLocItem('orderNo') || this.$route.query.proposalOrderNo + routerUrl += '?proposalOrderNo='+proposalOrderNo + } let page = this.$route.query.proposalEdit == '1' ? '-1' : '-2' this.$jump({ diff --git a/src/views/ebiz/proposal/Appnt.vue b/src/views/ebiz/proposal/Appnt.vue index 4e752361a..5a48ecb8a 100644 --- a/src/views/ebiz/proposal/Appnt.vue +++ b/src/views/ebiz/proposal/Appnt.vue @@ -259,7 +259,7 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/proposal/chooseInsuredPerson', + url: location.origin + `/#/proposal/chooseInsuredPerson?proposalOrderNo=${res.content.orderNo}`, needRefresh: '1' }, routerInfo: { diff --git a/src/views/ebiz/proposal/ChooseInsuredPerson.vue b/src/views/ebiz/proposal/ChooseInsuredPerson.vue index 9faf05dbe..6ab608394 100644 --- a/src/views/ebiz/proposal/ChooseInsuredPerson.vue +++ b/src/views/ebiz/proposal/ChooseInsuredPerson.vue @@ -97,7 +97,8 @@ export default { } ], chooseList: [], //添加上的被保险人 - proposalInfo: '' //查询中的建议书信息 + proposalInfo: '', //查询中的建议书信息 + proposalOrderNo: '' } }, computed: { @@ -111,9 +112,10 @@ export default { BreadcrumbNavigator }, mounted() { + this.proposalOrderNo = this.$CacheUtils.getLocItem('orderNo') || this.$route.query.proposalOrderNo || '' //根据后台数据来展示 let proposalInfoDTO = { - orderNo: this.$CacheUtils.getLocItem('orderNo') + orderNo: this.proposalOrderNo } getDetail(proposalInfoDTO).then(res => { if (res.result == '0') { @@ -341,7 +343,7 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/proposal/insuredPerson' + url: location.origin + `/#/proposal/insuredPerson?proposalOrderNo=${this.proposalOrderNo}` }, routerInfo: { path: '/proposal/insuredPerson' @@ -357,7 +359,7 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/common/selectedProduct?proposalEdit=1' + url: location.origin + `/#/common/selectedProduct?proposalEdit=1&proposalOrderNo=${item.orderNo}` }, routerInfo: { path: '/common/selectedProduct' diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue index 26c35d2ae..fc2f9122d 100644 --- a/src/views/ebiz/proposal/InsuredPerson.vue +++ b/src/views/ebiz/proposal/InsuredPerson.vue @@ -256,6 +256,7 @@ export default { }, //判断跳转来源 fromPath() { + let proposalOrderNo = this.$route.query.proposalOrderNo || this.$CacheUtils.getLocItem('orderNo') || '' let codes = localStorage.chooseProductCodes let fromSelect = false if (codes && codes != '[]') { @@ -289,7 +290,7 @@ export default { let params = { orderDTO: { orderInfoDTO: { - orderNo: this.$CacheUtils.getLocItem('orderNo') + orderNo: proposalOrderNo }, insuredDTOs: [this.insured] } @@ -309,6 +310,7 @@ export default { }, //主流程 mainPath() { + let proposalOrderNo = this.$route.query.proposalOrderNo || this.$CacheUtils.getLocItem('orderNo') || '' localStorage.isFrom = 'proposal' let insuredInfo = {} let cacheInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')) @@ -317,7 +319,7 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/common/selectedProduct' + url: location.origin + `/#/common/selectedProduct?proposalOrderNo=${proposalOrderNo}` }, routerInfo: { path: '/common/selectedProduct'