Commit Graph

161 Commits

Author SHA1 Message Date
mengxiaolong
43b8bac30a Merge branch 'feature/GFRS-2069【待确定】白名单管理' into release/20210113-test
# Conflicts:
#	src/assets/js/utils/request.js
#	src/views/ebiz/sale/SignatureConfirmation.vue
2021-01-13 18:21:38 +08:00
yang.huaxiang
062ced240c Merge branch 'feature/GFRS-1989【待确定】客户核验流程优化' into release/20210105
# Conflicts:
#	package.json
#	src/api/ebiz/sale/sale.js
#	src/assets/js/utils/cacheUtils.js
#	src/assets/js/utils/cryptoJsUtil.js
#	src/assets/js/utils/needCacheKey.js
#	src/config/index.js
#	src/main.js
2021-01-06 11:46:18 +08:00
yang.huaxiang
b31e7182f0 Merge branch 'feature/GFRS-2015【待确定】开门红需求-电投改造' into release/20201210 2020-12-10 10:17:26 +08:00
yang.huaxiang
474689bdd2 Merge branch 'feature/GFRS-2015【待确定】开门红需求' into release/20201210
# Conflicts:
#	src/api/ebiz/my/my.js
#	src/router/ebiz/my.js
2020-12-10 10:16:53 +08:00
mengxiaolong
150e3d00d7 Merge branch 'feature/开门红' into release/20201210
# Conflicts:
#	src/router/ebiz/index.js
2020-12-10 09:10:15 +08:00
mengxiaolong
5ce023f3c8 feature: 白名单管理
1. 自助入司白名单校验
2020-12-07 18:24:19 +08:00
mengxiaolong
a17b67f607 Merge branch 'feature/GFRS-2065【1125】惠桂保数据导入' into release/1203 2020-12-03 18:21:28 +08:00
mengxiaolong
87e7ad59f2 Merge branch 'feature/增加机构名称简称' into feature/开门红
# Conflicts:
#	src/assets/js/utils/request.js
2020-12-03 11:37:02 +08:00
mengxiaolong
ec4fd36257 开门红方案 2020-11-30 18:32:43 +08:00
mengxiaolong
73c9d0d5fb feature: 惠桂保数据查询
1. 调试数据查询接口
2. 调试详情信息接口
2020-11-26 10:18:56 +08:00
mengxiaolong
be1c9bf7c9 feature: 惠桂保数据查询
1. 调试数据查询接口
2. 增加分页, 筛选功能
2020-11-25 13:43:54 +08:00
yang.huaxiang
dcdf7dd7dc Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into release/20201126
# Conflicts:
#	src/views/ebiz/manpower/Training.vue
#	src/views/ebiz/sale/AccountInformation.vue
#	src/views/ebiz/sale/AddBeneficiaryInfo.vue
#	src/views/ebiz/sale/InsuredPerson.vue
2020-11-25 13:13:45 +08:00
mengxiaolong
d09cc10ca5 Merge branch 'feature/开门红业绩查询' into feature/开门红
# Conflicts:
#	src/api/ebiz/goodStart/index.js
#	src/router/ebiz/goodStart.js
2020-11-24 09:36:10 +08:00
mengxiaolong
75c706e17e Merge branch 'feature/开门红专区' into feature/开门红 2020-11-24 09:32:05 +08:00
mengxiaolong
282bad87c4 feature: 开门红业绩排名
1. 调试业绩排名查询接口
2020-11-23 17:18:41 +08:00
yang.huaxiang
8b48a2eec8 万福卡卡单开发调整:列表查询接口调整 --提交人:阳华祥 2020-11-23 13:26:03 +08:00
mengxiaolong
f3e6458094 Merge branch 'feature/入司优化' into release/1119
# Conflicts:
#	src/components/ebiz/account/SelectBankName.vue
#	src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
#	src/views/ebiz/agentEenter/js/bankList.js
2020-11-19 10:26:59 +08:00
mengxiaolong
dc48b76c3b 接口地址修改 2020-11-18 14:05:34 +08:00
mengxiaolong
7a6f00ee25 fix: 冲突掉的代码恢复 2020-11-18 13:52:43 +08:00
mengxiaolong
017b0ba270 fix: 开门红专区
1. 删除重复定义的变量
2020-11-17 17:07:07 +08:00
mengxiaolong
08bf66ed9c 百宝箱查询菜单接口 2020-11-16 18:39:44 +08:00
mengxiaolong
f63df3ab55 百宝箱菜单修改 2020-11-16 18:29:10 +08:00
yang.huaxiang
b80fec5132 安全性问题处理:添加页面访问校验初版代码 --提交人:阳华祥 2020-11-14 16:33:54 +08:00
yang.huaxiang
15f831700c 安全性问题处理:添加页面访问校验初版代码 --提交人:阳华祥 2020-11-13 17:42:33 +08:00
mengxiaolong
f0cff23cad 增加联行号查询接口 2020-11-12 19:10:00 +08:00
mengxiaolong
aca0cc5bd8 添加开门红业绩报表页面 2020-11-11 19:07:09 +08:00
yang.huaxiang
ed7d5575ef 开门红需求-电投提示:电投提示处理初版代码提交 --提交人:阳华祥 2020-11-11 10:46:50 +08:00
yang.huaxiang
60323198b8 开门红:微信头像生成 --提交人:阳华祥 2020-11-06 16:03:45 +08:00
mengxiaolong
a3d54a4020 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into release/1106
# Conflicts:
#	src/router/ebiz/index.js
#	src/views/ebiz/sale/Detail.vue
2020-11-06 13:22:20 +08:00
yang.huaxiang
28c8944a1f GFRS-1989【待确定】客户核验流程优化: rid 状态保存 --提交人:阳华祥 2020-11-05 14:45:05 +08:00
mengxiaolong
8478512bf5 执业证list维护, 人管岗显示执业证维护按钮,是否二次入司字段处理 2020-10-27 13:06:34 +08:00
yang.huaxiang
43117c24a9 安全性问题处理:代码版本整理 修复版本1 --提交人:阳华祥 2020-10-27 11:05:01 +08:00
yang.huaxiang
b913e73c47 安全性问题处理:代码版本整理 初始版本1 --提交人:阳华祥 2020-10-27 10:50:12 +08:00
mengxiaolong
d5dc2b4b5f Merge branch 'hotfix/签名bug修改' into release/1012 2020-10-12 16:09:48 +08:00
mengxiaolong
0bf49d8297 Merge branch 'feature/GFRS-1858-【人核保单支持线上支付】' into release/1012 2020-10-12 15:14:54 +08:00
mengxiaolong
b2efb32955 撤销申请, 执业证信息维护 2020-10-09 15:37:36 +08:00
mengxiaolong
9a9eb931f9 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into release/0911上线测试(贺报,续期)
# Conflicts:
#	.gitignore
#	src/assets/js/utils/request.js
#	src/config/urlMap.js
#	src/router/ebiz/index.js
#	src/store/index.js
#	src/views/app/Home.vue
2020-09-10 14:10:34 +08:00
mengxiaolong
8dda53db16 Merge branch 'feature/GFRS-453【】贺报功能' into release/0911上线测试(贺报,续期)
# Conflicts:
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
2020-09-10 13:37:59 +08:00
na.guo
01bb881388 页面修改 2020-09-01 18:42:38 +08:00
na.guo
d4df11f51a 去掉多余路由 2020-09-01 11:21:40 +08:00
mengxiaolong
dd9184b4a8 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-222【0423】续期管理-续期列表 2020-09-01 10:59:13 +08:00
mengxiaolong
21bb29d65d 续期管理优化 2020-09-01 10:58:58 +08:00
na.guo
d949ccfbbf 添加页面 2020-09-01 10:53:36 +08:00
mengxiaolong
9e402c5a3b Merge branch 'feature/GFRS-1742【待确定】收入改造' into release/0827 2020-08-27 17:08:51 +08:00
mengxiaolong
51d5622437 Merge branch 'feature/【保全】' into release/0827
# Conflicts:
#	src/store/index.js
#	src/views/app/Home.vue
2020-08-26 16:33:57 +08:00
na.guo
cc1e093086 添加判断可支付接口 2020-08-14 13:26:31 +08:00
na.guo
1bd124eade pdf加载测试 2020-08-13 15:40:44 +08:00
mengxiaolong
1843b96a2a 样式,接口修改 2020-08-12 16:31:28 +08:00
mengxiaolong
4942b0f8d2 修改页面样式, 调试接口 2020-08-12 14:59:00 +08:00
阳华祥
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