Commit Graph

242 Commits

Author SHA1 Message Date
mengxiaolong
db4abed07f Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev 2021-01-06 18:19:15 +08:00
yang.huaxiang
266533ff4d 培训系统优化: 对接中转页面代码初始版本提交 --提交人:阳华祥 2021-01-04 15:49:48 +08:00
mengxiaolong
65c0c16eff Merge branch 'hotfix/修改国籍编码使用字符串比较问题' into dev
# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/assets/js/utils/request.js
#	src/router/ebiz/index.js
#	src/views/ebiz/sale/List.vue
2020-12-16 15:58:33 +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
fc55ba28da Merge branch 'feature/GFRS-2069【待确定】白名单管理' into dev
# Conflicts:
#	src/assets/js/utils/request.js
#	src/views/ebiz/agentEenter/SignContract.vue
#	src/views/ebiz/sale/SignatureConfirmation.vue
2020-12-08 10:49:20 +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
yang.huaxiang
f8f9191f7a Merge branch 'hotfix/前端优化处理' into dev 2020-12-03 15:39:48 +08:00
yang.huaxiang
20e20b1a0f 上传文件调整:接口超时处理调整未30秒 --提交人:阳华祥 2020-12-03 13:09:44 +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
45e3cbe962 Merge branch 'feature/开门红' into dev 2020-11-30 18:33:40 +08:00
mengxiaolong
ec4fd36257 开门红方案 2020-11-30 18:32:43 +08:00
mengxiaolong
75c27e4bba Merge branch 'feature/GFRS-2065【1125】惠桂保数据导入' into dev
# Conflicts:
#	src/assets/js/utils/request.js
#	src/router/ebiz/index.js
2020-11-26 10:22:54 +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
5248771070 Merge branch 'feature/开门红业绩查询' into dev
# Conflicts:
#	src/api/ebiz/goodStart/index.js
2020-11-23 17:19:57 +08:00
mengxiaolong
282bad87c4 feature: 开门红业绩排名
1. 调试业绩排名查询接口
2020-11-23 17:18:41 +08:00
yang.huaxiang
d6159901e9 Merge branch 'feature/万福卡产品开发' into dev 2020-11-23 13:27:47 +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
1a6112d5c0 接口地址修改 2020-11-18 14:07:20 +08:00
mengxiaolong
89591b7b80 Merge branch 'feature/开门红专区' into dev 2020-11-18 14:05:53 +08:00
mengxiaolong
dc48b76c3b 接口地址修改 2020-11-18 14:05:34 +08:00
mengxiaolong
4d1e46af1f Merge branch 'feature/开门红专区' into dev
# Conflicts:
#	src/api/ebiz/goodStart/index.js
2020-11-18 13:53:43 +08:00
mengxiaolong
7a6f00ee25 fix: 冲突掉的代码恢复 2020-11-18 13:52:43 +08:00
mengxiaolong
61ff45d22c Merge branch 'feature/开门红专区' into dev 2020-11-18 13:37:11 +08:00
mengxiaolong
017b0ba270 fix: 开门红专区
1. 删除重复定义的变量
2020-11-17 17:07:07 +08:00
mengxiaolong
6428b3d8ff Merge branch 'feature/开门红专区' into dev 2020-11-16 18:41:09 +08:00
mengxiaolong
08bf66ed9c 百宝箱查询菜单接口 2020-11-16 18:39:44 +08:00
mengxiaolong
f63df3ab55 百宝箱菜单修改 2020-11-16 18:29:10 +08:00
mengxiaolong
6d3ef33c97 Merge branch 'feature/开门红业绩查询' into dev
# Conflicts:
#	src/router/ebiz/goodStart.js
#	src/router/ebiz/index.js
2020-11-16 14:49:47 +08:00
yang.huaxiang
98eb154615 Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev 2020-11-14 16:34:14 +08:00
yang.huaxiang
b80fec5132 安全性问题处理:添加页面访问校验初版代码 --提交人:阳华祥 2020-11-14 16:33:54 +08:00
yang.huaxiang
44d2efc749 Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev
# Conflicts:
#	src/assets/js/utils/request.js
#	src/views/ebiz/manpower/Training.vue
#	src/views/ebiz/sale/List.vue
2020-11-14 15:39:49 +08:00
yang.huaxiang
15f831700c 安全性问题处理:添加页面访问校验初版代码 --提交人:阳华祥 2020-11-13 17:42:33 +08:00
yang.huaxiang
1dbd6c54d1 Merge branch 'feature/GFRS-2015【待确定】开门红需求-电投改造' into dev
# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/views/ebiz/common/CalculatePremium.vue
2020-11-13 11:34:04 +08:00
mengxiaolong
4c5ef0c1fa Merge branch 'feature/入司优化' into dev
# Conflicts:
#	src/components/ebiz/account/SelectBankName.vue
2020-11-12 19:11:11 +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
6074e3ba55 Merge branch 'feature/GFRS-2015【待确定】开门红需求' into dev
# Conflicts:
#	src/api/ebiz/my/my.js
#	src/router/ebiz/my.js
2020-11-09 09:45:49 +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
835b506d3b Merge branch 'feature/GFRS-1989【待确定】客户核验流程优化' into dev 2020-11-06 09:54:51 +08:00
yang.huaxiang
28c8944a1f GFRS-1989【待确定】客户核验流程优化: rid 状态保存 --提交人:阳华祥 2020-11-05 14:45:05 +08:00