Commit Graph

1063 Commits

Author SHA1 Message Date
lbw
2be10fe044 feat: 水印自动包含当前用户名 2023-03-08 12:24:38 +08:00
aeizzz
7e4085ca58 🐛 Fixing a bug. 修改基本信息维护编辑报错,修改第三方账号解绑失败时没有提示,增加登录回车调用事件 2023-03-08 12:22:58 +08:00
aeizzz
46c6d2d676 Introducing new features. 完善i18n 异步加载的问题 2023-03-08 12:05:31 +08:00
lbw
1b902e65b1 fix: 系统管理 终端管理 增删改查 无法编辑,callback 事件没有 2023-03-08 11:33:46 +08:00
lbw
4c153fc70d bug: fix 注册失败问题 2023-03-07 23:05:24 +08:00
lbw
af6504007a Merge remote-tracking branch 'origin/hui_dev' into leng_dev
# Conflicts:
#	src/components/Upload/index.vue
#	src/views/admin/user/index.vue
2023-03-07 22:47:31 +08:00
lbw
621057a2d7 🐛 Fixing a bug. 登录失败错误信息提示 2023-03-07 22:46:34 +08:00
32189
7622aac202 🎉导入组件国际化 2023-03-07 17:39:02 +08:00
lbw
88f5889de4 ref: 国际化处理 2023-03-07 15:43:40 +08:00
32189
32075d0cf2 🎉国际化增加缓存接口 2023-03-07 15:13:49 +08:00
32189
0f50f2697c 🎉角色和菜单 固定列 2023-03-07 14:58:12 +08:00
lbw
0e0f5bfb68 Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-07 14:45:39 +08:00
aeizzz
23fb2fbac1 Introducing new features. 增加密码强度组件 2023-03-07 14:40:51 +08:00
lbw
49259fe57e Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-07 14:39:15 +08:00
lbw
4cadfd2029 feat: 优化前端样式 2023-03-07 14:14:13 +08:00
lbw
71b5086840 Merge remote-tracking branch 'origin/hui_dev' into leng_dev 2023-03-07 13:43:34 +08:00
aeizzz
37fd47d376 Introducing new features. 增加微信用户拉黑功能 2023-03-07 10:35:54 +08:00
lbw
cf40307847 fix: Local.getTenant 2023-03-07 10:22:31 +08:00
lbw
36b41392b5 Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-07 09:48:38 +08:00
lbw
4ffa036ebc ref: 优化Local 类导入 2023-03-07 09:46:17 +08:00
aeizzz
4e14df7237 Introducing new features. 【日志管理】 增加抽屉模板 展示全部信息信息 2023-03-07 09:42:08 +08:00
32189
ab17c9313b 🎉字典导出 2023-03-07 09:32:11 +08:00
aeizzz
26f1be2afc Introducing new features. 三方绑定移动到安全分组、增加解绑功能 2023-03-07 09:26:01 +08:00
lbw
fde413f0e8 feat: 优化获取当前令牌、当前租户的工具类 2023-03-07 09:25:59 +08:00
lbw
4b841f9b21 bug: 代办任务流程图不显示bug修复 2023-03-07 09:19:58 +08:00
lbw
2cbfa8506a Merge remote-tracking branch 'origin/hui_dev' into leng_dev 2023-03-07 09:18:46 +08:00
32189
f470f4c09d 🎉各个管理导出功能修复 2023-03-07 08:56:38 +08:00
lbw
a210488286 ref: 重构首页看板 2023-03-06 22:51:17 +08:00
lbw
99b5437d25 ref: 重构日程 2023-03-06 21:44:34 +08:00
lbw
57e454476e Merge remote-tracking branch 'origin/hui_dev' into leng_dev 2023-03-06 19:30:34 +08:00
lbw
c147454060 Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-06 19:30:29 +08:00
aeizzz
4b4751fc08 Introducing new features. 首页面板, schedule 2023-03-06 18:12:40 +08:00
lbw
c38a713bf7 ref: 前端样式调整 2023-03-06 17:29:06 +08:00
32189
15872532b4 🎉【终端管理】 校验规则编号:不为空, 小写、不能重复,
【quartz管理】 导出接口开发
2023-03-06 16:09:00 +08:00
32189
b41e7f1857 🎉app国际化 2023-03-06 14:35:17 +08:00
lbw
bf2f6b7917 Merge remote-tracking branch 'origin/lei_dev' into leng_dev
# Conflicts:
#	src/views/admin/user/index.vue
#	src/views/oa/leave_bill/index.vue
2023-03-06 14:13:06 +08:00
aeizzz
ce748fcfff Introducing new features. 首页面板 2023-03-06 14:10:36 +08:00
32189
54d455fb3e 🎉 2023-03-06 13:48:00 +08:00
aeizzz
b2a432cb3a Introducing new features. 首页面板 2023-03-06 13:46:42 +08:00
32189
e82cb95484 🎉 代办任务删除 2023-03-06 13:37:01 +08:00
32189
d4b968fc82 Merge remote-tracking branch 'origin/leng_dev' into hui_dev
# Conflicts:
#	src/views/oa/leave_bill/form.vue
#	src/views/oa/model/form.vue
#	src/views/oa/task/form.vue
#	src/views/oa/task/i18n/en.ts
#	src/views/oa/task/i18n/zh-cn.ts
#	src/views/oa/task/index.vue
2023-03-06 13:18:22 +08:00
32189
33aabdf701 🎉 代办任务删除,请假工单导出 2023-03-06 13:12:01 +08:00
lbw
38a38e546f fix: 【登录没有权限】 没有提示,且console 报错 2023-03-06 12:45:43 +08:00
aeizzz
25783fbb65 Introducing new features. 用户管理增加没有权限时的提示 2023-03-06 11:07:10 +08:00
lbw
7a29c1931f Merge remote-tracking branch 'origin/hui_dev' into leng_dev
# Conflicts:
#	src/api/oa/leave-bill.ts
#	src/api/oa/process.ts
#	src/views/admin/user/index.vue
#	src/views/oa/leave_bill/index.vue
#	src/views/oa/model/index.vue
#	src/views/oa/process/index.vue
2023-03-06 10:46:15 +08:00
aeizzz
749fa4347e Merge remote-tracking branch 'origin/hui_dev' into lei_dev
# Conflicts:
#	src/api/oa/leave-bill.ts
#	src/api/oa/process.ts
#	src/views/admin/user/index.vue
#	src/views/oa/leave_bill/index.vue
#	src/views/oa/model/index.vue
#	src/views/oa/process/index.vue
2023-03-06 10:45:00 +08:00
aeizzz
bb001b05a3 Merge remote-tracking branch 'origin/leng_dev' into lei_dev 2023-03-06 10:44:21 +08:00
lbw
4c4b6058c4 Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-06 10:43:19 +08:00
32189
788be16121 🎉 用户查询取消条件creat——time 2023-03-06 10:03:35 +08:00
32189
787bdf05ec 🎉 前端修改 2023-03-06 08:26:40 +08:00