diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index d3c955392..0e82a0c32 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -443,7 +443,7 @@ export default { //特殊处理 GFRS_M0016 GFRS_A0004 GFRS_A0005 赔付比例处理 async dogetLimitAndGetRate() { const orderNo = localStorage.getItem('orderNo') - let detailPromise = this.isFrom === 'proposal' ? new Promise(r => r(localStorage.getItem('proposalMedical'))) : await getOrderDetail({ orderNo }) + let detailPromise = this.isFrom === 'proposal' ? localStorage.proposalMedical : await getOrderDetail({ orderNo }) this.chooseProducts.map(item => { if (!(item.mainRiskCode === 'GFRS_M0016' || item.productCode === 'GFRS_A0004' || item.productCode === 'GFRS_A0005')) { //其他产品删掉两个字段 @@ -459,9 +459,9 @@ export default { if (item.mainRiskCode === 'GFRS_M0016' || item.productCode === 'GFRS_A0004') { let isMedical = null if (this.isFrom === 'proposal') { - isMedical = detailPromise === '1' + isMedical = detailPromise == '1' } else { - isMedical = detailPromise.orderDTO.insuredDTOs[0].medical === '0' + isMedical = detailPromise.orderDTO.insuredDTOs[0].medical == '0' } //根据社保写死两个字段 赔付比例和免赔额 item.calFactorLst.map(i => { diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue index bfd32f9b7..c1b768806 100644 --- a/src/views/ebiz/proposal/InsuredPerson.vue +++ b/src/views/ebiz/proposal/InsuredPerson.vue @@ -225,8 +225,9 @@ export default { //点击下一步 nextStep() { //保存有没有社保,在保费计算用到 - localStorage.setItem('proposalMedical', this.insured.medical === '0' ? '1' : '0') + //localStorage.setItem('proposalMedical', this.insured.medical == '0' ? '1' : '0') + localStorage.proposalMedical = this.insured.medical == '0' ? '1' : '0' this.insured.age = String(this.insured.age) let cacheSex = JSON.parse(localStorage.proposalAppnt).sex let localSex = this.insured.sex diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index 431af6fb4..77cf10e71 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -450,7 +450,7 @@ export default { } } } - /* if (localStorage.productCode == 'GFRS_M0003' || localStorage.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017') { + /* if (localStorage.productCode == 'GFRS_M0003' || localStorage.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017') { if (that.appntSign[0].documentStatus == 0) { path = 'insuranceInformation' } else if (that.appntSign[1].documentStatus == 2) { @@ -720,7 +720,16 @@ export default { const mainRiskCode = res.orderDTO.insuredDTOs[0].riskDTOLst[0].mainRiskCode // const isShowDialog = mainRiskCode === 'GFRS_M0005' || mainRiskCode === 'GFRS_M0016' const isShowDialog = mainRiskCode === 'GFRS_M0016' - if (isShowDialog) { + if ( + !!res.orderDTO.productDTO && + !!res.orderDTO.productDTO.special && + !!res.orderDTO.productDTO.special.content && + res.orderDTO.productDTO.special.content !== '' + ) { + const message = res.orderDTO.productDTO.special.content + Dialog({ message }) + } + /* if (isShowDialog) { //记录每次弹框的订单号。再次进入页面,订单号改变才会弹窗。 let lastOrderNo = localStorage.lastOrderNo if (lastOrderNo !== data.orderNo) { @@ -740,7 +749,7 @@ export default { const message = res.orderDTO.productDTO.special.content Dialog({ message }) } - } + }*/ localStorage.setItem('lastOrderNo', data.orderNo) this.$toast.clear()