Commit Graph

6308 Commits

Author SHA1 Message Date
阳华祥
184311e9ee Merge remote-tracking branch 'origin/feature/GFRS-1215【待确定】国富人寿福享年年年金保险' into release/0811
# Conflicts:
#	src/views/ebiz/common/MainRiskList.vue
2020-08-11 21:55:19 +08:00
阳华祥
cc7937dd94 入司优化:入司问题处理 --提交人:阳华祥 2020-08-11 21:52:53 +08:00
na.guo
44ed0fe68b Merge branch 'feature/【机构人力排名】' into release/0811 2020-08-11 18:11:51 +08:00
na.guo
496fb329e3 Merge remote-tracking branch 'remotes/origin/feature/【机构人力排名】' into dev 2020-08-11 18:09:45 +08:00
na.guo
44b87a6acc 承保标保统计修改 2020-08-11 18:08:46 +08:00
阳华祥
1bb7b4a711 Merge remote-tracking branch 'origin/hotfix/电投-投保人验证修改' into release/0811 2020-08-11 16:35:45 +08:00
na.guo
d88244cd70 测试 2020-08-11 15:54:59 +08:00
阳华祥
970306780b 入司优化:合并问题处理 --提交人:阳华祥 2020-08-11 14:10:11 +08:00
阳华祥
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
na.guo
1f33590c9a Merge branch 'feature/入司新增银行' into dev 2020-08-11 13:44:38 +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
na.guo
e686a54a65 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-08-11 13:28:42 +08:00
na.guo
af16b19942 Merge branch 'feature/入司新增银行' into dev 2020-08-11 13:28:21 +08:00
na.guo
f87aade2a7 反显修改 2020-08-11 13:26:52 +08:00
mengxiaolong
c345d532a2 Merge branch 'feature/GFRS-1844【待确定】业绩快报中介渠道增加险种名称' into dev 2020-08-11 13:04:33 +08:00
mengxiaolong
ddd5af0906 样式调整 2020-08-11 13:04:07 +08:00
mengxiaolong
6706f66058 Merge branch 'feature/GFRS-1844【待确定】业绩快报中介渠道增加险种名称' into dev 2020-08-11 11:54:06 +08:00
mengxiaolong
09e3d2295c 样式调整 2020-08-11 11:53:34 +08:00
mengxiaolong
da12c41ffc Merge branch 'feature/GFRS-1844【待确定】业绩快报中介渠道增加险种名称' into dev 2020-08-11 11:43:14 +08:00
mengxiaolong
786e0087e8 样式调整 2020-08-11 11:34:30 +08:00
na.guo
fd66676bff Merge branch 'feature/【机构人力排名】' into dev 2020-08-11 11:30:04 +08:00
na.guo
cad3ac4c6b 保留小数 2020-08-11 11:28:28 +08:00
na.guo
ee8f84733f Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-08-11 11:22:26 +08:00
na.guo
ff93b118cb Merge branch 'feature/【机构人力排名】' into dev 2020-08-11 11:22:01 +08:00
na.guo
f629db838e 保留两位小数 2020-08-11 11:20:58 +08:00
mengxiaolong
6cded6d739 Merge branch 'feature/GFRS-1844【待确定】业绩快报中介渠道增加险种名称' into dev 2020-08-11 11:14:02 +08:00
mengxiaolong
f572342b88 样式调整 2020-08-11 11:13:44 +08:00
mengxiaolong
de1fcb314e Merge branch 'feature/GFRS-1844【待确定】业绩快报中介渠道增加险种名称' into dev 2020-08-11 10:53:58 +08:00
mengxiaolong
4e681d8aca 样式调整 2020-08-11 10:53:31 +08:00
mengxiaolong
e86a7e41aa Merge branch 'feature/GFRS-1844【待确定】业绩快报中介渠道增加险种名称' into dev 2020-08-11 10:38:24 +08:00
mengxiaolong
c687c98e11 业绩快报样式调整 2020-08-11 10:37:51 +08:00
na.guo
7a5cc7d380 选择银行组件添加 2020-08-11 10:18:02 +08:00
mengxiaolong
b7f11ecac0 Merge branch 'feature/GFRS-1844【待确定】业绩快报中介渠道增加险种名称' into dev
# Conflicts:
#	src/views/ebiz/report/reportDetail.vue
2020-08-11 10:16:37 +08:00
mengxiaolong
ebfe962ebe 业绩快报添加险种名称列 2020-08-11 10:14:51 +08:00
na.guo
056eb4aee8 Merge branch 'feature/增加主险' into dev 2020-08-10 18:06:39 +08:00
na.guo
35864ce312 添加多主险条件 2020-08-10 18:05:43 +08:00
na.guo
e28e46f717 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-08-10 17:08:53 +08:00
na.guo
36fb18dbf1 Merge branch 'hotfix/电投-投保人验证修改' into dev 2020-08-10 17:08:17 +08:00
na.guo
5abc97848c 被保人证件验证修改 2020-08-10 17:06:27 +08:00
mengxiaolong
94aa65ed16 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-10 16:50:19 +08:00
mengxiaolong
a7dd60e43a 禁止结果页滑屏后退 2020-08-10 16:47:38 +08:00
na.guo
5146499801 Merge branch 'hotfix/电投-投保人验证修改' into dev 2020-08-10 16:15:02 +08:00
na.guo
7efd246bd6 港澳台居民居住证验证修改 2020-08-10 16:14:00 +08:00
na.guo
eefc1befa8 Merge branch 'feature/【机构人力排名】' into dev 2020-08-10 15:55:40 +08:00
na.guo
8ff1e60ec8 去掉预收标保 2020-08-10 15:53:41 +08:00
na.guo
f4797300d8 返回刷新修改 2020-08-10 15:35:30 +08:00