From 0d5197d8cd334abc83308de9d836ab03146d8f8a Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sun, 17 Mar 2024 13:47:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=81=E8=BE=BE?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/purchasePlanMain.data.ts | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index ce196f2dd..2ef37418d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -48,6 +48,29 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '送达日期',
+    field: 'deliveryDate',
+    isTable: true,
+    isForm: true,
+    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',
+      }
+    }
+  },
   {
     label: '时间窗口',
     field: 'timeWindow',

From a844b11f2a19998a43a457c4abebfcb7b0391fb4 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Sun, 17 Mar 2024 13:48:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E7=9A=84=E8=AE=A1=E5=88=92=E6=97=A5=E6=9C=9F=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BA=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverplan/deliverPlanMain/deliverPlanMain.data.ts        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index ef4b4463a..ad6ddd555 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -244,6 +244,9 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
 export const DeliverPlanMainRules = reactive({
   customerCode: [
     { required: true, message: '请选择客户代码', trigger: 'change' }
+  ], 
+  planDate: [
+    { required: true, message: '计划日期不能为空', trigger: 'change' }
   ],
   available: [
     { required: true, message: '请选择是否可用', trigger: 'change' }