From 8099042b51891d1e58d6066f0247ba423f4457bd Mon Sep 17 00:00:00 2001
From: yyg1378265336 <1378265336@qq.com>
Date: 星期四, 27 二月 2025 09:27:17 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/BS/TigerAdmin_2024
---
src/store/modules/user.ts | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 66a19cc..d5c91f3 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,3 +1,11 @@
+/*
+ * @Description: file content
+ * @Author: Ben Lin
+ * @version:
+ * @Date: 2024-06-18 15:09:47
+ * @LastEditors: Ben Lin
+ * @LastEditTime: 2024-10-07 17:01:32
+ */
import type { UserInfo } from '#/store';
import type { ErrorMessageMode } from '#/axios';
import { defineStore } from 'pinia';
@@ -6,19 +14,18 @@
import { PageEnum } from '@/enums/pageEnum';
import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY } from '@/enums/cacheEnum';
import { getAuthCache, setAuthCache } from '@/utils/auth';
-import { GetUserInfoModel, LoginParams } from '@/api/sys/model/userModel';
-import { doLogout, getTgUserInfo, getUserInfo, loginApi } from '@/api/sys/user';
+import { GetUserInfoModel } from '@/api/sys/model/userModel';
+import { doLogout, getTgUserInfo, loginApi } from '@/api/sys/user';
import { useI18n } from '@/hooks/web/useI18n';
import { useMessage } from '@/hooks/web/useMessage';
import { router } from '@/router';
-import { usePermissionStore } from '@/store/modules/permission';
-import { RouteRecordRaw } from 'vue-router';
-import { PAGE_NOT_FOUND_ROUTE } from '@/router/routes/basic';
import { isArray } from '@/utils/is';
import { h } from 'vue';
import { AccountInfo } from '/@/api/tigerapi/model/systemModel';
import { getMenuAuthList } from '/@/api/sys/menu';
import { iV_USER_MENU } from '/@/api/tigerapi/model/vModel';
+import { getSysParam } from '/@/api/tigerapi/system';
+import { ApiAction } from '/@/api/model/baseModel';
interface UserState {
userInfo: Nullable<UserInfo>;
@@ -108,7 +115,8 @@
},
async afterLoginAction(
goHome?: boolean,
- changepwd?: boolean,): Promise<GetUserInfoModel | null> {
+ changepwd?: boolean,
+ ): Promise<GetUserInfoModel | null> {
if (!this.getToken) return null;
// get user info
const userInfo = await this.getTgUserInfoAction(changepwd);
@@ -142,11 +150,24 @@
changepwd: changepwd,
username: data.USER_NAME,
realName: data.USER_NAME,
- orgCode: '', //globSetting.useOrg == 'Y' ? data.ORG_CODE : '',
+ orgCode: data.ORG_CODE, //globSetting.useOrg == 'Y' ? data.ORG_CODE : '',
prodCode: data.FTY_CODE, //globSetting.useOrg == 'N' ? data.ORG_CODE : '',
avatar: '',
roles: vUserMenu.Data.Items as unknown as iV_USER_MENU[],
+ byOrg: false,
+ byProd: false,
+ byWh: false,
};
+ /* 浠庣郴缁熷弬鏁拌幏鍙栧惎鐢ㄥ摢绉嶆潈闄� */
+ var action = await getSysParam({ group: 'ByAuthActive' });
+ if (action.IsSuccessed) {
+ userInfo.byOrg =
+ action.Data.filter((x) => x.PARAM_CODE == 'ByOrgActive')[0].PARAM_VALUE == 'Y';
+ userInfo.byProd =
+ action.Data.filter((x) => x.PARAM_CODE == 'ByProdActive')[0].PARAM_VALUE == 'Y';
+ userInfo.byWh =
+ action.Data.filter((x) => x.PARAM_CODE == 'ByWhActive')[0].PARAM_VALUE == 'Y';
+ }
const { roles = [] } = userInfo;
if (isArray(roles)) {
const roleList = roles.map((item) => item.value) as RoleEnum[];
@@ -164,7 +185,7 @@
async logout(goLogin = false) {
if (this.getToken) {
try {
- await doLogout({ Data: this.getToken });
+ await doLogout({ Data: this.getToken } as unknown as ApiAction<string>);
} catch {
console.log('娉ㄩ攢Token澶辫触');
}
@@ -194,11 +215,11 @@
username: data.USER_NAME,
changepwd: changepwd,
realName: data.USER_NAME,
- orgCode: '', //globSetting.useOrg == 'Y' ? data.ORG_CODE : '',
+ orgCode: data.ORG_CODE, //globSetting.useOrg == 'Y' ? data.ORG_CODE : '',
prodCode: data.FTY_CODE, //globSetting.useOrg == 'N' ? data.FTY_CODE : '',
avatar: '',
roles: vUserMenu.Data.Items as unknown as iV_USER_MENU[],
- };
+ } as unknown as UserInfo;
this.setUserInfo(userInfo);
//console.log(data[0].LOGINNAME);
return userInfo;
--
Gitblit v1.9.3