diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
index 126bc1e33..359cd3a16 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 
 // 表单校验
 export const FinishedShipmentMainRules = reactive({
@@ -39,6 +39,36 @@ export const FinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+   {
+          label: '发货日期',
+          field: 'dueTime',
+          formatter: dateFormatter2,
+          detail: {
+            dateFormat: 'YYYY-MM-DD'
+          },
+          sort: 'custom',
+          table: {
+            width: 180
+          },
+          isTable: true,
+          form: {
+            component: 'DatePicker',
+            componentProps: {
+              type: 'datetime',
+              dateFormat: 'YYYY-MM-DD HH:mm:ss',
+              valueFormat: 'x'
+            }
+          },
+          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: '发货类型',
     field: 'shipmentType',
@@ -66,6 +96,7 @@ export const FinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    isSearch:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -77,6 +108,15 @@ export const FinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat : 'YYYY-MM-DD HH:mm:ss'
     },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
     isTable:true,
     isForm: false,
     table:{
@@ -277,6 +317,15 @@ export const FinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       },
     },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
     isForm: false,
     hiddenInMain:true
   },
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
index 01055f86b..df68df660 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 
 // 表单校验
 export const UnfinishedShipmentMainRules = reactive({
@@ -31,6 +31,36 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+        label: '发货日期',
+        field: 'dueTime',
+        formatter: dateFormatter2,
+        detail: {
+          dateFormat: 'YYYY-MM-DD'
+        },
+        sort: 'custom',
+        table: {
+          width: 180
+        },
+        isTable: true,
+        form: {
+          component: 'DatePicker',
+          componentProps: {
+            type: 'datetime',
+            dateFormat: 'YYYY-MM-DD HH:mm:ss',
+            valueFormat: 'x'
+          }
+        },
+        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: '发货类型',
     field: 'shipmentType',
@@ -59,6 +89,7 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    isSearch:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -67,6 +98,15 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
     detail: {
       dateFormat : 'YYYY-MM-DD HH:mm:ss'
     },
@@ -271,6 +311,15 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       },
     },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
     isForm: false,
     hiddenInMain:true
   },