From ba417001098b102abcabc92d60cf4509888a7545 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Thu, 4 Jul 2024 16:25:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=A1=E5=88=92=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionMain/productionMain.data.ts     | 31 +++++++++++++++++++
 .../productionMainAssemble.data.ts            | 31 +++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index d5dfe2dc2..bc469c5ad 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -711,6 +711,37 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }]
     },
   },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isSearch: true,
+    sortTableDefault:1000,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
   {
     label: '计划数量',
     field: 'planQty',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index a210540f2..466d2a4e5 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -710,6 +710,37 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }]
     },
   },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isSearch: true,
+    sortTableDefault:1000,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
   {
     label: '计划数量',
     field: 'planQty',