From 78e27fc85271659ceb17ea058769b686d0440318 Mon Sep 17 00:00:00 2001
From: songguoqiang <yiran_zhao6@163.com>
Date: Mon, 12 May 2025 17:07:00 +0800
Subject: [PATCH] =?UTF-8?q?YT-2604=EF=BC=9A=E4=B8=B0=E7=94=B0=E4=BB=A5?=
 =?UTF-8?q?=E5=A4=96=E5=AE=A2=E6=88=B7=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverRecordMain.data.ts                 | 26 ++++++++++++-------
 .../deliver/deliverRecordMain/index.vue       |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
index 94195e82a..f98e86bea 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@@ -603,14 +603,14 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '父包装号',
-    field: 'parentPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '父包装号',
+  //   field: 'parentPackingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '包装规格',
     field: 'packUnit',
@@ -841,10 +841,18 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'DatePicker',
       componentProps: {
         valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
+        type: 'datetimerange',
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       },
     },
+    // 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: '最后更新者',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
index a498edadb..be6758cc2 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
@@ -120,7 +120,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置