From b1c3e33f6d4d4ee981713ece008b57fddde1fddf Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 30 Jul 2024 13:11:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRecordMain.data.ts         | 64 ++++++++--------
 .../productionscrapRequestMain.data.ts        | 73 +++++++++----------
 2 files changed, 68 insertions(+), 69 deletions(-)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
index b9f8bd5f8..20f93af4f 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
@@ -173,36 +173,36 @@ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: true,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
+  // {
+  //   label: '创建者',
+  //   field: 'creator',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: true,
+  // },
+  // {
+  //   label: '创建时间',
+  //   field: 'createTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTable: true,
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -597,7 +597,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    hiddenInMain: true,
+    //hiddenInMain: true,
   },
   {
     label: '创建时间',
@@ -610,7 +610,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
-    hiddenInMain: true,
+    //hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index f9a6b4dc5..d094db05e 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -414,7 +414,6 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -424,6 +423,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -433,7 +433,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTable: true,
+    isTable: false,
     isForm: false
   },
   {
@@ -893,41 +893,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     hiddenInMain: true,
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    hiddenInMain: true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isTableForm: false,
-    isForm: false
-  },
+  
   {
     label: '包装规格',
     field: 'packUnit',
@@ -1024,6 +990,39 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     }
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
   {
     label: '最后更新时间',
     field: 'updateTime',