yoe
|
bfa8c814c7
|
Merge branch 'V_1.0.0'
# Conflicts:
# static/config/index-qa.js
# static/config/index-uat.js
# static/config/index.js
|
2020-05-22 17:38:02 +08:00 |
|
yoe
|
3fd829054b
|
update History版本管理
|
2020-05-22 17:36:51 +08:00 |
|
xiongchengqiang
|
ca85e75101
|
feat:添加职业信息的transferType字段;
|
2020-05-22 17:29:15 +08:00 |
|
xiongchengqiang
|
eef022600d
|
style:优化角色管理的已授权菜单;
|
2020-05-22 17:15:44 +08:00 |
|
xiongchengqiang
|
ef2de5a542
|
feat:角色权限管理的授权菜单;
|
2020-05-22 17:00:20 +08:00 |
|
xiongchengqiang
|
1f00d2d554
|
todo:角色权限管理的授权菜单;fix:L修复bug
|
2020-05-22 15:45:49 +08:00 |
|
xiongchengqiang
|
5517ac2694
|
fix:L修复bug
|
2020-05-22 14:12:03 +08:00 |
|
xiongchengqiang
|
c91f67cab9
|
fix:L修复bug
|
2020-05-22 14:04:37 +08:00 |
|
xiongchengqiang
|
708396aae9
|
fix:修复bug
|
2020-05-22 11:21:32 +08:00 |
|
xiongchengqiang
|
c4c357092f
|
fix:修复bug
|
2020-05-22 10:55:03 +08:00 |
|
xiongchengqiang
|
e3fc340d5b
|
style:员工档案的size调整
|
2020-05-22 10:09:44 +08:00 |
|
xiongchengqiang
|
85fb4f3f9d
|
featfeat:修改bug,添加monmentjs处理时间
|
2020-05-22 09:57:26 +08:00 |
|
xiongchengqiang
|
64c19be5e5
|
Merge branch 'V_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into V_1.0.0
|
2020-05-21 18:40:16 +08:00 |
|
xiongchengqiang
|
0f03b3db5f
|
feat:完成员工档案导出
|
2020-05-21 18:39:00 +08:00 |
|
yoe
|
d15ee19390
|
update 增加水印
|
2020-05-21 18:37:15 +08:00 |
|
xiongchengqiang
|
814b3084de
|
export 员工档案
|
2020-05-21 18:17:22 +08:00 |
|
xiongchengqiang
|
055e5f9b0d
|
feat:完成员工管理的导入档案
|
2020-05-21 16:46:18 +08:00 |
|
xiongchengqiang
|
3316cfafdb
|
feat:员工管理上传formdata格式
|
2020-05-21 16:19:46 +08:00 |
|
xiongchengqiang
|
94b4ae2125
|
fix:修复bug
|
2020-05-21 15:42:44 +08:00 |
|
xiongchengqiang
|
3342aac042
|
style:关闭部分consoleLog
|
2020-05-21 14:50:22 +08:00 |
|
xiongchengqiang
|
9adc1a40bf
|
fix:修复bug
|
2020-05-21 14:15:50 +08:00 |
|
xiongchengqiang
|
3e7112f27a
|
fix:修改bug
|
2020-05-21 12:02:49 +08:00 |
|
xiongchengqiang
|
202566144f
|
feat:调试上传文件接口;fix:修复系统管理bug;todo:上传接口暂未调通
|
2020-05-21 10:41:02 +08:00 |
|
xiongchengqiang
|
c737eb8b59
|
fix:修复bug
|
2020-05-21 10:01:26 +08:00 |
|
xiongchengqiang
|
d485b34e27
|
feat:优化登陆页面的校验"
|
2020-05-21 09:11:44 +08:00 |
|
xiongchengqiang
|
6f0ba03418
|
fix:员工概况loading添加
|
2020-05-20 17:01:36 +08:00 |
|
xiongchengqiang
|
7884b74565
|
fix:每个分页的条数改为20
|
2020-05-20 16:24:24 +08:00 |
|
xiongchengqiang
|
66d2716924
|
fix:解决bug
|
2020-05-20 15:57:51 +08:00 |
|
xiongchengqiang
|
063965287b
|
fix :修复部分bug
|
2020-05-20 11:36:39 +08:00 |
|
xiongchengqiang
|
adee607afa
|
feat:修复员工档案 点击左侧 右侧数据动态改变
|
2020-05-20 11:02:06 +08:00 |
|
xiongchengqiang
|
c84f9f19e4
|
feat:完成员工概况模块接口调试
|
2020-05-20 10:56:46 +08:00 |
|
xiongchengqiang
|
d8c0694830
|
fix:修复部分bug
|
2020-05-20 10:27:24 +08:00 |
|
xiongchengqiang
|
6c958c1363
|
feat:员工档案模块的接口调试接口，自测完成；
todo:员工档案带系统测试；员工概况的接口调试；
style:员工管理的代码整合优化；
|
2020-05-19 10:56:37 +08:00 |
|
xiongchengqiang
|
6e078fb38e
|
Merge branch 'V_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into V_1.0.0
|
2020-05-18 18:04:58 +08:00 |
|
xiongchengqiang
|
45456d9958
|
feat:联调完成员工档案接口;todo:员工概况待调试,员工档案查看档案接口数据不全;style:组织管理的代码格式改动;
|
2020-05-18 18:04:30 +08:00 |
|
yoe
|
380588340d
|
update 登录优化
|
2020-05-18 10:54:36 +08:00 |
|
xiongchengqiang
|
88260bc3af
|
feat:添加api接口,模拟员工概况页面
|
2020-05-15 18:03:58 +08:00 |
|
yoe
|
dea0d7bd05
|
update 优化
|
2020-05-14 18:25:01 +08:00 |
|
xiongchengqiang
|
ba4c075553
|
Merge branch 'V_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into V_1.0.0
|
2020-05-14 18:04:04 +08:00 |
|
xiongchengqiang
|
d8f3ff30af
|
feat:api接口添加,布局卡片抽出来,调整字段成接口格式
|
2020-05-14 18:03:48 +08:00 |
|
yoe
|
ec3c469e75
|
update 解决打包问题
|
2020-05-14 15:51:30 +08:00 |
|
yoe
|
430406c66a
|
update echarts.min
|
2020-05-14 11:32:24 +08:00 |
|
yoe
|
64e58ea43c
|
update echarts.min.js
|
2020-05-14 11:05:41 +08:00 |
|
xiongchengqiang
|
fd59958f56
|
zancun
|
2020-05-14 10:01:17 +08:00 |
|
yoe
|
a596df597d
|
update 路由优化
|
2020-05-13 19:02:26 +08:00 |
|
yoe
|
31cf5a4560
|
update 打包
|
2020-05-13 18:32:49 +08:00 |
|
yoe
|
a92c191eb1
|
delete other
|
2020-05-13 18:32:09 +08:00 |
|
xiongchengqiang
|
3ccbdaa691
|
Merge branch 'V_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into V_1.0.0
|
2020-05-13 18:20:15 +08:00 |
|
xiongchengqiang
|
610af5d6f0
|
修改图表代码
|
2020-05-13 18:20:05 +08:00 |
|
yoe
|
a80ef0c3a7
|
update 系统登录优化
|
2020-05-13 17:57:10 +08:00 |
|