Commit Graph

7467 Commits

Author SHA1 Message Date
yuweiqi
3354a539fc [FIX]自助入司-基本信息填写-从业年限只允许输入小数 2020-02-19 10:57:00 +08:00
yuweiqi
10e13d08ac Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-18 22:20:17 +08:00
yuweiqi
0e7de5550d [FIX]自助入司-审批流程页面 2020-02-18 22:19:20 +08:00
yuweiqi
dce25aee18 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-18 18:28:31 +08:00
yuweiqi
6142cf02fe [FIX]入司审批-审批列表-字段更正、提交成功页-点击返回跳转到审批列表页、审批结果提交页-显示字段更正;自助入司-入司流程显示页-修改bug 2020-02-18 18:26:12 +08:00
lihaoda
625c5c41a5 Merge branch '新增保险' into dev 2020-02-18 17:57:27 +08:00
lihaoda
8984c75cd6 fix 2020-02-18 17:57:17 +08:00
lihaoda
72e6caaa75 fix 2020-02-18 17:34:17 +08:00
lihaoda
79acc0c4ea Merge branch 'nbs' into dev 2020-02-18 17:25:33 +08:00
lihaoda
4a88bc1048 fix 2020-02-18 17:24:39 +08:00
lihaoda
f9d595b500 Merge branch '新增保险' into dev 2020-02-18 16:55:32 +08:00
lihaoda
280cd3f824 fix 2020-02-18 16:55:18 +08:00
lihaoda
4144c6af39 恢复险种类型年金选项(之前删了) 2020-02-18 16:47:43 +08:00
lihaoda
d9e0cc7db6 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-02-18 16:41:22 +08:00
lihaoda
e58e39ee1e Merge branch '新增保险' into dev 2020-02-18 16:41:11 +08:00
lihaoda
ddbf95c45a fix 2020-02-18 16:40:56 +08:00
yuweiqi
5474becced Merge branch 'feature/GFRS-221_入司审批' into dev
# Conflicts:
#	src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
#	src/views/ebiz/agentEenter/EntryProcess.vue
#	src/views/ebiz/agentEenter/SeeCause.vue
2020-02-18 16:33:01 +08:00
yuweiqi
e3dcfa2c09 [FIX]自助入司-入司流程显示、入司基本信息填写职级增加必填样式及校验 2020-02-18 16:16:36 +08:00
yuweiqi
f0d6d0f534 [FIX]自助入司-增员分享的基本信息填写、引导登录加入我们、查看审批拒绝原因;入司审批-审批列表-请求及相应参数字段修改 2020-02-18 16:14:15 +08:00
lihaoda
3642966f11 Merge branch '新增保险' into dev 2020-02-18 16:01:44 +08:00
lihaoda
45d2ca8994 fix 2020-02-18 16:01:28 +08:00
lihaoda
ee6f098e26 Merge branch 'bugfix' into dev 2020-02-18 13:18:00 +08:00
lihaoda
4409d054b2 fix 2020-02-18 13:17:45 +08:00
lihaoda
b69d1c4d8e Merge branch 'bugfix' into dev 2020-02-18 08:56:16 +08:00
lihaoda
2023134fd1 fix 2020-02-18 08:55:52 +08:00
lihaoda
da36d57706 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-02-17 17:49:57 +08:00
lihaoda
18acbacf27 责任验证 2020-02-17 17:47:24 +08:00
yuweiqi
fcfe6fac34 [FIX]入司审批-审批结果提交页-提交结果的请求参数字段更改 2020-02-17 00:52:38 +08:00
yuweiqi
2399e7dcfb [FIX]自助入司-信息填写-职称、专业、邮编设为非必填项 2020-02-17 00:51:24 +08:00
yuweiqi
26ec16285c [FIIX]打log调试 2020-02-16 19:11:30 +08:00
yuweiqi
f3e5dd4d67 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-16 18:12:32 +08:00
yuweiqi
969238a6d2 [FIX]入司审批-审批结果提交成功页面-返回按钮跳转bug修复 2020-02-16 18:11:37 +08:00
yuweiqi
90a63511e9 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-16 18:05:28 +08:00
yuweiqi
6e1212c84c [FIX]自助入司-基本信息填写-所学专业为必填项,显示* 2020-02-16 18:05:01 +08:00
yuweiqi
ded8d2810f Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-16 18:01:50 +08:00
yuweiqi
16bb716fe9 [FIX]入司审批-审批结果提交成功页面-返回按钮跳转bug修复 2020-02-16 18:00:39 +08:00
yuweiqi
474bb9603b Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-16 16:36:49 +08:00
yuweiqi
a3221fa4c9 [FIX]自助入司-信息填写-职称、专业、邮编设为必填项 2020-02-16 16:36:05 +08:00
yuweiqi
edc8d07104 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-16 15:58:48 +08:00
yuweiqi
6734f8509d [FIX]自助入司-调试 2020-02-16 15:58:09 +08:00
yuweiqi
14db925967 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-16 15:44:13 +08:00
yuweiqi
892ce10c7f [FIX]自助入司-打log调试 2020-02-16 15:43:45 +08:00
yuweiqi
4bd7f138c4 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-16 15:16:27 +08:00
yuweiqi
2a678684c3 [FIX]入司审批(整体调整:接口联调+页面按钮调整) 2020-02-16 15:15:23 +08:00
yuweiqi
23e6f38d90 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-16 11:29:54 +08:00
yuweiqi
27790c4c46 [FIX]自助入司-打log调试 2020-02-16 11:27:56 +08:00
lihaoda
fa3073fbb8 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-02-15 20:03:26 +08:00
lihaoda
0da146bcf0 Merge branch '新增保险' into dev 2020-02-15 20:03:03 +08:00
lihaoda
3d426bf55c fix 2020-02-15 20:02:39 +08:00
yuweiqi
b5bd17160a Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-15 18:29:14 +08:00