From 7aa2822382ef15d890cdb36474ba39d316a18b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Sun, 15 Mar 2020 19:38:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E4=BF=9D=E8=B4=B9=E8=AF=95?= =?UTF-8?q?=E7=AE=97=E8=B4=A3=E4=BB=BB=E6=A3=80=E9=AA=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=A4=84=E7=90=86=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?= =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 36 +++++++++++++++++----- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index ff7bf20a4..7a9b3966f 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -307,6 +307,18 @@ const dutyRules = { msg: '意外住院津贴日额最低基本保险金额为10元/天，超过最低基本保险金额为10元/天整数倍，最高不得超过200元/天' } } +const dutyGFRS_A0004Rules = { + 320205: { + mainRisk: 'GFRS_M0005', + msg: '住院医疗保险金额为5000、10000、15000、20000元，与GFRS_M0005险种搭配金额不得大于10000元' + }, + 320206: { + msg: '住院津贴保险金额最低为50元，超过最低基本保险金额为10元整数倍' + }, + 320207: { + msg: '恶性肿瘤住院津贴保险金额最低为50元，超过最低基本保险金额为10元整数倍' + } +} const DUTY_DEFAULT_MUTIPLE = 1000 const DUTY_DEFAULT_MIN = 10000 @@ -640,7 +652,7 @@ export default { if (validateRiskCode === 'GFRS_M0016' && !this.valiDuty(inputValue, duty)) { //验证不通过 return - } else if (validateRiskCode === 'GFRS_A0004' && duty == '320205' && !this.valiA0004Duty(inputValue, showHint, dutyItem)) { + } else if (validateRiskCode === 'GFRS_A0004' && !this.valiA0004Duty(inputValue, showHint, dutyItem)) { //验证不通过 险种为GFRS_A0004 责任编码为320205 return } else { @@ -680,16 +692,26 @@ export default { }, //险种 GFRS_A0004 险种验证规则 valiA0004Duty(value, showHint, currentEle) { - // 保额只能为5000 10000 15000 200000 - if (currentEle.duty == '320205') { - if (!(value == '0.5' || value == '1' || value == '1.5' || value == '2')) { - this.$toast(showHint) + // 验证其他 最小50 其他为50 10 倍数 + if (currentEle.duty == '320206' || currentEle.duty == '320207') { + let numberValue = Number(value) + if ((numberValue * 10000) % 10 != 0 || numberValue < 50) { + this.$toast(dutyGFRS_A0004Rules[currentEle.duty]['msg']) this.nextStepFlag = true return false } - if (this.mainRiskCode === 'GFRS_M0005') { + } + + // 保额只能为5000 10000 15000 200000 + if (currentEle.duty == '320205') { + if (!(value == '0.5' || value == '1' || value == '1.5' || value == '2')) { + this.$toast(dutyGFRS_A0004Rules[currentEle.duty]['msg']) + this.nextStepFlag = true + return false + } + if (this.mainRiskCode === dutyGFRS_A0004Rules[currentEle.duty]['mainRisk']) { if (!(value == '0.5' || value == '1')) { - this.$toast(showHint) + this.$toast(dutyGFRS_A0004Rules[currentEle.duty]['msg']) this.nextStepFlag = true return false } From e3f93e3001b2ddc5d3b3d3b7562d58c163792488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Mon, 16 Mar 2020 10:03:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E4=BF=9D=E8=B4=B9=E8=AF=95?= =?UTF-8?q?=E7=AE=97=E8=B4=A3=E4=BB=BB=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3?= =?UTF-8?q?=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 7a9b3966f..d3c955392 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -310,13 +310,14 @@ const dutyRules = { const dutyGFRS_A0004Rules = { 320205: { mainRisk: 'GFRS_M0005', - msg: '住院医疗保险金额为5000、10000、15000、20000元，与GFRS_M0005险种搭配金额不得大于10000元' + msg: '住院医疗提示：金额只能是0.5、1、1.5、2', + msg_1: '附加到国富人寿国富民惠医疗保险（2020版）最高基本保额不超过1万元。' }, 320206: { - msg: '住院津贴保险金额最低为50元，超过最低基本保险金额为10元整数倍' + msg: '住院津贴提示：投保可选责任时，可选责任最低投保 50 元，且应为 10 元的整数倍' }, 320207: { - msg: '恶性肿瘤住院津贴保险金额最低为50元，超过最低基本保险金额为10元整数倍' + msg: '恶性肿瘤提示：投保可选责任时，可选责任最低投保 50 元，且应为 10 元的整数倍' } } const DUTY_DEFAULT_MUTIPLE = 1000 @@ -492,16 +493,15 @@ export default { } } else if (item.productCode === 'GFRS_A0004') { if (i.code === 'getLimit') { - const text2 = isMedical ? '0元（住院医疗）' : '100元（住院医疗）' - const value2 = isMedical ? '0' : '100' - + const text = isMedical ? '0元（住院医疗）' : '100元（住院医疗）' + const value = isMedical ? '0' : '100' //保存数据 this.medicalInfo = this.medicalInfo || {} - this.medicalInfo.getLimit = text2 + this.medicalInfo.getLimit = text - i.showContent = text2 - i.getLimit = value2 - i.columns = [{ text2, value2 }] + i.showContent = text + i.getLimit = value + i.columns = [{ text, value }] } //赔付比例 if (i.code === 'getRate') { @@ -696,7 +696,7 @@ export default { if (currentEle.duty == '320206' || currentEle.duty == '320207') { let numberValue = Number(value) if ((numberValue * 10000) % 10 != 0 || numberValue < 50) { - this.$toast(dutyGFRS_A0004Rules[currentEle.duty]['msg']) + this.$toast(dutyGFRS_A0004Rules[currentEle.duty].msg) this.nextStepFlag = true return false } @@ -705,13 +705,13 @@ export default { // 保额只能为5000 10000 15000 200000 if (currentEle.duty == '320205') { if (!(value == '0.5' || value == '1' || value == '1.5' || value == '2')) { - this.$toast(dutyGFRS_A0004Rules[currentEle.duty]['msg']) + this.$toast(dutyGFRS_A0004Rules[currentEle.duty].msg) this.nextStepFlag = true return false } if (this.mainRiskCode === dutyGFRS_A0004Rules[currentEle.duty]['mainRisk']) { if (!(value == '0.5' || value == '1')) { - this.$toast(dutyGFRS_A0004Rules[currentEle.duty]['msg']) + this.$toast(dutyGFRS_A0004Rules[currentEle.duty].msg_1) this.nextStepFlag = true return false }