Commit Graph

6308 Commits

Author SHA1 Message Date
yuweiqi
208e052dbf [FIX]bug-GFRS-859-修改保单详情页面标题为“投保单信息” 2020-04-01 16:43:00 +08:00
yuweiqi
da95910451 [FIX]bug_GFRS-861-电投优化-选择产品信息后需要通过下一步按钮才能进入受益人页面 2020-04-01 16:42:02 +08:00
yuweiqi
91447c9668 Merge branch 'hotfix/bug_回归测试问题及优化' into release/0401
# Conflicts:
#	src/views/ebiz/serve/Detail.vue
2020-04-01 16:24:10 +08:00
yuweiqi
fecf0e357d Merge branch 'hotfix/bug_GFRS-832_自助入司-影像信息上传页,影像上传有误' into release/0401 2020-04-01 15:59:17 +08:00
yuweiqi
0578ef1cff Merge branch 'hotfix/bug_回归测试问题及优化' into dev 2020-04-01 15:43:08 +08:00
yuweiqi
48abf29739 [FIX]保单查询-核心查询失败返回result为“1”时,resultMessage也为空时,页面显示暂无投保单 2020-04-01 15:42:43 +08:00
阳华祥
01e68195ec Merge branch 'nbs' into release/0401
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/config/index.js
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
2020-04-01 15:25:33 +08:00
tian.guangyuan
abc0a8607f Merge branch 'feature/GFRS-834【0402】国富人寿国富栋梁定期寿险' into dev 2020-04-01 10:27:28 +08:00
tian.guangyuan
ec0af28171 人发模块 代码格式化 2020-04-01 10:26:09 +08:00
tian.guangyuan
62be77957b Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-818【0410】人力发展-DISC性格分析 2020-04-01 10:21:53 +08:00
yuweiqi
ef634bf9d3 [FIX]DISC-修改图片名称 2020-04-01 10:07:22 +08:00
tian.guangyuan
1054b6ec16 Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-818【0410】人力发展-DISC性格分析 2020-04-01 10:03:42 +08:00
tian.guangyuan
a6431274cb 【fix】 暂时完成 国富栋梁定期寿险 的交费期间、保险期间的联动关系验证从后台获取。
待测试配置是否正确
2020-04-01 09:46:05 +08:00
yuweiqi
86f8c19994 [FIX]DISC-修改错误路由 2020-03-31 19:09:19 +08:00
yuweiqi
53da4c6d33 [NEW]DISC-新增封面图 2020-03-31 19:08:29 +08:00
tian.guangyuan
04e4251b86 【fix】 临时保存,已完成 DISC 部分的结果页面结构,未对接 数据 2020-03-31 18:11:27 +08:00
yuweiqi
17bd612b22 Merge branch 'nbs' into dev 2020-03-31 15:30:51 +08:00
yuweiqi
7c2af127d2 [IMP]nbs-优化-应备费用-子女教育年龄 2020-03-31 15:30:24 +08:00
tian.guangyuan
b3538eb192 Merge branch 'feature/GFRS-834【0402】国富人寿国富栋梁定期寿险' into dev 2020-03-31 14:51:28 +08:00
tian.guangyuan
5903df5ef6 【fix】 暂时完成 国富栋梁定期寿险 的交费期间、保险期间的联动关系验证从后台获取。
待确认效果是否可行
2020-03-31 14:46:38 +08:00
yuweiqi
03f0244023 Merge branch 'nbs' into dev 2020-03-31 12:00:28 +08:00
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