diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index a5398cd03..634b8ab3a 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -2127,29 +2127,38 @@ export default { if (resultData.result == 0) { //电投 - 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)) - } - this.$jump({ - flag: 'goBack', - extra: { - refresh: '1', - index: '-2' - }, - routerInfo: { - type: 2, - index: -2, - path: url + if (localStorage.isFrom == 'sale') { + if (resultData.deleteFlag == '0') { + localStorage.salePageFlag = '3'; } - }) + this.$jump({ + flag: 'goBack', + extra: { + refresh: '1', + index: '-2' + }, + routerInfo: { + type: 2, + index: -2, + path: '/common/selectedProduct' + } + }) + }else if (localStorage.isFrom == 'proposal'){ + let proposalOrderNo = this.$CacheUtils.getLocItem('orderNo') || '' + let url = `/common/selectedProduct?proposalOrderNo=${proposalOrderNo}` + if (resultData.content.id) { + this.saleInsuredPersonInfo.insuredId = resultData.content.id; + this.$CacheUtils.setLocItem('saleInsuredPersonInfo', JSON.stringify(this.saleInsuredPersonInfo)) + } + this.$jump({ + flag: 'h5', + extra: { + forbidSwipeBack: '1', + url: location.origin + `/#${url}` + }, + routerInfo: { path: url } + }) + } } else { this.$toast(resultData.resultMessage) } diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue index 281f767d0..13b51b77d 100644 --- a/src/views/ebiz/common/SelectedProduct.vue +++ b/src/views/ebiz/common/SelectedProduct.vue @@ -253,7 +253,7 @@ export default { this.$CacheUtils.setLocItem('orderNo',this.$route.query.proposalOrderNo) this.proposalOrderNo = this.$route.query.proposalOrderNo } - let pOrderNo = this.proposalOrderNo || this.$CacheUtils.getLocItem('orderNo') + let pOrderNo = this.proposalOrderNo?this.proposalOrderNo:this.$CacheUtils.getLocItem('orderNo') resultData = await getDetail({ orderNo: pOrderNo, isMerge: '1', @@ -397,23 +397,21 @@ 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 url = `/proposal/chooseInsuredPerson` + if (this.$route.query.proposalOrderNo || this.$CacheUtils.getLocItem('orderNo')) { + let proposalOrderNo = this.$route.query.proposalOrderNo || this.$CacheUtils.getLocItem('orderNo') + url = `/proposal/chooseInsuredPerson?proposalOrderNo=${proposalOrderNo}` } let page = this.$route.query.proposalEdit == '1' ? '-1' : '-2' this.$jump({ - flag: 'goBack', + flag: 'h5', extra: { - refresh: '1', - index: page + url: location.origin + `/#${url}` }, routerInfo: { - path: routerUrl + path: url } }) } else { diff --git a/src/views/ebiz/proposal/Appnt.vue b/src/views/ebiz/proposal/Appnt.vue index 5a48ecb8a..a417b5f0f 100644 --- a/src/views/ebiz/proposal/Appnt.vue +++ b/src/views/ebiz/proposal/Appnt.vue @@ -118,7 +118,7 @@ export default { const orderNo = this.$CacheUtils.getLocItem('orderNo') if (orderNo) { let proposalInfoDTO = { - orderNo + orderNo: orderNo } let res = await getDetail(proposalInfoDTO) this.appntDTO = res.content[0].appntDTO @@ -251,6 +251,7 @@ export default { } saveProposal(params).then(res => { if (res.result == '0') { + let url = `/proposal/chooseInsuredPerson?proposalOrderNo=${res.content.orderNo}` //localStorage.orderNo = res.content.orderNo this.$CacheUtils.setLocItem('orderNo', res.content.orderNo) if (this.appntDTO.socialSecurity) { @@ -259,12 +260,10 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + `/#/proposal/chooseInsuredPerson?proposalOrderNo=${res.content.orderNo}`, + url: location.origin + `/#${url}`, needRefresh: '1' }, - routerInfo: { - path: '/proposal/chooseInsuredPerson' - } + routerInfo: { path: url } }) } else { this.$toast(res.resultMessage) diff --git a/src/views/ebiz/proposal/ChooseInsuredPerson.vue b/src/views/ebiz/proposal/ChooseInsuredPerson.vue index 6ab608394..e2698df42 100644 --- a/src/views/ebiz/proposal/ChooseInsuredPerson.vue +++ b/src/views/ebiz/proposal/ChooseInsuredPerson.vue @@ -112,7 +112,11 @@ export default { BreadcrumbNavigator }, mounted() { - this.proposalOrderNo = this.$CacheUtils.getLocItem('orderNo') || this.$route.query.proposalOrderNo || '' + if (this.$route.query.proposalOrderNo) { + this.proposalOrderNo = this.$route.query.proposalOrderNo + }else if (this.$CacheUtils.getLocItem('orderNo')) { + this.proposalOrderNo = this.$CacheUtils.getLocItem('orderNo') + } //根据后台数据来展示 let proposalInfoDTO = { orderNo: this.proposalOrderNo @@ -217,16 +221,20 @@ export default { saveProposal(params).then(res => { if (res.result == '0') { this.$CacheUtils.setLocItem('orderNo', res.content.orderNo) + let url = `/proposal/proposalInfo?proposalNo=${res.content.orderNo}` //调用保存接口 this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/proposal/proposalInfo' + url: location.origin + `/#${url}` }, routerInfo: { - path: '/proposal/proposalInfo' + path: url } }) + }else{ + this.$toast(res.resultMessage) + return } }) }, @@ -340,13 +348,14 @@ export default { this.$CacheUtils.setLocItem('saleInsuredPersonInfo', JSON.stringify(saleInsuredPersonInfo)) //存储被保险人信息 localStorage.chooseProductCodes = '' //置空所选险种 + let url = `/proposal/insuredPerson?proposalOrderNo=${this.proposalOrderNo}` this.$jump({ flag: 'h5', extra: { - url: location.origin + `/#/proposal/insuredPerson?proposalOrderNo=${this.proposalOrderNo}` + url: location.origin + `/#${url}` }, routerInfo: { - path: '/proposal/insuredPerson' + path: url } }) }, @@ -356,13 +365,14 @@ export default { item.age = item.insuredAge this.$CacheUtils.setLocItem('saleInsuredPersonInfo', JSON.stringify(item)) //存储被保险人信息 localStorage.isFrom = 'proposal' + let url = `/common/selectedProduct?proposalEdit=1&proposalOrderNo=${item.orderNo}` this.$jump({ flag: 'h5', extra: { - url: location.origin + `/#/common/selectedProduct?proposalEdit=1&proposalOrderNo=${item.orderNo}` + url: location.origin + `/#${url}` }, routerInfo: { - path: '/common/selectedProduct' + path: url } }) }, diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue index fc2f9122d..708dce0ff 100644 --- a/src/views/ebiz/proposal/InsuredPerson.vue +++ b/src/views/ebiz/proposal/InsuredPerson.vue @@ -316,13 +316,14 @@ export default { let cacheInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')) insuredInfo = Object.assign(cacheInfo, this.insured) this.$CacheUtils.setLocItem('saleInsuredPersonInfo', JSON.stringify(insuredInfo)) + let url = `/common/selectedProduct?proposalOrderNo=${proposalOrderNo}` this.$jump({ flag: 'h5', extra: { - url: location.origin + `/#/common/selectedProduct?proposalOrderNo=${proposalOrderNo}` + url: location.origin + `/#${url}` }, routerInfo: { - path: '/common/selectedProduct' + path: url } }) }, diff --git a/src/views/ebiz/proposal/List.vue b/src/views/ebiz/proposal/List.vue index 1359e6ae8..32e6b1b76 100644 --- a/src/views/ebiz/proposal/List.vue +++ b/src/views/ebiz/proposal/List.vue @@ -248,14 +248,15 @@ export default { //建议书列表 编辑=》制作中的建议书跳转到选择被保险人页面; this.$CacheUtils.setLocItem('orderNo', item.orderInfoDTO.orderNo) this.$CacheUtils.setLocItem('canMoveOn', 1) + let url = `/proposal/chooseInsuredPerson?proposalOrderNo=${item.orderInfoDTO.orderNo}` this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/proposal/chooseInsuredPerson', + url: location.origin + `/#${url}`, needRefresh: '1' }, routerInfo: { - path: '/proposal/chooseInsuredPerson' + path: url } }) }, @@ -265,13 +266,14 @@ export default { this.$CacheUtils.setLocItem('orderNo', item.orderInfoDTO.orderNo) //新增 解决直接点击预览报错问题 localStorage.mainRiskCode = item.insuredDTOs[0].mainRisk[0].mainRiskCode + let url = `/proposal/proposalInfo?proposalNo=${item.orderInfoDTO.orderNo}` this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/proposal/proposalInfo' + url: location.origin + `/#${url}`, }, routerInfo: { - path: '/proposal/proposalInfo' + path: url } }) },