From 5c2007dfb953cc2e5c1f25569b5f61493c84b9be Mon Sep 17 00:00:00 2001
From: "li.jieyu@ebiz-digits.com"
Date: Sun, 25 Apr 2021 14:14:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BD=E5=AF=8C=E4=BA=BA=E5=AF=BF?=
=?UTF-8?q?=E6=B0=91=E6=83=A0=E7=99=BE=E4=B8=87=E5=8C=BB=E7=96=97=E4=BF=9D?=
=?UTF-8?q?=E9=99=A9(2021=E7=89=88)GFRS=5FM0043+(GFRS=5FA0008)=E7=BB=84?=
=?UTF-8?q?=E5=90=88=E6=8A=95=E4=BF=9D=E7=9A=84=E9=99=90=E5=88=B6=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6=E9=99=84=E5=8A=A0=E5=8C=BB=E7=96=97=E4=BF=9D=E9=A2=9D?=
=?UTF-8?q?=E5=8F=AA=E8=83=BD=E9=80=890.5/1=E4=B8=87=20=20--=E6=9D=8E?=
=?UTF-8?q?=E5=A9=95=E7=85=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/js/utils/data-dictionary.js | 5 +++++
src/views/ebiz/common/CalculatePremium.vue | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index 0afb12ba3..d5cb1cef4 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -1823,6 +1823,11 @@ export default {
shortName: '重疾险',
name: '国富人寿桂企保重大疾病保险(B款)',
code: 'GFRS_M0040'
+ },
+ {
+ shortName: '医疗险',
+ name: '国富人寿民惠百万医疗保险(2021版)',
+ code: 'GFRS_M0043'
}
],
// 职级
diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index a7e766efa..c11a2a5f8 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -343,6 +343,7 @@ const dutyGFRS_A0008Rules = {
320404: {
mainRisk: 'GFRS_M0005',
otmainRisk: 'GFRS_M0031',
+ otmainRisk2: 'GFRS_M0043',
msg: '住院医疗提示:金额只能是0.5、1、1.5、2',
msg_1: '附加到国富人寿国富民惠医疗保险(2020版)最高基本保额不超过1万元。',
msg_2: '住院医疗提示:金额只能是0.5、1'
@@ -484,7 +485,8 @@ export default {
}
})
}
- if (this.mainRiskCode == 'GFRS_M0031' || this.mainRiskCode == 'GFRS_M0005') {
+ if (this.mainRiskCode == 'GFRS_M0031' || this.mainRiskCode == 'GFRS_M0005' ||
+ this.mainRiskCode == 'GFRS_M0043') {
this.chooseProducts.map(item => {
if (item.productCode == 'GFRS_A0008') {
item.calFactorLst.map(item2 => {
From 6a5e09abbc8530e99920c976bff879228ebccbc0 Mon Sep 17 00:00:00 2001
From: "li.jieyu@ebiz-digits.com"
Date: Sun, 25 Apr 2021 14:16:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=9B=BD=E5=AF=8C=E4=BA=BA=E5=AF=BF?=
=?UTF-8?q?=E6=B0=91=E6=83=A0=E7=99=BE=E4=B8=87=E5=8C=BB=E7=96=97=E4=BF=9D?=
=?UTF-8?q?=E9=99=A9(2021=E7=89=88)GFRS=5FM0043+(GFRS=5FA0008)=E7=BB=84?=
=?UTF-8?q?=E5=90=88=E6=8A=95=E4=BF=9D=E7=9A=84=E9=99=90=E5=88=B6=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6=E9=99=84=E5=8A=A0=E5=8C=BB=E7=96=97=E4=BF=9D=E9=A2=9D?=
=?UTF-8?q?=E5=8F=AA=E8=83=BD=E9=80=890.5/1=E4=B8=87=20=20--=E6=9D=8E?=
=?UTF-8?q?=E5=A9=95=E7=85=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ebiz/common/CalculatePremium.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index c11a2a5f8..4168649f9 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -950,7 +950,8 @@ export default {
if (currentEle.duty == '320404') {
if (
this.mainRiskCode === dutyGFRS_A0008Rules[currentEle.duty]['mainRisk'] ||
- this.mainRiskCode === dutyGFRS_A0008Rules[currentEle.duty]['otmainRisk']
+ this.mainRiskCode === dutyGFRS_A0008Rules[currentEle.duty]['otmainRisk'] ||
+ this.mainRiskCode === dutyGFRS_A0008Rules[currentEle.duty]['otmainRisk2']
) {
if (!(value == '0.5' || value == '1')) {
this.$toast(dutyGFRS_A0008Rules[currentEle.duty].msg_2)
From d688d7857e38073ec084b48a55975be742066728 Mon Sep 17 00:00:00 2001
From: dwq <15731277156@163.com>
Date: Sun, 25 Apr 2021 14:43:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=96=87=E4=BB=B6ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/config/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/config/index.js b/src/config/index.js
index 4956695a2..1f17aef1c 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -25,7 +25,7 @@ switch (process.env.VUE_APP_FLAG) {
assetsUrl = 'https://iagentsales-test2.e-guofu.com:443/app/'
// 上传影像地址 98 服务器地址
assetsUpUrl = 'https://iagentsales-test3.e-guofu.com:443'
- mainUrl = 'https://iagentsales-test2.e-guofu.com'
+ mainUrl = 'http://139.199.50.151'
payUrl = 'https://funduat.e-guofu.com/s3-modules-gateway/embed/gateway.action'
zssqUrl = 'https://iagentsales-test2.e-guofu.com:5100/html/test/index.html#/'
REQ_PWD = '41424344454631323334353637383930'