Commit Graph

77 Commits

Author SHA1 Message Date
yuweiqi
3b909b9bbb Merge branch 'feature/GFRS-413_【0116】豁免险' into dev 2020-01-09 11:22:14 +08:00
qiqilovehcy
8c0b0317c5 修改注释 2020-01-08 17:26:28 +08:00
qiqilovehcy
dfcc32f058 附加豁免险-保险期间、缴费期间修改为与主险的缴费期间一致 2020-01-08 14:01:29 +08:00
zhouna
db7b726eb3 Merge branch 'release/1226' into dev 2019-12-31 11:54:57 +08:00
wangmingzhe
ffad10c76a Merge branch 'release/1226' of http://112.124.100.131/GFRS/ebiz-h5 into release/1226 2019-12-31 11:52:19 +08:00
wangmingzhe
2f0928a1a4 [FIX] 生产-修改选择产品后的跳转问题 2019-12-30 16:16:49 +08:00
wangmingzhe
1e897e1cd5 Merge branch 'release/1226' into dev 2019-12-29 20:15:26 +08:00
wangmingzhe
da76604d23 [FIX] 修改万能险保额显示错误问题 2019-12-29 20:15:11 +08:00
wangmingzhe
9402e42759 Merge branch 'release/1226' into dev 2019-12-29 19:47:07 +08:00
wangmingzhe
580952227a [FIX] 测试注释同步万能险的保费与保额 2019-12-29 19:46:56 +08:00
wangmingzhe
51d0d03d0e Merge branch 'release/1226' into dev
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
#	src/views/ebiz/sale/AddBeneficiaryInfo.vue
2019-12-26 13:34:16 +08:00
wangmingzhe
0fbf38ecef [FIX] 修改建议书展示第二款产品保费及年限显示错误问题,修改两款产品组合不能转投保问题,修改添加产品按钮显示隐藏问题 2019-12-26 13:30:02 +08:00
皮伟
5eade15927 Merge branch 'dev_1220' into release/1226
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
#	src/views/ebiz/sale/AccountInformation.vue
#	src/views/ebiz/sale/SignatureConfirmation.vue
2019-12-25 13:55:11 +08:00
皮伟
f211d8f26a Merge branch 'dev_1220_pw' into dev 2019-12-23 13:02:27 +08:00
皮伟
59e2a875c8 【IMP】修改保费问题 2019-12-23 13:01:43 +08:00
皮伟
f3c3b3d8fc Merge branch 'dev_1220' into dev 2019-12-21 18:38:06 +08:00
皮伟
42c98518a7 【IMP】修改保费试算问题 2019-12-21 18:37:30 +08:00
皮伟
c84b65f31e 【IMP】更改保费问题 2019-12-21 17:49:44 +08:00
皮伟
822b4afb27 Merge branch 'dev_1220' into dev
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2019-12-21 17:10:06 +08:00
皮伟
f1959dd946 【IMP】修改保费问题 2019-12-21 17:08:16 +08:00
皮伟
8c6fac20bc 【IMP】更改保费试算amt问题 2019-12-21 15:53:12 +08:00
皮伟
b09ae6f96e 【IMP】保费试算amt问题解决 2019-12-21 15:51:16 +08:00
皮伟
23e861acab Merge branch 'dev_1220' into dev 2019-12-20 18:47:41 +08:00
皮伟
2017e78361 【IMP】更改保费问题 2019-12-20 18:46:32 +08:00
皮伟
6195274e26 Merge branch 'dev_1220' into dev 2019-12-20 11:58:45 +08:00
皮伟
366366c74e 【IMP】提交保费试算 2019-12-20 11:57:59 +08:00
皮伟
ecaeef297d Merge branch 'dev_1220' into dev 2019-12-20 09:13:20 +08:00
皮伟
1da11a2fe6 【IMP】修改保费问题 2019-12-20 09:12:26 +08:00
皮伟
c1a988b3c1 Merge branch 'dev_1220' into dev
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2019-12-19 15:52:44 +08:00
皮伟
7e1ca89fa3 【IMP】保费试算份数问题更改 2019-12-19 15:50:16 +08:00
皮伟
49b64fb799 Merge branch 'dev_1220' into dev 2019-12-18 10:06:22 +08:00
皮伟
9096d893ff [IMP]保费计算更改 2019-12-18 10:05:37 +08:00
皮伟
9934802e01 Merge branch 'dev_1220' into dev 2019-12-17 17:27:38 +08:00
皮伟
cca63b2349 【IMP】修改提示话术选择产品 2019-12-17 17:27:25 +08:00
皮伟
2340131289 Merge branch 'dev_1220' into dev 2019-12-17 16:43:28 +08:00
皮伟
568e265528 【IMP】 建议书样式问题修改 2019-12-17 16:42:44 +08:00
皮伟
f014a28a66 关联保单号更改 2019-12-13 19:07:50 +08:00
zhouna
79872bb3b7 Merge branch 'dev_1220' into dev
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
#	src/views/ebiz/sale/AccountInformation.vue
2019-12-13 17:22:45 +08:00
皮伟
73c60ce1b6 【IMP】修改关联保单号字段的文案 2019-12-12 15:02:02 +08:00
皮伟
fb8b40560c 提交关联保单号问题 2019-12-11 10:47:49 +08:00
皮伟
acf5f817ea 保费是算逻辑更改 2019-12-10 15:35:56 +08:00
皮伟
1491876248 注释 2019-12-10 10:59:34 +08:00
皮伟
dc8f0f8615 保费试算insuYearFlag值问题更改 2019-12-10 10:07:30 +08:00
皮伟
e1f11bef24 提交更改 2019-12-09 15:34:02 +08:00
皮伟
3394e5822f 提交更新提示语言 2019-12-06 19:48:58 +08:00
皮伟
d9826d38f9 更改建议福宝宝不显示 2019-12-06 15:59:22 +08:00
皮伟
eb368d3d5c 提交最新更改 2019-12-06 10:58:14 +08:00
皮伟
c60d512aa3 提交保费计算 2019-12-05 17:04:08 +08:00
皮伟
64b75478f4 保费试算更改 2019-12-05 16:45:58 +08:00
皮伟
5a65c3bad9 修改保费试算payEndYear 2019-12-05 16:37:20 +08:00