From 2c86a8bd60deed0dd0e044bad6fb83f75d19a332 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 26 十月 2025 15:05:50 +0800
Subject: [PATCH] Merge branch 'feature-task'
---
app/store/modules/user.js | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/app/store/modules/user.js b/app/store/modules/user.js
index cf7c109..ec289bf 100644
--- a/app/store/modules/user.js
+++ b/app/store/modules/user.js
@@ -12,10 +12,14 @@
token: getToken(),
userId: storage.get(constant.userId),
name: storage.get(constant.name),
+ nickName: storage.get(constant.nickName),
avatar: storage.get(constant.avatar),
roles: storage.get(constant.roles),
permissions: storage.get(constant.permissions),
- deptId: storage.get(constant.deptId)
+ deptId: storage.get(constant.deptId),
+ branchCompanyId: storage.get(constant.branchCompanyId),
+ branchCompanyName: storage.get(constant.branchCompanyName),
+ oaUserId: storage.get(constant.oaUserId)
},
mutations: {
@@ -29,6 +33,10 @@
SET_NAME: (state, name) => {
state.name = name
storage.set(constant.name, name)
+ },
+ SET_NICK_NAME: (state, nickName) => {
+ state.nickName = nickName
+ storage.set(constant.nickName, nickName)
},
SET_AVATAR: (state, avatar) => {
state.avatar = avatar
@@ -45,6 +53,18 @@
SET_DEPT_ID: (state, deptId) => {
state.deptId = deptId
storage.set(constant.deptId, deptId)
+ },
+ SET_BRANCH_COMPANY_ID: (state, branchCompanyId) => {
+ state.branchCompanyId = branchCompanyId
+ storage.set(constant.branchCompanyId, branchCompanyId)
+ },
+ SET_BRANCH_COMPANY_NAME: (state, branchCompanyName) => {
+ state.branchCompanyName = branchCompanyName
+ storage.set(constant.branchCompanyName, branchCompanyName)
+ },
+ SET_OA_USER_ID: (state, oaUserId) => {
+ state.oaUserId = oaUserId
+ storage.set(constant.oaUserId, oaUserId)
}
},
@@ -86,6 +106,7 @@
const user = res.user
const avatar = (user == null || user.avatar == "" || user.avatar == null) ? require("@/static/images/profile.jpg") : baseUrl + user.avatar
const username = (user == null || user.userName == "" || user.userName == null) ? "" : user.userName
+ const nickname = (user == null || user.nickName == "" || user.nickName == null) ? username : user.nickName
const userId = (user == null || user.userId == null) ? null : user.userId
const deptId = (user == null || user.deptId == null) ? null : user.deptId
@@ -97,8 +118,12 @@
}
commit('SET_USER_ID', userId)
commit('SET_NAME', username)
+ commit('SET_NICK_NAME', nickname)
commit('SET_AVATAR', avatar)
commit('SET_DEPT_ID', deptId)
+ commit('SET_BRANCH_COMPANY_ID', res.branchCompanyId)
+ commit('SET_BRANCH_COMPANY_NAME', res.branchCompanyName)
+ commit('SET_OA_USER_ID', res.oaUserId)
resolve(res)
}).catch(error => {
reject(error)
--
Gitblit v1.9.1