From d4d34a9b730ac328068f936598d4138ac2635e57 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期四, 15 十月 2026 11:21:08 +0800
Subject: [PATCH] 质量监督计划：新增计划下发（列表下发状态列与下发按钮，仅已批准未下发的可下发），导出弹窗改卡片式并拦截导出错误响应避免下载损坏文件，日常监督检查记录单按纸质表重做（受监督人多选、监督员下拉、监督内容多选、监督记录、存在问题、整改意见），各表单人员列表改为全实验室不按部门筛选；方法验证：表单新增数据处理、质量控制方法、方法结果验证、验证结论及评审、审批意见字段并新增详情入口，迁移原标准方法变更的设备、检测记录、校准文件、工作证等查看组件，标准方法变更模块下线；设备档案、设备管理编辑弹窗改版为图片与基本信息左右布局、表单行式排列
---
src/store/modules/user.js | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 66ed920..b1e5df4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,6 +15,8 @@
id: '',
name: '',
nickName: '',
+ nameEn: '',
+ userName: '',
avatar: '',
roles: [],
permissions: []
@@ -24,10 +26,8 @@
login(userInfo) {
const username = userInfo.username.trim()
const password = userInfo.password
- const code = userInfo.code
- const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
- login(username, password, code, uuid).then(res => {
+ login(username, password).then(res => {
setToken(res.token)
this.token = res.token
useLockStore().unlockScreen()
@@ -55,6 +55,8 @@
this.id = user.userId
this.name = user.userName
this.nickName = user.nickName
+ this.nameEn = user.nameEn
+ this.userName = user.userName
this.avatar = avatar
cache.session.set('pwrChrtype', res.pwdChrtype)
/* 鍒濆瀵嗙爜鎻愮ず */
@@ -78,12 +80,18 @@
// 閫�鍑虹郴缁�
logOut() {
return new Promise((resolve, reject) => {
- logout(this.token).then(() => {
- this.token = ''
- this.roles = []
- this.permissions = []
- removeToken()
- resolve()
+ logout(this.token).then((res) => {
+ // 涓氬姟瀹氬埗锛氬悗绔繑鍥炶烦杞湴鍧�鏃惰蛋缁熶竴璁よ瘉鐧诲嚭锛堝 SSO 鍗曠偣閫�鍑猴級锛�
+ // 杩斿洖绌哄垯鎸夊父瑙勫墠绔櫥鍑哄鐞�
+ if (res.data) {
+ window.location.href = res.data
+ } else {
+ this.token = ''
+ this.roles = []
+ this.permissions = []
+ removeToken()
+ resolve()
+ }
}).catch(error => {
reject(error)
})
--
Gitblit v1.9.3