From 60cda84c2ebb8e5349daaeac365fdd5e62842218 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Mon, 28 Apr 2025 19:55:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=8A=E5=AE=A2=E6=88=B7PDA=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E3=80=8B=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=9C=80=E8=A6=81=E6=98=BE=E7=A4=BA=E5=87=BA=20?=
 =?UTF-8?q?=E2=80=9C=E5=8F=91=E8=B4=A7=E6=97=A5=E6=9C=9F=E2=80=9D=EF=BC=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B9=E4=B9=9F=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?=E2=80=9C=E5=8F=91=E8=B4=A7=E6=97=A5=E6=9C=9F=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverRecordMain/deliverRecordMain.data.ts  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
index e574b9ed5..7c8b46cf7 100644
--- a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -82,15 +82,15 @@ export const DeliverRecordMain = useCrudSchemas(
     {
       label: '发货日期',
       field: 'dueTime',
-      formatter: dateFormatter,
+      formatter: dateFormatter2,
       detail: {
-        dateFormat: 'YYYY-MM-DD'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
       },
       sort: 'custom',
       table: {
         width: 180
       },
-      isTable: false,
+      isTable: true,
       form: {
         component: 'DatePicker',
         componentProps: {
@@ -99,7 +99,15 @@ export const DeliverRecordMain = useCrudSchemas(
           valueFormat: 'x'
         }
       },
-      isForm: false,
+      isSearch: true,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        },
+      },
     },
     {
       label: '从仓库代码',