hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-21 21:46:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,316 Commits 232 Branches 17 Tags
a43e98b935cb51a12a1ced33d11f39981f97435c
Commit Graph

6316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lihaoda
b3cf044bac Merge branch 'nbs' into dev 2020-02-21 14:53:47 +08:00
lihaoda
529508cca5 fix 2020-02-21 14:51:49 +08:00
yuweiqi
d6f7cfd773 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-20 16:45:35 +08:00
yuweiqi
ed3527bf15 [FIX]入司流程查看-审批拒绝原因bug 2020-02-20 16:42:24 +08:00
yuweiqi
228e35fc2b [FIX]自助入司-家庭信息填写-多个家庭成员信息提交报错bug 2020-02-20 16:40:52 +08:00
ding.zhou
76e9b1c275 Merge branch 'feature/GFRS-623_【0220】国富人寿鑫管家终身寿险（万能型）产品需求' into dev 
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
 2020-02-20 16:24:42 +08:00
ding.zhou
44bdcff02e 需求：GFRS-623 国富人寿鑫管家终身寿险（万能型） 
变更：增加新产品相关配置及主险列表页面最后一行不展示
 2020-02-20 16:22:57 +08:00
28CD73C051F645E8132835671423A23F
e7256b23eb Merge branch 'feature/GFRS-623_【0220】国富人寿鑫管家终身寿险（万能型）产品需求' into dev 
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
 2020-02-20 16:19:20 +08:00
ding.zhou
172b279e76 需求：GFRS-623 国富人寿鑫管家终身寿险（万能型） 
变更：增加新产品相关配置及主险列表页面最后一行不展示
 2020-02-20 16:17:46 +08:00
yuweiqi
b680e2dc95 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-20 14:50:11 +08:00
yuweiqi
747911f896 [FIX]自助入司-信息显示页面单元格被遮挡不显示bug修复 2020-02-20 14:49:31 +08:00
yuweiqi
502e84a521 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-20 14:02:01 +08:00
yuweiqi
3292401cbf [FIX]自助入司、入司申请--更改推荐人相关信息字段 2020-02-20 14:01:15 +08:00
lihaoda
0672166f1b fix 2020-02-20 13:38:19 +08:00
lihaoda
49ca68e5aa fix 2020-02-20 13:23:31 +08:00
lihaoda
043aed0d79 fix 2020-02-20 13:16:57 +08:00
yuweiqi
2f51b9e0f6 Merge branch 'feature/GFRS-221_入司审批' into dev 
# Conflicts:
#	src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue
#	src/views/ebiz/agentEenter/AgentEnterGuarantor.vue
 2020-02-20 12:23:20 +08:00
yuweiqi
ec1b4d13b9 [FIX]自助入司-担保人信息页面、家庭信息页面-取消证件类型为非身份证时证件号的校验，增加身份证号的校验；入司流程查看页-配合后台修改后的响应参数更改渲染审批链的代码 2020-02-20 12:18:19 +08:00
lihaoda
1bc7cd3277 fix 2020-02-19 20:32:25 +08:00
lihaoda
5ae3e8825c Merge branch 'nbs' into dev 2020-02-19 20:11:28 +08:00
lihaoda
bef6b7c497 fix 2020-02-19 20:11:09 +08:00
yuweiqi
89187305ac Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-19 18:04:20 +08:00
yuweiqi
494b6ecf65 [FIX]解决dev合并代码冲突 2020-02-19 18:02:41 +08:00
yuweiqi
fd17dde393 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-19 17:59:43 +08:00
yuweiqi
47e531a3ca [FIX]修复代码合并冲突 2020-02-19 17:58:26 +08:00
lihaoda
a287b5b3bc Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-02-19 17:57:54 +08:00
lihaoda
b505de5fff Merge branch 'nbs' into dev 2020-02-19 17:57:43 +08:00
lihaoda
b2efce111f fix 2020-02-19 17:57:31 +08:00
yuweiqi
f39662bd63 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-19 17:49:34 +08:00
lihaoda
44eb02352c Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-02-19 17:42:54 +08:00
lihaoda
05393623e4 Merge branch 'nbs' into dev 2020-02-19 17:42:43 +08:00
lihaoda
79808c2795 fix 2020-02-19 17:42:29 +08:00
yuweiqi
37ea1e1dbb [FIX]入司审批-增员信息页-基本信息显示bug修复 2020-02-19 17:42:05 +08:00
90969
df7653c7d9 Merge branch 'hotfix/bug_海报预览公司名错误' into dev 2020-02-19 17:22:08 +08:00
90969
683502e79f 海报预览样式问题 2020-02-19 17:21:48 +08:00
lihaoda
575892783c Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-02-19 14:35:55 +08:00
lihaoda
28ddc15a60 Merge branch 'nbs' into dev 2020-02-19 14:35:40 +08:00
lihaoda
59f8948729 fix 2020-02-19 14:35:27 +08:00
90969
422ccbeef1 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-02-19 14:33:17 +08:00
90969
ca60c617c6 Merge branch 'hotfix/bug_海报预览样式问题' into dev 
# Conflicts:
#	src/views/ebiz/poster/PosterPreview.vue
 2020-02-19 14:33:11 +08:00
lihaoda
fa5198d1f5 Merge branch 'nbs' into dev 2020-02-19 14:32:09 +08:00
lihaoda
c2b6d9b539 fix 2020-02-19 14:31:56 +08:00
90969
35464607e1 海报预览样式问题 2020-02-19 14:29:47 +08:00
lihaoda
be6f22830b Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-02-19 11:59:39 +08:00
lihaoda
357bb4ff13 Merge branch 'nbs' into dev 2020-02-19 11:59:20 +08:00
lihaoda
48b9a71740 fix 2020-02-19 11:58:40 +08:00
yuweiqi
c2a6749030 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-19 11:40:11 +08:00
yuweiqi
5fa6f7bf2c [FIX]自助入司-基本信息填写-从业年限只允许输入整数 2020-02-19 11:33:35 +08:00
yuweiqi
c88023031b Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-19 11:02:23 +08:00
yuweiqi
3354a539fc [FIX]自助入司-基本信息填写-从业年限只允许输入小数 2020-02-19 10:57:00 +08:00