20260806224941

code/fms/fms-vue/src/stores/permissions.js

@@ -36,15 +36,27 @@ export const usePermissionStore = defineStore("permissions", () => {
     if (isG3soft.value) {
       const elevatedKey = `g3soft:${principalKey}`;
       if (loadedPrincipalKey.value === elevatedKey) return;
-      loadVersion++;
       loadingPromise = null;
       loadingPrincipalKey = "";
-      loadedPrincipalKey.value = elevatedKey;
-      modules.value = [];
-      grantedPageIds.value = [];
-      moduleCodes.value = [];
-      powerCodes.value = [];
-      return;
+
+      // g3soft 也需要加载模块列表用于菜单渲染，权限检查直接返回 true
+      const requestVersion = ++loadVersion;
+      const request = loadDataApi("s_module", "b_canuse = 1", "b_id ASC")
+        .then((res) => {
+          if (requestVersion !== loadVersion) return;
+          modules.value = res.data || [];
+          grantedPageIds.value = [];
+          moduleCodes.value = [];
+          powerCodes.value = [];
+          loadedPrincipalKey.value = elevatedKey;
+        })
+        .finally(() => {
+          if (requestVersion !== loadVersion) return;
+          loadingPromise = null;
+          loadingPrincipalKey = "";
+        });
+      loadingPromise = request;
+      return request;
     }
     if (!/^\d+$/.test(userId)) throw new Error("登录用户 ID 无效，请重新登录");
     if (loadedPrincipalKey.value === principalKey) return;