Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

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)

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)

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,
   },
   // {

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: '从批次',

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