Commit Graph

1966 Commits

Author SHA1 Message Date
阳华祥
dcb3bc7e74 Merge remote-tracking branch 'origin/master' into release/0811
# Conflicts:
#	src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
2020-08-11 14:03:27 +08:00
阳华祥
d649ca43ee Merge remote-tracking branch 'origin/feature/GFRS-1469【0630】nbsapp' into release/0811
# Conflicts:
#	src/views/app/Home.vue
2020-08-11 13:50:40 +08:00
阳华祥
cb653e469d Merge remote-tracking branch 'origin/feature/增加主险' into release/0811 2020-08-11 13:44:19 +08:00
阳华祥
702ee43d12 Merge remote-tracking branch 'origin/feature/GFRS-1355【待确定】产品建议书功能和电投功能区分权限' into release/0811 2020-08-11 13:43:21 +08:00
阳华祥
19f72d9568 Merge remote-tracking branch 'origin/feature/GFRS-1198【待确定】自助入司改造(涉及销管)' into release/0811
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/router/ebiz/agentEenter.js
#	src/views/ebiz/agentEenter/AgentEenterBasicImage.vue
#	src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
#	src/views/ebiz/agentEenter/Paction.vue
#	src/views/ebiz/agentEenter/SignContract.vue
2020-08-11 13:41:33 +08:00
na.guo
2b00f46445 银行名称反显修改 2020-08-11 13:41:19 +08:00
阳华祥
acf20cd41d Merge remote-tracking branch 'origin/release/0730' into release/0811 2020-08-11 13:30:05 +08:00
na.guo
f87aade2a7 反显修改 2020-08-11 13:26:52 +08:00
na.guo
7a5cc7d380 选择银行组件添加 2020-08-11 10:18:02 +08:00
na.guo
35864ce312 添加多主险条件 2020-08-10 18:05:43 +08:00
jlw
f49209b7f2 Merge branch 'hotfix/0803业绩快报BUG修改' into release/0809
# Conflicts:
#	src/views/ebiz/report/reportList.vue
2020-08-09 18:48:12 +08:00
mengxiaolong
456ef63822 业绩快报bug修改 2020-08-09 13:07:00 +08:00
jlw
ceef7f2010 修改业绩快报BUG 2020-08-09 12:30:12 +08:00
jlw
45e063c0b5 业绩快报BUG修改 2020-08-09 12:17:53 +08:00
heweijie
569044a515 Merge branch 'feature/新增银行' into release/0807 2020-08-07 19:30:28 +08:00
na.guo
1e057c3fd7 新增银行 2020-08-07 19:27:55 +08:00
heweijie
60feed8e67 Merge branch 'feature/【机构人力排名】' into release/0807 2020-08-07 18:27:06 +08:00
阳华祥
19145928eb 入司优化:去除内勤审批流程 --提交人:阳华祥 2020-08-07 18:26:40 +08:00
heweijie
eb9358ccbe Merge branch 'feature/GFRS-1624【系统开发】-投保单详情、保单详情证件手机号脱敏-前端' into release/0807 2020-08-07 18:25:26 +08:00
heweijie
397c9c7e7c Merge branch 'feature/GFRS-1623【待确定】隐私政策' into release/0807 2020-08-07 18:24:09 +08:00
na.guo
d67ea8ebb4 路由修改 2020-08-07 17:52:04 +08:00
阳华祥
436013b44e 入司优化二期:入司家庭信息证件类型添加其他 --提交人:阳华祥
(cherry picked from commit ef4f5abb69)
(cherry picked from commit 29b5d0e19128a82130100d9fcbcec6f4683ba282)
2020-08-07 17:51:50 +08:00
阳华祥
1876e13f38 入司优化二期:关于无值时默认显示处理 --提交人:阳华祥
(cherry picked from commit 0af38b3eca)
(cherry picked from commit e39ac90de9022be1fb49d4c1a0d9a29562cb947e)
2020-08-07 17:50:48 +08:00
na.guo
832a39ca15 路由修改 2020-08-07 17:32:21 +08:00
na.guo
7733f0fdfa 关闭按钮修改 2020-08-07 16:01:15 +08:00
na.guo
f6ccae7b49 修改关闭方法 2020-08-07 15:46:52 +08:00
na.guo
b17788817b 关闭图片添加 2020-08-07 15:08:57 +08:00
na.guo
6c7016fe28 添加在册人力 2020-08-07 15:01:58 +08:00
na.guo
20c8d548b9 关闭按钮添加及其样式修改 2020-08-07 14:38:45 +08:00
na.guo
60d64ad555 样式修改 2020-08-07 13:53:34 +08:00
na.guo
4f3de1f093 关闭按钮添加 2020-08-07 13:50:29 +08:00
na.guo
96e3084ed0 刷新图标修改 2020-08-07 12:56:41 +08:00
na.guo
e488edcbd8 刷新方法修改 2020-08-07 12:25:46 +08:00
na.guo
388c9269ce 刷新方法测试 2020-08-07 12:10:11 +08:00
na.guo
fe2815d117 刷新图片路径修改 2020-08-07 11:57:35 +08:00
na.guo
df5ded59c8 刷新方法测试 2020-08-07 11:21:25 +08:00
na.guo
52f563bd0c 表格样式修改 2020-08-06 14:51:53 +08:00
na.guo
7377b0e684 固定表头 2020-08-06 12:56:56 +08:00
mengxiaolong
c6ca511a2b Merge branch 'feature/业绩快报页面改造' into hotfix/电投受益人页面校验修改
# Conflicts:
#	src/views/ebiz/report/reportList.vue
2020-08-05 17:51:40 +08:00
na.guo
873e4c88be 传参修改 2020-08-05 11:43:01 +08:00
mengxiaolong
a6686e60ae 删除年龄与婚姻状况校验 2020-08-05 11:38:07 +08:00
mengxiaolong
8af7ac0980 [FIX]电投受益人页面删除被保险人必须为已婚的校验 2020-08-05 10:59:18 +08:00
mengxiaolong
6234f6add5 Merge branch 'hotfix/机构业绩排序字段' into release/0803 2020-08-04 20:45:26 +08:00
zhu.wenli@ebiz-digits.com
34eb84c8fe 机构业绩排序字段更改 2020-08-04 20:17:32 +08:00
mengxiaolong
c2f3be8178 Merge branch 'hotfix/0803业绩快报BUG修改' into release/0803 2020-08-04 19:35:12 +08:00
mengxiaolong
f2e4f895b6 Merge branch 'hotfix/机构业绩排序字段' into release/0803 2020-08-04 19:32:32 +08:00
zhu.wenli@ebiz-digits.com
83f121f253 机构业绩默认排序方式 2020-08-04 19:21:47 +08:00
mengxiaolong
7280cb48e7 Merge branch 'hotfix/0804前端页面增加国籍' into release/0803 2020-08-04 17:00:06 +08:00
mengxiaolong
5342e5ffdc 删除多余逗号 2020-08-04 16:26:49 +08:00
na.guo
133d2e6861 样式修改 2020-08-04 16:22:44 +08:00