Commit Graph

6420 Commits

Author SHA1 Message Date
mengxiaolong
dbb4fce78d 保险名称修改 2020-11-30 16:56:36 +08:00
mengxiaolong
5cb3a81084 Merge branch 'hotfix/鑫享两全寿险' into dev 2020-11-30 16:37:29 +08:00
mengxiaolong
df1547737d 国富人寿国富鑫享两全保险 2020-11-30 16:37:14 +08:00
mengxiaolong
401c5a55d0 Merge branch 'feature/开门红' into dev 2020-11-30 15:48:09 +08:00
mengxiaolong
9861b29aef fix: 个险业绩修改点
1. 外勤排名+姓名两栏固定;机构排名+机构固定
2020-11-30 15:47:50 +08:00
mengxiaolong
87cbb3c17c Merge branch 'hotfix/数据报表在企业微信无法打开问题' into dev
# Conflicts:
#	src/assets/js/utils/request.js
2020-11-30 14:32:05 +08:00
mengxiaolong
efefc05c4e 业绩报表企业微信无法打开问题修改 2020-11-30 14:31:16 +08:00
mengxiaolong
28b4ce6d35 Merge branch 'hotfix/数据报表在企业微信无法打开问题' into dev
# Conflicts:
#	src/assets/js/utils/request.js
#	src/views/ebiz/manpower/Training.vue
#	src/views/ebiz/sale/InsuredPerson.vue
2020-11-30 14:09:22 +08:00
mengxiaolong
a36357f1bf 代码格式化 2020-11-30 14:03:55 +08:00
yang.huaxiang
b08817941f Merge branch 'feature/GFRS-2015【待确定】开门红需求-电投改造' into dev 2020-11-30 13:23:58 +08:00
yang.huaxiang
bcf1a5fd2f 开门红需求-电投提示:保单生效日调整 --提交人:阳华祥 2020-11-30 13:21:24 +08:00
mengxiaolong
418c672397 Merge branch 'feature/GFRS-2065【1125】惠桂保数据导入' into dev 2020-11-30 09:24:50 +08:00
mengxiaolong
40c5068897 fix: 惠桂保数据查询
1. 分页时搜索条件失效问题修改
2020-11-30 09:24:25 +08:00
yang.huaxiang
c2d6a159e7 hotfix:内外勤判断调整 --提交人:阳华祥 2020-11-27 11:22:49 +08:00
yang.huaxiang
e28aa13d3e hotfix:内外勤判断调整 --提交人:阳华祥 2020-11-27 10:59:00 +08:00
mengxiaolong
7f8c1da9d5 Merge branch 'feature/GFRS-2065【1125】惠桂保数据导入' into dev 2020-11-27 10:24:03 +08:00
mengxiaolong
fa29d082c2 style: 惠桂保数据查询
1. 样式调整
2020-11-27 10:23:28 +08:00
yang.huaxiang
bf07725b64 Merge branch 'feature/GFRS-2015【待确定】开门红需求' into dev 2020-11-26 13:44:00 +08:00
yang.huaxiang
9ab8853fe9 开门红:微信头像生成页面样式调整 --提交人:阳华祥 2020-11-26 13:43:00 +08:00
mengxiaolong
237de4aec5 Merge branch 'feature/GFRS-2065【1125】惠桂保数据导入' into dev 2020-11-26 11:09:02 +08:00
mengxiaolong
290651af10 feature: 惠桂保数据查询
1. 增加刷新功能
2020-11-26 11:08:24 +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
a41ddb370e Merge branch 'feature/开门红' into dev 2020-11-25 19:33:15 +08:00
mengxiaolong
1a1e9e17ea 机构业绩排名样式调整 2020-11-25 19:32:56 +08:00
mengxiaolong
d4f83d82d1 Merge branch 'feature/开门红' into dev 2020-11-25 17:57:39 +08:00
mengxiaolong
a5ab4417ee 修改表格数据加载完成标识 2020-11-25 17:57:22 +08:00
yang.huaxiang
aa0b3e2c38 Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into release/20201126 2020-11-25 17:28:41 +08:00
yang.huaxiang
d754af6f7c Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev
# Conflicts:
#	src/assets/js/utils/request.js
2020-11-25 17:27:36 +08:00
yang.huaxiang
6c19829584 安全性问题处理:localStorage token存储异常处理 --提交人:阳华祥 2020-11-25 17:09:35 +08:00
mengxiaolong
62ed26f424 Merge branch 'feature/开门红' into dev
# Conflicts:
#	src/assets/js/utils/request.js
2020-11-25 16:51:12 +08:00
mengxiaolong
75da345127 顺序发送接口 2020-11-25 16:49:22 +08:00
mengxiaolong
f6cbfc5a64 Merge branch 'feature/开门红' into dev
# Conflicts:
#	src/assets/js/utils/request.js
2020-11-25 16:20:54 +08:00
mengxiaolong
fe34d439ed 打印token 2020-11-25 16:13:02 +08:00
yang.huaxiang
e2866932b6 Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into release/20201126 2020-11-25 13:44:05 +08:00
mengxiaolong
be1c9bf7c9 feature: 惠桂保数据查询
1. 调试数据查询接口
2. 增加分页, 筛选功能
2020-11-25 13:43:54 +08:00
yang.huaxiang
d27478ddb9 代码合并问题处理 --提交人:阳华祥 2020-11-25 13:42:19 +08:00
yang.huaxiang
64f789b0e8 Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev
# Conflicts:
#	src/assets/js/utils/request.js
2020-11-25 13:41:24 +08:00
yang.huaxiang
26de917fd4 安全性问题处理:生产请求接口加密配置(接口地址调整为api/v2) --提交人:阳华祥 2020-11-25 13:35:44 +08:00
yang.huaxiang
d41c6ba236 安全性问题处理:前端请求报文打印处理(去除请求、响应报文打印) --提交人:阳华祥 2020-11-25 13:34:19 +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
7c096f283e feature: 惠桂保
1. 增加惠桂保路由, 页面
2020-11-24 18:14:10 +08:00
mengxiaolong
53a99add0d Merge branch 'feature/开门红' into dev 2020-11-24 17:52:55 +08:00
mengxiaolong
66b1b9685a fix: 开门红业绩查询
1. 外勤默认tab栏切换
2020-11-24 17:52:24 +08:00
mengxiaolong
fb5826408a Merge branch 'feature/开门红' into dev 2020-11-24 16:55:27 +08:00
mengxiaolong
0bc6f1f952 feature: 开门红业绩查询
1. 增加内外勤权限控制
2020-11-24 16:53:57 +08:00
mengxiaolong
f6c4f092f1 Merge branch 'feature/开门红' into dev 2020-11-24 10:33:44 +08:00
mengxiaolong
d82fece5b6 feature: 开门红
1. 开门红业绩查询日期筛选无法关闭问题修改
2. 添加注释
2020-11-24 10:33:21 +08:00
mengxiaolong
67305d6fc1 Merge branch 'feature/开门红首页业绩表格' into feature/开门红 2020-11-24 09:36:33 +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