Commit Graph

7467 Commits

Author SHA1 Message Date
yuweiqi
e479a6690b [IMP]nbs-应备费用-教育年龄修改为教育年龄(岁),提示输入文案修改为“请输入子女受教育年龄至多少岁” 2020-03-31 11:59:57 +08:00
yuweiqi
453c1e0987 Merge branch 'nbs' into dev 2020-03-31 11:42:43 +08:00
yuweiqi
13d0bd758b [IMP]nbs-优化-应备费用、基本信息涉及日期组件的,将日期组件的最大值改为2105-12-31 2020-03-31 11:40:20 +08:00
yuweiqi
e268e6642d Merge branch 'nbs' into dev 2020-03-31 10:54:22 +08:00
yuweiqi
54cf76f866 [IMP]nbs-优化-为应备费用页-子女教育年龄加数字校验 2020-03-31 10:54:07 +08:00
yuweiqi
6aca17f575 Merge branch 'nbs' into dev 2020-03-31 10:43:22 +08:00
yuweiqi
550d004d34 [IMP]nbs-优化-应备费用页-增加校验 2020-03-31 10:43:05 +08:00
yuweiqi
5cde55c783 Merge branch 'nbs' into dev 2020-03-31 10:35:54 +08:00
yuweiqi
6dba85ef65 [FIX]nbs-去掉应备费用页-误加的校验 2020-03-31 10:35:38 +08:00
yuweiqi
acde2db39b Merge branch 'nbs' into dev 2020-03-31 10:11:05 +08:00
yuweiqi
d88d9ee8ad [IMP]优化-GFRS-687-nbs-为已备费用和应备费用页,金额添加填写校验(必须为数字) 2020-03-31 10:10:26 +08:00
tian.guangyuan
67d822a8f7 Merge branch 'feature/GFRS-765【0423】电投自核规则前端进行转译提示' into dev
# Conflicts:
#	src/views/ebiz/sale/AccountInformation.vue
#	src/views/ebiz/sale/AttachmentManagement.vue
#	src/views/ebiz/sale/Beneficiary.vue
#	src/views/ebiz/sale/InsuredInfo.vue
#	src/views/ebiz/sale/InsuredPerson.vue
2020-03-30 19:43:19 +08:00
tian.guangyuan
2897425a2a Merge branch 'feature/GFRS-765【0423】电投自核规则前端进行转译提示' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-765【0423】电投自核规则前端进行转译提示 2020-03-30 19:37:27 +08:00
tian.guangyuan
68ec29bc47 【fix】 每个勾选框边框改为红色边框,且勾选框旁边的提示文字颜色改成红色字体。 2020-03-30 19:36:41 +08:00
yuweiqi
3205faf80e Merge branch 'feature/GFRS-765【0423】电投自核规则前端进行转译提示' into dev 2020-03-30 19:19:41 +08:00
yuweiqi
b35de26cfc [FIX]bug_GFRS-836-附加住院医疗保险 该附加险 偶然其情况可 添加多份 2020-03-30 19:15:44 +08:00
tian.guangyuan
5e01dfe28b Merge branch 'feature/GFRS-765【0423】电投自核规则前端进行转译提示' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-765【0423】电投自核规则前端进行转译提示 2020-03-30 18:55:12 +08:00
tian.guangyuan
62d165ae97 Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1' into dev 2020-03-30 17:39:46 +08:00
tian.guangyuan
a40cf11663 Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1' into release/0327 2020-03-30 17:39:15 +08:00
tian.guangyuan
3839577503 修复 社保字段问题 2020-03-30 17:38:57 +08:00
tian.guangyuan
61e5183a7e Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1' into release/0327 2020-03-30 17:34:44 +08:00
tian.guangyuan
d4c98de987 Merge branch '0327/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1' into dev1 2020-03-30 17:28:15 +08:00
tian.guangyuan
9646dc1681 【fix】 修复 在不选择 用户时, 有无社保项为 “null” 的错误,修改默认为“有”社保 2020-03-30 17:25:54 +08:00
tian.guangyuan
30cbc43093 [fix] 修复bug GFRS-843 GFRS-845
修复 非阻断验证为 conform 提示 是否修改
2020-03-30 17:20:41 +08:00
yuweiqi
d2ea89dd8e [FIX]bug_GFRS-838-【电子投保】目前转人工核保、若被保人存在多条逾期投保单号的话,目前页面可以左右滑动,页面显示内容未进行换行 2020-03-30 17:19:10 +08:00
tian.guangyuan
deeb9070b9 按照 提示 进行 2020-03-30 16:13:55 +08:00
yuweiqi
892b225fc1 Merge branch 'hotfix/bug_GFRS-832_自助入司-影像信息上传页,影像上传有误' into dev 2020-03-30 12:12:53 +08:00
yuweiqi
6a671842ce [FIX]去掉无用代码 2020-03-30 12:11:59 +08:00
yuweiqi
c992a33201 Merge branch 'hotfix/bug_回归测试问题及优化' into dev 2020-03-30 12:09:13 +08:00
yuweiqi
42a288776d [FIX]电投-附件上传-图片上传重复,删除其中一张导致提交失败 2020-03-30 12:07:53 +08:00
tian.guangyuan
8c1365bd5b [fix] 16周岁校验 2020-03-30 10:53:20 +08:00
yuweiqi
14d41d69d0 Merge branch 'hotfix/bug_GFRS-832_自助入司-影像信息上传页,影像上传有误' into dev 2020-03-30 10:07:26 +08:00
yuweiqi
a8d76e1f18 [FIX]打log 2020-03-30 10:06:35 +08:00
tgy
7cfec89ff1 Merge branch 'feature/GFRS-765【0423】电投自核规则前端进行转译提示' into dev 2020-03-28 23:07:29 +08:00
tgy
a0c00a733a [fix] 被保险人人年龄≤13岁,学历不可以为研究生、本科、高中、大专 修复代码中逻辑与实际逻辑不符 2020-03-28 23:05:27 +08:00
阳华祥
091eee7bde Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1' into release/0327 2020-03-28 19:19:03 +08:00
tgy
f494d6ba55 Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1' into dev 2020-03-28 19:10:10 +08:00
tgy
d60df2c08e 【fix】 修复 在不选择 用户时, 有无社保项为 “undefined” 的错误,修改默认为“有”社保 2020-03-28 19:09:09 +08:00
tian.guangyuan
b41e3d01ce Merge branch 'feature/GFRS-785_1【0402】国富人寿附加综合意外伤害保险运营规则调整' into release/0327
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2020-03-27 20:16:01 +08:00
tian.guangyuan
b7d5ed76f5 Merge branch '0327/GFRS-786【0402】国富人寿附加住院医疗保险运营规则调整' into release/0327 2020-03-27 20:13:56 +08:00
tian.guangyuan
2041f23505 Merge branch '0327/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1' into release/0327
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2020-03-27 20:12:26 +08:00
tian.guangyuan
9e18cac841 Merge branch '0327/GFRS-785【0402】国富人寿综合意外伤害保险(2020版)运营规则调整' into release/0327
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2020-03-27 20:06:44 +08:00
tian.guangyuan
44a2212b76 Merge branch '0327/hotfix-GFRS-770' into release/0327 2020-03-27 20:00:19 +08:00
yuweiqi
b9876bfa33 Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-27 19:19:01 +08:00
yuweiqi
6ff1ff109b [FIX]bug_GFRS-830 电子投保-核保结果页面点击【返回投保单列表】,跳转页面错误 2020-03-27 19:18:19 +08:00
yuweiqi
7f742ecf83 Merge branch 'hotfix/bug_回归测试问题及优化' into dev
# Conflicts:
#	src/views/ebiz/serve/Detail.vue
2020-03-27 18:26:17 +08:00
yuweiqi
41b771420e [FIX]证件号选择非居民身份证,回执签收仍需要人脸识别,实际不应该进行人脸识别 2020-03-27 17:23:14 +08:00
tian.guangyuan
9fcbff27ff Merge branch 'nbs' into dev 2020-03-27 16:41:36 +08:00
tian.guangyuan
651747d018 【fix】 教育年龄 不输入时,不做验证 2020-03-27 16:40:47 +08:00
tian.guangyuan
943527568e Merge branch 'nbs' into dev 2020-03-27 16:19:19 +08:00