Commit Graph

6308 Commits

Author SHA1 Message Date
yuweiqi
be49282e98 [FIX]解决冲突 2020-01-19 15:32:18 +08:00
yuweiqi
b29a193a18 Merge branch 'feature/GFRS-502_【0206】国富人寿富娃娃两全保险(万能型)' into dev
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2020-01-19 15:29:03 +08:00
yuweiqi
cf821b6f17 [FIX]建议书保费试算bug 2020-01-19 15:27:40 +08:00
yuweiqi
7ae27a460f Merge branch 'feature/GFRS-502_【0206】国富人寿富娃娃两全保险(万能型)' into dev
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2020-01-19 15:12:29 +08:00
yuweiqi
65daa3a30b [FIX]建议书保费试算页面bug 2020-01-19 15:09:50 +08:00
yuweiqi
b7cf457ed1 Merge branch 'feature/GFRS-502_【0206】国富人寿富娃娃两全保险(万能型)' into dev 2020-01-19 14:57:53 +08:00
yuweiqi
a7228a6464 [FIX]建议书保费试算页面bug修复 2020-01-19 14:57:08 +08:00
yuweiqi
d466477e9f Merge branch 'feature/GFRS-502_【0206】国富人寿富娃娃两全保险(万能型)' into dev
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2020-01-19 14:52:31 +08:00
yuweiqi
cc956cef13 [FIX]建议书保费试算页面bug 2020-01-19 14:39:23 +08:00
yuweiqi
8b05d25645 [FIX]解决冲突 2020-01-19 12:27:26 +08:00
yuweiqi
ae6f801a11 Merge branch 'feature/GFRS-502_【0206】国富人寿富娃娃两全保险(万能型)' into dev
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2020-01-19 12:19:08 +08:00
yuweiqi
0a4a642024 [FIX]万能险bug修复 2020-01-19 11:24:06 +08:00
yuweiqi
12f6739cab [FIX]富娃娃两全保险(万能险)-投保页面-保费填写校验 2020-01-18 19:24:01 +08:00
yuweiqi
f40e583d5a [FIX]富娃娃主险投保页面-首期保费跟着填写的保费输入值一起变化 2020-01-18 17:54:05 +08:00
yuweiqi
ef3358d1fc [FIX]富娃娃主险+附加险 页面显示项渲染 2020-01-18 17:43:58 +08:00
yuweiqi
bb45df32ff Merge branch 'feature/GFRS-502_【0206】国富人寿富娃娃两全保险(万能型)' into dev 2020-01-18 11:35:57 +08:00
yuweiqi
0505d54f74 [FIX]签名页-万能险产品编码多加一个GFRS_M0015 2020-01-18 11:35:34 +08:00
yuweiqi
862498f8c0 Merge branch 'feature/GFRS-502_【0206】国富人寿富娃娃两全保险(万能型)' into dev 2020-01-18 11:24:10 +08:00
yuweiqi
1ecaa9ded2 [FIX]签名页-万能险产品编码多加一个GFRS_M0015 2020-01-18 11:23:30 +08:00
yuweiqi
e8c2bfc080 Merge branch 'feature/GFRS-502_【0206】国富人寿富娃娃两全保险(万能型)' into dev 2020-01-18 11:13:22 +08:00
yuweiqi
17c6ed5317 [FIX]签名页-万能险产品编码多加一个GFRS_M0015 2020-01-18 11:11:57 +08:00
yuweiqi
4a0ec78db9 [new]国富人寿富娃娃主险 2020-01-17 18:00:34 +08:00
yuweiqi
41e179b933 Merge branch 'dev_claim' into dev 2020-01-17 14:20:57 +08:00
yuweiqi
44c0af832a [FIX]理赔申请-被保人信息填写页title、申请信息填写页title 2020-01-17 14:14:47 +08:00
yuweiqi
4bccfed3d1 Merge branch 'dev_claim' into dev 2020-01-16 19:25:57 +08:00
yuweiqi
fac1d17b97 [FIX]理赔申请-申请人信息页面-添加注释 2020-01-16 19:23:39 +08:00
yuweiqi
fc3c5256b6 [FIX]理赔进度查询列表-前端取消查询到的数据倒序显示(后端已经按照时间排好了顺序返回) 2020-01-16 13:34:47 +08:00
yuweiqi
1a88098a89 Merge branch 'dev_claim' into dev 2020-01-16 13:06:01 +08:00
yuweiqi
c927902d21 [FIX]理赔申请-最终提交-跳转提交成功/失败 页面 2020-01-16 13:04:47 +08:00
yuweiqi
bbe70ab0df Merge branch 'dev_claim' into dev 2020-01-16 11:50:25 +08:00
yuweiqi
778ad912c8 [FIX]理赔申请-打log调试,dev手机自测调试 2020-01-16 11:49:16 +08:00
yuweiqi
4953b548f1 Merge branch 'dev_claim' into dev 2020-01-16 11:33:44 +08:00
yuweiqi
4fbd48c5ef [FIX]理赔申请-打log调试,dev手机自测调试 2020-01-16 11:32:39 +08:00
yuweiqi
95eb0f351f Merge branch 'dev_claim' into dev 2020-01-16 11:18:13 +08:00
yuweiqi
9209214e6f [FIX]理赔申请-打log调试,dev手机自测调试 2020-01-16 11:17:07 +08:00
yuweiqi
2952a6941d Merge branch 'dev_claim' into dev 2020-01-16 11:12:12 +08:00
yuweiqi
2b8f350e6d [FIX]理赔申请-打log调试,dev手机自测调试 2020-01-16 11:09:54 +08:00
yuweiqi
4ae3261ee8 Merge branch 'dev_claim' into dev 2020-01-16 10:57:06 +08:00
yuweiqi
f010f74fc6 [FIX]打log调试,dev环境手机测试 2020-01-16 10:55:17 +08:00
yuweiqi
5c15c74bc1 Merge branch 'feature/GFRS-413_【0116】豁免险' into dev 2020-01-16 09:25:41 +08:00
yuweiqi
c51d6d7695 [FIX]NotifyingMessage修改校验规则,修复告知项目的显示bug 2020-01-16 09:24:35 +08:00
yuweiqi
ffc1a47b9d Merge branch 'dev_claim' into dev 2020-01-15 19:13:05 +08:00
yuweiqi
81f749df6f [FIX]理赔申请-签名后完成后最后一步提交-成功/失败 页面 2020-01-15 19:12:32 +08:00
yuweiqi
02e956bff2 Merge branch 'dev_claim' into dev 2020-01-15 11:38:44 +08:00
yuweiqi
e271e9ed93 [FIX]客户列表查询-当不存在查询的客户,显示“暂无当前客户” 2020-01-15 11:37:31 +08:00
yuweiqi
45690edb24 Merge branch 'hotfix/bug_GFRS-474客户重要事件提醒—客户重要事件列表显示内容' into dev 2020-01-14 15:28:33 +08:00
yuweiqi
7b78f0135d [FIX]bug_GFRS-468客户管理重要事件列表-已提醒状态事件去掉编辑按钮
[FIX]bug_GFRS-467客户管理重要事件提醒-编辑客户事件时,提醒时间应当不可以选择当前时间之前的时间
2020-01-14 15:21:59 +08:00
yuweiqi
17478bfcd6 Merge branch 'hotfix/bug_GFRS-474客户重要事件提醒—客户重要事件列表显示内容' into dev 2020-01-14 13:29:34 +08:00
yuweiqi
05a8c9f7c1 [FIX]客户管理-客户列表-事件列表内容显示更改 2020-01-14 13:28:00 +08:00
yuweiqi
0690370836 Merge branch 'dev_claim' into dev 2020-01-14 09:50:07 +08:00