From 6910f77fc4621191615bf340e46a0564c97b9b4b Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Mon, 23 Mar 2020 13:18:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E6=8A=95=E4=BF=9D?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=20-=20=E4=BF=9D=E8=B4=B9=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=20-=20=E5=B0=86=E5=8E=9F=E6=9C=AC=E5=86=99=E6=AD=BB?= =?UTF-8?q?=E7=9A=84=20=E5=85=8D=E8=B5=94=E9=A2=9D=20=E5=92=8C=20=E8=B5=94?= =?UTF-8?q?=E4=BB=98=E6=AF=94=E4=BE=8B=20=E6=94=B9=E4=B8=BA=E4=BB=8E?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=8E=B7=E5=8F=96=E3=80=82=20=20\src\views\e?= =?UTF-8?q?biz\common\CalculatePremium.vue=20=E5=A6=82=E6=9E=9C=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E6=98=AF=20elect=20=E9=A1=B9=20?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=20medical=20=E9=A1=B9=E4=B8=8D=E6=98=AF=20un?= =?UTF-8?q?defined=20=EF=BC=8C=E5=88=99=E8=B5=8B=E5=80=BC=E5=88=B0=20colum?= =?UTF-8?q?ns=20=E7=9A=84=20item=20=E4=B8=AD=20=20\src\views\ebiz\common\M?= =?UTF-8?q?ainRiskList.vue=20=E5=A6=82=E6=9E=9C=E6=98=AF=20=E5=85=8D?= =?UTF-8?q?=E8=B5=94=E9=A2=9D=20=E3=80=81=20=E8=B5=94=E4=BB=98=E6=AF=94?= =?UTF-8?q?=E4=BE=8B=20=EF=BC=8C=E5=88=99=20=E7=AD=9B=E9=80=89=E5=87=BA=20?= =?UTF-8?q?columns=20=E4=B8=AD=20=E7=AC=A6=E5=90=88=20medical=20=E5=92=8C?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E8=A2=AB=E4=BF=9D=E9=99=A9=E4=BA=BAmedical?= =?UTF-8?q?=20=E7=9B=B8=E5=90=8C=E7=9A=84=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 109 +++++++++++---------- src/views/ebiz/common/MainRiskList.vue | 6 +- 2 files changed, 64 insertions(+), 51 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index c293328a6..b5d22e2ef 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -413,57 +413,66 @@ export default { //GFRS_M0016需要展示免赔额和赔付比例，并需要根据是否有社保调整数值 // let mainRiskCode = chooseProducts[0].mainRiskCode this.chooseProducts.map(item => { - if (item.mainRiskCode === 'GFRS_M0016') { - const orderNo = localStorage.getItem('orderNo') - let detailPromise = this.isFrom === 'proposal' ? new Promise(r => r(localStorage.getItem('proposalMedical'))) : getOrderDetail({ orderNo }) - detailPromise.then(res => { - let isMedical = null - if (this.isFrom === 'proposal') { - isMedical = res === '1' - } else { - isMedical = res.orderDTO.insuredDTOs[0].medical === '0' - } - //根据社保写死两个字段 赔付比例和免赔额 - item.calFactorLst.map(i => { - //免赔额 - if (i.code === 'getLimit') { - const text = isMedical ? '0元（意外医疗）' : '100元（意外医疗）' - const value = isMedical ? '0' : '100' - - //保存数据 - this.medicalInfo = this.medicalInfo || {} - this.medicalInfo.getLimit = text - - i.showContent = text - i.getLimit = value - i.columns = [{ text, value }] - } - //赔付比例 - if (i.code === 'getRate') { - const text = isMedical ? '80%（意外医疗）' : '70%（意外医疗）' - const value = isMedical ? '0.8' : '0.7' - - //保存数据 - this.medicalInfo = this.medicalInfo || {} - this.medicalInfo.getRate = text - - i.showContent = text - i.getRate = value - i.columns = [{ text, value }] - } - }) - this.$forceUpdate() - }) - } else { - //其他产品删掉两个字段 - let calFactorLst = item.calFactorLst - for (let i = calFactorLst.length - 1; i >= 0; i--) { - let item = calFactorLst[i] - if (item.code === 'getLimit' || item.code === 'getRate') { - calFactorLst.splice(i, 1) - } + // console.log('item', item) + // if (item.mainRiskCode === 'GFRS_M0016') { + const orderNo = localStorage.getItem('orderNo') + let detailPromise = this.isFrom === 'proposal' ? new Promise(r => r(localStorage.getItem('proposalMedical'))) : getOrderDetail({ orderNo }) + detailPromise.then(res => { + let isMedical = null + if (this.isFrom === 'proposal') { + isMedical = res === '1' + } else { + isMedical = res.orderDTO.insuredDTOs[0].medical === '0' } - } + //根据社保写死两个字段 赔付比例和免赔额 + item.calFactorLst.map(i => { + //免赔额 + if (i.code === 'getLimit') { + i.columns = i.columns.filter(itemC => { + return itemC.medical == isMedical + }) + this.trialInfos[0].getLimit = i.columns[0].value + // const text = isMedical ? '0元（意外医疗）' : '100元（意外医疗）' + // const value = isMedical ? '0' : '100' + + //保存数据 + // this.medicalInfo = this.medicalInfo || {} + // this.medicalInfo.getLimit = text + + // i.showContent = text + // i.getLimit = value + // i.columns = [{ text, value }] + } + //赔付比例 + if (i.code === 'getRate') { + i.columns = i.columns.filter(itemC => { + return itemC.medical == isMedical + }) + this.trialInfos[0].getRate = i.columns[0].value + // const text = isMedical ? '80%（意外医疗）' : '70%（意外医疗）' + // const value = isMedical ? '0.8' : '0.7' + + // //保存数据 + // this.medicalInfo = this.medicalInfo || {} + // this.medicalInfo.getRate = text + + // i.showContent = text + // i.getRate = value + // i.columns = [{ text, value }] + } + }) + this.$forceUpdate() + }) + // } else { + // //其他产品删掉两个字段 + // let calFactorLst = item.calFactorLst + // for (let i = calFactorLst.length - 1; i >= 0; i--) { + // let item = calFactorLst[i] + // if (item.code === 'getLimit' || item.code === 'getRate') { + // calFactorLst.splice(i, 1) + // } + // } + // } }) // this.influenceAddRiskCodes diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index f9c0149e6..971d0890b 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -219,7 +219,11 @@ export default { item[item.code] = factor[item.code] } } - item.columns.push({ text: factor.showContent, value: factor[item.code], flag: factor[item.code + 'Flag'] }) + let itemColumns = { text: factor.showContent, value: factor[item.code], flag: factor[item.code + 'Flag'] } + if (factor.medical !== undefined) { + itemColumns.medical = factor.medical + } + item.columns.push(itemColumns) }) } else if (item.type == 1) { //按年龄选择 From 8be3985c1d845dfde8758db7af54ac0c74a8dee5 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Mon, 23 Mar 2020 13:41:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=95=E4=BF=9D=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=20-=20=E4=BF=9D=E8=B4=B9=E8=AE=A1=E7=AE=97=20-=20?= =?UTF-8?q?=E5=B0=86=E5=8E=9F=E6=9C=AC=E5=86=99=E6=AD=BB=E7=9A=84=20?= =?UTF-8?q?=E5=85=8D=E8=B5=94=E9=A2=9D=20=E5=92=8C=20=E8=B5=94=E4=BB=98?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=20=E6=94=B9=E4=B8=BA=E4=BB=8E=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E8=8E=B7=E5=8F=96=20-----=20=E5=AF=B9=20=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E9=99=84=E5=8A=A0=E4=BD=8F=E9=99=A2?= =?UTF-8?q?=E5=8C=BB=E7=96=97=E4=BF=9D=E9=99=A9=20=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7=E5=A4=84=E7=90=86=20=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=20=E5=85=8D=E8=B5=94=E9=A2=9D=E3=80=81=E8=B5=94?= =?UTF-8?q?=E4=BB=98=E6=AF=94=E4=BE=8B=20=E5=9C=A8=20=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=90=8E=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=8F=AF=E9=80=89=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E4=BD=BF=E7=94=A8=E5=85=A8=E9=83=A8=E9=A1=B9?= =?UTF-8?q?=E3=80=82=20\src\views\ebiz\common\AddRiskList.vue=20=20?= =?UTF-8?q?=E5=AF=B9=20=E5=9B=A0=E5=AD=90=20=E7=9A=84=20columns=20?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=20=E6=A0=BC=E5=BC=8F=E5=85=BC=E5=AE=B9=20\sr?= =?UTF-8?q?c\views\ebiz\common\CalculatePremium.vue=20=20=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=20=E8=BF=9B=E8=A1=8C=E5=85=BC=E5=AE=B9=E6=80=A7?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/AddRiskList.vue | 6 +++++- src/views/ebiz/common/CalculatePremium.vue | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue index 4fe77efbd..60204a53a 100644 --- a/src/views/ebiz/common/AddRiskList.vue +++ b/src/views/ebiz/common/AddRiskList.vue @@ -166,7 +166,11 @@ export default { item['amt'] = factor['amt'] } } - item.columns.push({ text: factor.showContent, value: factor[item.code], flag: factor[item.code + 'Flag'], amt: factor['amt'] }) + let itemColumns = { text: factor.showContent, value: factor[item.code], flag: factor[item.code + 'Flag'], amt: factor['amt'] } + if (factor.medical !== undefined) { + itemColumns.medical = factor.medical + } + item.columns.push(itemColumns) }) } else if (item.type == 1) { //按年龄选择 diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index b5d22e2ef..930671f7e 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -428,9 +428,12 @@ export default { item.calFactorLst.map(i => { //免赔额 if (i.code === 'getLimit') { - i.columns = i.columns.filter(itemC => { + let tempColumns = i.columns.filter(itemC => { return itemC.medical == isMedical }) + if (tempColumns.length !== 0) { + i.columns = tempColumns + } this.trialInfos[0].getLimit = i.columns[0].value // const text = isMedical ? '0元（意外医疗）' : '100元（意外医疗）' // const value = isMedical ? '0' : '100' @@ -445,9 +448,12 @@ export default { } //赔付比例 if (i.code === 'getRate') { - i.columns = i.columns.filter(itemC => { + let tempColumns = i.columns.filter(itemC => { return itemC.medical == isMedical }) + if (tempColumns.length !== 0) { + i.columns = tempColumns + } this.trialInfos[0].getRate = i.columns[0].value // const text = isMedical ? '80%（意外医疗）' : '70%（意外医疗）' // const value = isMedical ? '0.8' : '0.7'