Commit Graph

889 Commits

Author SHA1 Message Date
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
lbw
ba619366c4 feat: 一堆功能优化 2023-03-04 22:49:42 +08:00
lbw
d058f62588 🎨 Improving structure / format of the code. 格式化代码 2023-03-04 20:56:15 +08:00
lbw
6564360905 feat: 代码优化 2023-03-04 20:13:48 +08:00
lbw
13497eb635 Merge remote-tracking branch 'origin/hui_dev' into leng_dev 2023-03-04 20:06:08 +08:00
aeizzz
347313feec Merge remote-tracking branch 'origin/leng_dev' into lei_dev
# Conflicts:
#	package.json
2023-03-04 12:42:45 +08:00
32189
86b9a84a09 🎉 模型管理批量删除 2023-03-03 19:56:33 +08:00
lbw
b68eaadfb4 Merge remote-tracking branch 'origin/lei_dev' into leng_dev
# Conflicts:
#	package.json
2023-03-03 17:59:26 +08:00
lbw
f88bc832af ref: 格式化 2023-03-03 17:57:14 +08:00
aeizzz
001a049f44 Merge remote-tracking branch 'origin/leng_dev' into lei_dev 2023-03-03 17:54:34 +08:00
aeizzz
87b31f9cce Introducing new features. 图标使用文件 个人页面bug修改 2023-03-03 17:54:24 +08:00
lbw
bb53480794 feat: 运行打开浏览器,删除无用路由 2023-03-03 17:30:07 +08:00
aeizzz
8d8c47e1da Merge remote-tracking branch 'origin/leng_dev' into lei_dev
# Conflicts:
#	src/utils/storage.ts
2023-03-03 17:29:43 +08:00
aeizzz
0a98c2bce0 Introducing new features. __NEXT_NAME__ 配置和格式化代码 2023-03-03 17:27:57 +08:00
aeizzz
0ca34f6b57 🐛 Fixing a bug. tagsViewName 正则匹配错误,匹配到含en单词 2023-03-03 17:12:53 +08:00
aeizzz
237edb87d1 🐛 Fixing a bug. tagsViewName正则匹配错误,匹配到含en单词 2023-03-03 16:58:51 +08:00
lbw
25d66aa421 Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-03 16:52:16 +08:00
aeizzz
744caa4a51 Introducing new features. 更新个人中心图标问题 2023-03-03 16:46:14 +08:00
lbw
4097e4468e Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-03 14:54:30 +08:00
lbw
af762e67aa 💄 优化表格布局,支持分页固定 2023-03-03 14:53:11 +08:00
aeizzz
184708724b Introducing new features. 完成本地svg图标的导入使用 2023-03-03 14:39:17 +08:00
lbw
c73a99f5a7 💄 优化表格布局,支持分页固定 2023-03-03 14:32:11 +08:00
lbw
7640876c0c refc: 个人中心页面移动在 admin/user 路径下方便维护 2023-03-03 13:46:57 +08:00
lbw
a3f614f67e 🐛 Fixing a bug. I18N 国际化KEY 重复,导致密码登录表单显示有问题 2023-03-03 11:31:40 +08:00
lbw
0052c85771 Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-03 11:08:16 +08:00