From 4d62184a9b98a65c78c3aac586fcda2855cf87f4 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 02 十一月 2026 13:35:06 +0800
Subject: [PATCH] Merge branch 'master' into dev_新高电力
---
src/pages/workbench/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/pages/workbench/index.vue b/src/pages/workbench/index.vue
index eff3570..4940a01 100644
--- a/src/pages/workbench/index.vue
+++ b/src/pages/workbench/index.vue
@@ -28,7 +28,6 @@
const loadError = ref("");
const activeGroup = ref("鍏ㄩ儴");
const hiddenAppNames = [
- "璇峰亣鐢宠",
"璋冨矖鐢宠",
"绂昏亴鐢宠",
"鍔犵彮鐢宠",
@@ -42,7 +41,6 @@
"MES 棣栭〉",
];
const hiddenComponentPatterns = [
- /^hrm\/leave\/index$/i,
/^hrm\/transfer\/index$/i,
/^hrm\/resignation\/index$/i,
/^hrm\/overtime\/index$/i,
@@ -215,8 +213,10 @@
const apps = computed(() => {
const menuApps = flattenMenus(state.menus);
- // 鈥滄垜鐨勭敵璇封�濇ā鍧楁殏鏃堕殣钘忥紱鎭㈠鏃跺彇娑堜笅涓�琛屾敞閲婏紝骞跺湪杩斿洖鍊间腑閲嶆柊鍚堝苟 selfServiceApps銆�
- // const selfServiceApps = getSelfServiceApps(menuApps);
+ // 璇峰亣鏄墍鏈夊憳宸ラ兘鍙娇鐢ㄧ殑鑷姪鐢宠锛涙湁鑿滃崟鏉冮檺鏃朵娇鐢ㄦ寮忚彍鍗曪紝娌℃湁鏃惰ˉ鍏呪�滄垜鐨勭敵璇封�濆叆鍙c��
+ const selfServiceApps = getSelfServiceApps(menuApps).filter(
+ item => item.component === "hrm/leave/index"
+ );
const attendance =
!isModuleEnabled("鑰冨嫟瑙勫垯") ||
menuApps.some(app => app.component === "hrm/attendance/clock/index")
@@ -235,7 +235,7 @@
mark: "mark-9",
},
];
- return menuApps.concat(attendance);
+ return menuApps.concat(selfServiceApps, attendance);
});
const groups = computed(() => [
"鍏ㄩ儴",
--
Gitblit v1.9.3