From ce612c0b3f932859680b6c974c191094f0493c30 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Fri, 16 Aug 2024 19:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5009=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=98=BE=E7=A4=BA=E5=92=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E9=83=BD=E5=BA=94=E8=AF=A5=E6=9C=89=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BA=BA=E5=92=8C=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=EF=BC=9A=E5=B7=B2=E6=94=B9=E5=88=B0=E5=88=B6?=
 =?UTF-8?q?=E5=93=81=E8=BF=94=E4=BF=AE-=E5=88=B6=E5=93=81=E8=BF=94?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productdismantleRequestMain.data.ts       |  8 +++--
 .../productredressJobMain.data.ts             | 26 ++++++++--------
 .../productredressRequestMain.data.ts         | 31 ++++++++++---------
 .../productrepairRecordMain.data.ts           | 18 +++++------
 4 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 19a0dd669..ba0d74fb2 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -992,7 +992,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    sortTableDefault:1002,
+    sortTableDefault:1000,
     table: {
       width: 150
     },
@@ -1000,7 +1000,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
   {
     label: '创建时间',
     field: 'createTime',
-    sortTableDefault:1000,
+    sortTableDefault:1001,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -1018,6 +1018,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
         valueFormat: 'x',
       }
     },
+    hiddenInMain:false,
     isTableForm: false,
     isForm: false
   },
@@ -1025,10 +1026,11 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     label: '创建者',
     field: 'creator',
     sort: 'custom',
-    sortTableDefault:1001,
+    sortTableDefault:1002,
     table: {
       width: 150
     },
+    hiddenInMain:false,
     isTableForm: false,
     isForm: false
   },
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index 89d853a3d..35d0113d7 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -383,7 +383,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:true,
+    isTable:false,
     isForm: false,
   },
   {
@@ -397,7 +397,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable:true,
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -668,16 +668,6 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     hiddenInMain:true,
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:true,
-    hiddenInMain:true,
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -690,7 +680,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     isTable:true,
-    hiddenInMain:true,
+    hiddenInMain:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -702,6 +692,16 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    hiddenInMain:false,
+  },
   {
     label: '最后更新者',
     field: 'updater',
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index 044ab68e6..a20b2301f 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -334,7 +334,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'creator',
     sort: 'custom',
     isForm: false,
-    isTable: true,
+    isTable: false,
     table: {
       width: 150
     },
@@ -350,7 +350,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: true,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -688,18 +688,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   //   isTable:false,
   //   hiddenInMain:true
   // },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-    isTable:true,
-    hiddenInMain:true
-  },
+  
   {
     label: '创建时间',
     field: 'createTime',
@@ -712,7 +701,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 180
     },
     isTable:true,
-    hiddenInMain:true,
+    hiddenInMain:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -725,6 +714,18 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    isTable:true,
+    hiddenInMain:false
+  },
   {
     label: '最后更新者',
     field: 'updater',
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
index 18eaba2c4..7e3d1b89a 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
@@ -197,15 +197,6 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: true
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -236,6 +227,15 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true
+  },
   {
     label: '最后更新时间',
     field: 'updateTime',