Commit Graph

6316 Commits

Author SHA1 Message Date
yuweiqi
43f89953d3 Merge branch 'hotfix/bug_GFRS-1053自助入司-影像信息上传页-上传图片失败,点击下一步时,前端未校验住' into dev 2020-04-20 15:22:30 +08:00
yuweiqi
c451c20c7d [FIX]自助入司-影像上传-增加上传图片失败提示 2020-04-20 15:21:24 +08:00
yuweiqi
f2e0580f2f [FIX]自助入司-影像上传-增加上传图片失败提示、校验 2020-04-20 15:15:09 +08:00
tian.guangyuan
e18aee0066 Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev
# Conflicts:
#	src/router/ebiz/index.js
2020-04-20 14:36:33 +08:00
tian.guangyuan
dba77db331 【fix】 修复处理冲突时,引起的项目无法正常启动。 2020-04-20 14:33:45 +08:00
tian.guangyuan
ab4959b0de Merge branch 'dev_cardList' into feature/GFRS-247【待确定】卡单产品投保
# Conflicts:
#	src/assets/js/utils/request.js
#	src/config/urlMap.js
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
#	src/views/ebiz/sale/InsuredInfo.vue
2020-04-20 14:29:27 +08:00
tian.guangyuan
be6e381513 [new] 完成投保进度查询,详情(联系方式变更)
[fix] 完善投保进度列表
2020-04-20 14:18:32 +08:00
tian.guangyuan
78365d4b5d [fix] 临时保存 2020-04-17 17:44:34 +08:00
tian.guangyuan
c4cca32dee Merge branch 'feature/GFRS-1019【0415】签收回执人脸识别修改为短信验证码-tgy' into dev 2020-04-17 16:32:58 +08:00
tian.guangyuan
b5e25e3ff7 【fix】 修改微信中飞签的逻辑 2020-04-17 16:32:38 +08:00
tian.guangyuan
487a65ccb6 Merge branch 'feature/GFRS-1019【0415】签收回执人脸识别修改为短信验证码-tgy' into dev 2020-04-17 15:51:19 +08:00
tian.guangyuan
2cc35b6f3f [fix] 调试 签收回执人脸识别修改为短信验证码 2020-04-17 15:50:48 +08:00
tian.guangyuan
ee1f6555bd Merge branch 'feature/GFRS-1006【0423】国富人寿爱易保重大疾病保险产品开发' into dev 2020-04-17 14:16:13 +08:00
tian.guangyuan
38d3a696fd 【fix】 修正爱易保的riskType(产品编码) 2020-04-17 14:15:56 +08:00
tian.guangyuan
5d4f74f75b Merge branch 'hotfix/GFRS【栋梁一起】电投受益人同投保人选项-其他禁用' into dev 2020-04-17 13:37:18 +08:00
tian.guangyuan
7a761c3997 Merge branch 'feature/GFRS-1033【0430】职业控件优化' into dev
# Conflicts:
#	src/api/ebiz/sale/sale.js
2020-04-17 13:36:55 +08:00
tian.guangyuan
0e55519e67 Merge branch 'feature/GFRS-1019【0415】签收回执人脸识别修改为短信验证码-tgy' into dev
# Conflicts:
#	src/views/ebiz/sale/SignatureOfElectronic.vue
#	src/views/ebiz/serve/Detail.vue
2020-04-17 13:34:29 +08:00
tian.guangyuan
dd5e8200b5 Merge branch 'feature/GFRS-1006【0423】国富人寿爱易保重大疾病保险产品开发' into dev
# Conflicts:
#	src/assets/js/business-common.js
#	src/assets/js/utils/validator.js
#	src/views/ebiz/sale/AddBeneficiaryInfo.vue
#	src/views/ebiz/sale/InsuredInfo.vue
#	src/views/ebiz/sale/InsuredPerson.vue
#	src/views/ebiz/sale/List.vue
#	src/views/ebiz/sale/SignatureConfirmation.vue
2020-04-17 13:33:11 +08:00
tian.guangyuan
066265188c 【fix】 在字典中配置爱易保的 riskType(产品编码) 2020-04-17 13:18:54 +08:00
tian.guangyuan
39f3201457 【fix】 完成 GFRS-1019【待确定】签收回执人脸识别修改为短信验证码
待发布到测试环境测试
2020-04-17 13:14:54 +08:00
tian.guangyuan
6a72af0dbe 【fix】 在添加指定受益人时,在投被保险人的关系为其他时,禁用 “同投保人” 选项 2020-04-17 09:47:11 +08:00
tian.guangyuan
80cd78c72f Merge branch 'hotfix/GFRS【】修复建议书bug' into release/0416_2 2020-04-16 20:53:54 +08:00
tian.guangyuan
01f4337c94 Merge branch '0416/GFRS-765【0423】电投自核规则前端进行转译提示' into release/0416_2
# 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-04-16 20:01:36 +08:00
yuweiqi
975d109f1d Merge branch 'feature/GFRS-597【电投页面优化】' into r/0416
# Conflicts:
#	src/views/ebiz/sale/AddBeneficiaryInfo.vue
2020-04-16 19:53:46 +08:00
yuweiqi
d78b488c64 [FIX]【电投优化】添加指定受益人-勾选同被保人(关系为配偶)点击添加报错 2020-04-16 19:15:12 +08:00
tian.guangyuan
eb3ee61e66 【new】 临时存储 2020-04-16 19:06:03 +08:00
yuweiqi
caa15d29c1 Merge branch 'feature/GFRS-597【电投页面优化】' into dev
# Conflicts:
#	src/assets/js/business-common.js
#	src/views/ebiz/sale/AddBeneficiaryInfo.vue
2020-04-16 17:28:45 +08:00
yuweiqi
5902c19eec [FIX]【电投优化】添加指定受益人-勾选“同投保人”时信息带入失败bug修复 2020-04-16 17:19:37 +08:00
GUO
7fab2eb344 Merge branch 'feature/GFRS-1019-【0415】签收回执人脸识别修改为短信验证码' into dev 2020-04-16 15:56:52 +08:00
GUO
79146a5d3c 签收回执人脸验证修改为短信验证去掉多余打印代码 2020-04-16 15:56:12 +08:00
tian.guangyuan
d74a9601f0 职业控件优化:
1. 增加常用职业栏
2. 将常用职业栏的数据从后台获取
3. 优化搜索关键词显示词条,显示三级职业
4. 在搜索职业时,将搜索内容标红
2020-04-16 15:43:43 +08:00
GUO
12b658e0b8 Merge branch 'feature/GFRS-1019-【0415】签收回执人脸识别修改为短信验证码' into dev 2020-04-16 15:30:42 +08:00
GUO
5e7d3d4596 签收回执人脸验证修改为短信验证 2020-04-16 15:12:36 +08:00
tian.guangyuan
16799fea10 Merge branch 'hotfix/GFRS【】修复建议书bug' into dev
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/assets/js/utils/validator.js
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
#	src/views/ebiz/proposal/Exhibition.vue
2020-04-16 14:12:08 +08:00
tian.guangyuan
b80adf37e3 【fix】 修复建议书中, 姓名校验添加与电投流程一致,修复在选择数据不完整个的客户时,出现的异常情况。 2020-04-16 14:06:10 +08:00
tian.guangyuan
18468bf634 Merge branch 'release/0416' into 0416/GFRS-765【0423】电投自核规则前端进行转译提示
# Conflicts:
#	src/assets/js/utils/validator.js
#	src/views/ebiz/sale/AddBeneficiaryInfo.vue
#	src/views/ebiz/sale/AttachmentManagement.vue
#	src/views/ebiz/sale/InsuredPerson.vue
2020-04-16 10:39:09 +08:00
tian.guangyuan
f1c3ca0a9f Merge branch 'feature/GFRS-764【0423】订单筛选功能优化' into release/0416 2020-04-16 10:32:38 +08:00
tian.guangyuan
3b1ac3ef17 Merge branch 'feature/GFRS-438回归测试:优化--保单查询列表应该按照保单生效日期倒叙排列' into release/0416 2020-04-16 10:32:15 +08:00
tian.guangyuan
41923a3860 [fix] 增加搜索功能(按投保人姓名模糊搜索)
增加待承保列表
2020-04-16 10:25:38 +08:00
tgy
b2b6500fbc Merge branch 'feature/GFRS-730【0326】国富人寿附加综合意外伤害保险' into release/0415
# Conflicts:
#	src/views/ebiz/sale/SignatureConfirmation.vue
2020-04-15 23:12:18 +08:00
yuweiqi
f45333d267 [NEW]【保全-退保】新增退保信息、确认页 2020-04-15 22:04:16 +08:00
yuweiqi
87614584cc [NEW]【保全-续期】增加客户搜索接口 2020-04-15 22:03:34 +08:00
yuweiqi
913ab8e7f2 [NEW]【保全-续期】新增影像上传、续期信息、确认页 2020-04-15 22:03:04 +08:00
yuweiqi
2c5d544197 [NEW]【保全-续期】新增自动转账授权书 2020-04-15 22:00:22 +08:00
yuweiqi
5041dfc241 [NEW]【保全-续期账号变更】配置mock 2020-04-15 21:59:10 +08:00
yuweiqi
68e7561249 Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-04-15 17:45:13 +08:00
yuweiqi
95cb3aa450 [FIX]【电投】职业类别控件样式恢复到之前 2020-04-15 17:44:42 +08:00
阳华祥
3894fa96a4 Merge branch 'feature/GFRS-454【0326】建议书优化2.0' into release/0415
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/views/ebiz/proposal/Exhibition.vue
2020-04-15 13:39:53 +08:00
tian.guangyuan
d73de89000 [IMP] 修复保全的 代码格式 2020-04-15 13:14:15 +08:00
tian.guangyuan
36cf165351 [new] 新增保全-受益人变更功能,页面逻辑基本完成,部分页面因接口问题暂时无法继续开发 2020-04-15 13:06:33 +08:00