Commit Graph

6420 Commits

Author SHA1 Message Date
mengxiaolong
443ec2bf36 Merge branch 'feature/开门红' into dev 2020-12-03 13:50:10 +08:00
mengxiaolong
9c060cf3a4 机构名称简称字段修改 2020-12-03 13:49:58 +08:00
mengxiaolong
6263279bf6 Merge branch 'feature/开门红' into dev 2020-12-03 13:24:10 +08:00
mengxiaolong
3408f309e5 loading样式居中 2020-12-03 13:23:58 +08:00
yang.huaxiang
20e20b1a0f 上传文件调整:接口超时处理调整未30秒 --提交人:阳华祥 2020-12-03 13:09:44 +08:00
mengxiaolong
3e7d81805b Merge branch 'feature/开门红' into dev 2020-12-03 11:37:21 +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
eb33587e21 Merge branch 'feature/个险业绩排行优化' into dev 2020-12-03 11:05:36 +08:00
mengxiaolong
b61f08c44d 机构名称简称修改 2020-12-03 11:05:17 +08:00
mengxiaolong
29276b887e Merge branch 'feature/增加机构名称简称' into feature/个险业绩排行优化
# Conflicts:
#	src/views/ebiz/institutionalPerform/UnderOffice.vue
2020-12-03 11:03:04 +08:00
mengxiaolong
58a542b8b9 增加机构名称简称js 2020-12-03 11:00:34 +08:00
mengxiaolong
b638fc460b Merge branch 'feature/开门红' into dev 2020-12-03 09:29:32 +08:00
mengxiaolong
ed257c61ed 开门红方案分页 2020-12-03 09:29:09 +08:00
mengxiaolong
692edc499f Merge branch 'feature/GFRS-2065【1125】惠桂保数据导入' into dev 2020-12-02 17:19:26 +08:00
mengxiaolong
7e23b93cf6 增加agentIdNo字段 2020-12-02 17:19:02 +08:00
mengxiaolong
29abd491ef Merge branch 'feature/开门红' into dev 2020-12-02 17:09:23 +08:00
mengxiaolong
11043623b5 开门红方案分页 2020-12-02 17:08:51 +08:00
mengxiaolong
504b2320ad 开门红方案分享图片 2020-12-02 16:19:11 +08:00
mengxiaolong
241e53e7c7 Merge branch 'feature/开门红' into dev 2020-12-02 16:07:50 +08:00
mengxiaolong
4253c2e7ff 生成图片base64 2020-12-02 16:07:23 +08:00
mengxiaolong
7962b9c1be Merge branch 'feature/开门红' into dev 2020-12-02 15:58:26 +08:00
mengxiaolong
346f7b4a07 开门红图片分享功能 2020-12-02 15:57:59 +08:00
mengxiaolong
4e33fe260a Merge branch 'feature/开门红' into dev 2020-12-02 14:20:39 +08:00
mengxiaolong
d0715e3c73 Merge branch 'feature/个险业绩排行优化' into dev 2020-12-02 14:20:26 +08:00
mengxiaolong
65bd7e067a 固定机构名称列 2020-12-02 14:19:43 +08:00
mengxiaolong
26ad646d17 固定机构名称列 2020-12-02 14:16:23 +08:00
mengxiaolong
b56166bd51 Merge branch 'feature/开门红' into dev 2020-12-02 14:00:25 +08:00
mengxiaolong
1ea7872bb9 固定机构名称列 2020-12-02 13:58:51 +08:00
mengxiaolong
b1797d7e48 Merge branch 'feature/GFRS-2065【1125】惠桂保数据导入' into dev 2020-12-02 09:56:48 +08:00
mengxiaolong
e2d46c2921 样式调整 2020-12-02 09:56:37 +08:00
mengxiaolong
f0972cc9cf Merge branch 'hotfix/机构业绩日期无法选择将来问题修改' into release/1201 2020-12-01 17:46:20 +08:00
mengxiaolong
c365c1c223 Merge branch 'hotfix/数据报表在企业微信无法打开问题' into release/1201 2020-12-01 17:46:08 +08:00
mengxiaolong
06e27bc3ca 机构业绩时间无法选择将来问题修改 2020-12-01 17:44:19 +08:00
mengxiaolong
8395f3d2a9 Merge branch 'feature/个险业绩排行优化' into dev 2020-12-01 15:49:37 +08:00
mengxiaolong
52feefb9e5 侧边栏展开收起时修改标题 2020-12-01 15:49:09 +08:00
mengxiaolong
a80876c244 Merge branch 'feature/开门红' into dev 2020-12-01 15:22:26 +08:00
mengxiaolong
2c3ec57c14 开门红业绩排行
1. 判断内外勤规则修改
2. 查询机构接口参数修改
2020-12-01 15:22:09 +08:00
mengxiaolong
603e98f4ff Merge branch 'feature/个险业绩排行优化' into dev 2020-12-01 13:50:16 +08:00
mengxiaolong
ebd7f53b8f 查询机构接口增加参数 2020-12-01 13:49:54 +08:00
mengxiaolong
e348d3678c Merge branch 'feature/开门红' into dev 2020-12-01 11:01:28 +08:00
mengxiaolong
d4f1c39d35 fix: 开门红方案
1. 每行展示三张图片
2020-12-01 11:01:14 +08:00
mengxiaolong
cebd03dc5c Merge branch 'feature/个险业绩排行优化' into dev 2020-12-01 10:07:53 +08:00
mengxiaolong
4bf9993299 fix: 个险业绩排行修改点
1. 标题名称修改
2020-12-01 10:07:19 +08:00
mengxiaolong
283b7c60de Merge branch 'feature/个险业绩排行优化' into dev 2020-12-01 09:48:10 +08:00
mengxiaolong
bd9c3eadc5 fix: 个险业绩排行优化
1. 增加请求错误处理
2020-12-01 09:47:51 +08:00
mengxiaolong
3a091a3f42 Merge branch 'feature/开门红' into dev 2020-12-01 09:37:54 +08:00
mengxiaolong
18f5436dc9 fix: 开门红修改点
1. 开门红专区图片替换
2020-12-01 09:37:33 +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
e5fd1fea84 Merge branch 'hotfix/鑫享两全寿险' into dev 2020-11-30 16:56:59 +08:00