From 3c6566a26c6bb6f68deed9f2c8e7b6eab1209134 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 28 八月 2026 15:42:42 +0800
Subject: [PATCH] feat(order): 添加产品检验项选择功能并增加导入导出功能 - 实现产品检验项的选择状态管理和计数显示功能 - 添加标准物质和设备管理模块的导入导出功能 - 新增导入模板下载和上传验证机制 - 调整表单验证规则，移除生产单位必填限制
---
src/store/modules/user.js | 45 +++++++++++++++++++++------------------------
1 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1fc3208..68d8fcb 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,4 @@
-import { login, logout, getInfo, LoginBySSO } from "@/api/login";
+import { login, logout, getInfo } from "@/api/login";
import { getToken, setToken, removeToken } from "@/utils/auth";
import { isHttp, isEmpty } from "@/utils/validate";
import defAva from "@/assets/images/profile.jpg";
@@ -11,6 +11,8 @@
name: "",
avatar: "",
nickName: "",
+ nameEn: "",
+ userName: "",
roles: [],
permissions: [],
},
@@ -30,6 +32,12 @@
},
SET_NICKNAME: (state, nickName) => {
state.nickName = nickName;
+ },
+ SET_NAMEEN: (state, nameEn) => {
+ state.nameEn = nameEn;
+ },
+ SET_USERNAME: (state, userName) => {
+ state.userName = userName;
},
SET_ROLES: (state, roles) => {
state.roles = roles;
@@ -61,23 +69,6 @@
});
});
},
- // 鍗曠偣鐧诲綍
- LoginBySSO({ commit }, accessToken) {
- return new Promise((resolve, reject) => {
- LoginBySSO(accessToken)
- .then((res) => {
- setToken(res.token);
- commit("SET_TOKEN", res.token);
- Vue.prototype.uploadHeader = {
- Authorization: "Bearer " + res.token,
- };
- resolve();
- })
- .catch((error) => {
- reject(error);
- });
- })
- },
// 鑾峰彇鐢ㄦ埛淇℃伅
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
@@ -101,6 +92,8 @@
commit("SET_NAME", user.userName);
commit("SET_AVATAR", avatar);
commit("SET_NICKNAME", user.nickName);
+ commit("SET_NAMEEN", user.nameEn);
+ commit("SET_USERNAME", user.userName);
resolve(res);
})
.catch((error) => {
@@ -113,12 +106,16 @@
LogOut({ commit, state }) {
return new Promise((resolve, reject) => {
logout(state.token)
- .then(() => {
- commit("SET_TOKEN", "");
- commit("SET_ROLES", []);
- commit("SET_PERMISSIONS", []);
- removeToken();
- resolve();
+ .then((res) => {
+ if (res.data) {
+ window.location.href = res.data
+ } else {
+ commit("SET_TOKEN", "");
+ commit("SET_ROLES", []);
+ commit("SET_PERMISSIONS", []);
+ removeToken();
+ resolve();
+ }
})
.catch((error) => {
reject(error);
--
Gitblit v1.9.3