From ab6e294d81f73d8e44a690a4588e44a6b3a898b1 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Fri, 16 Aug 2024 11:22:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5048=EF=BC=8CHL-5?=
 =?UTF-8?q?049=20=E4=BC=98=E5=8C=96=EF=BC=9A=E5=B0=86=E8=A3=85=E9=85=8D?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=98=8E=E7=BB=86=E4=B8=ADmes=EF=BC=8Cbom?=
 =?UTF-8?q?=E5=8D=95=E7=8B=AC=E6=8F=90=E5=87=BA=E4=B8=80=E4=B8=AA=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=B1=95=E7=A4=BA;=E8=A1=A5=E5=85=85=EF=BC=9A?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesRawMaterialConsumptionInfo.data.ts     | 17 ++++++
 .../rawMaterialConsumptionInfo.data.ts        | 56 +++++++++----------
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
index 804384a66..527092ab8 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
@@ -170,4 +170,21 @@ export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
   },
+  {
+    label: '创建人',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
 ]))
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts
index 3fdd7de9d..c4d9e18d3 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts
@@ -164,34 +164,6 @@ export const RawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  {
-    label: '原料创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '原料创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '原料物料名称',
     field: 'itemName',
@@ -257,4 +229,32 @@ export const RawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '原料创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
 ]))
\ No newline at end of file