From bb0a96410651a5743509155c8a999015025b4fd9 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 2 Dec 2024 13:34:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BC=BA=E9=99=B7:FWHL-21=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparereceiptJobMain/sparereceiptJobMain.data.ts           | 4 ++--
 .../sparereceiptRecordMain/sparereceiptRecordMain.data.ts     | 4 ++--
 .../sparereceiptRequestMain/sparereceiptRequestMain.data.ts   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
index 05d025955..4c04a99fd 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
@@ -988,7 +988,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain:false,
     sortTableDefault:7,
   },
   {
@@ -998,7 +998,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain:false,
     sortTableDefault:7,
   },
   // {
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
index 4f22e1155..94216f6b9 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
@@ -590,7 +590,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     sortTableDefault:11,
-    hiddenInMain:true
+    hiddenInMain:false
   },
   {
     label: '物料描述2',
@@ -600,7 +600,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     sortTableDefault:11,
-    hiddenInMain:true
+    hiddenInMain:false
   },
   {
     label: '从批次',
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index d1007af0d..7c7eae7e0 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -787,7 +787,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     sortTableDefault:7,
-    hiddenInMain:true,
+    hiddenInMain:false,
     isTableForm: true,
     tableForm:{
       disabled: true
@@ -806,7 +806,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     sortTableDefault:7,
-    hiddenInMain:true,
+    hiddenInMain:false,
     isTableForm: true,
     tableForm:{
       disabled: true

From 0a5b2bcfaf55f38f965439fffec5ebd9c98f219c Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Mon, 2 Dec 2024 13:37:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5=E6=A0=A1=E9=AA=8C=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/axios/service.ts              | 2 +-
 src/views/login/components/LoginForm.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts
index 958d2a79b..be603d4ed 100644
--- a/src/config/axios/service.ts
+++ b/src/config/axios/service.ts
@@ -182,7 +182,7 @@ service.interceptors.response.use(
           '<div>5 分钟搭建本地环境</div>'
       })
       return Promise.reject(new Error(msg))
-    } else if (code === 1002000008) {
+    } else if (code === 1002000016) {
       if (msg === '无效的刷新令牌') {
         // hard coding：忽略这个提示，直接登出
         console.log(msg)
diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index f78a1fa81..deed2bce2 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -332,7 +332,7 @@
       const { wsCache } = useCache()
       wsCache.set(CACHE_KEY.DEPT, await DeptApi.getSimpleDeptList())
     }catch (e){
-      if(e.code === 1002000008){
+      if(e.code === 1002000016){
         setTimeout(function (){
           router.push({path:"/updatePasswordNewTips",query:{username:loginData.loginForm.username}})
         },1500)