From 8ed927f22d71e412af7fb42ce25bca80f2f6c3fa Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Mon, 28 Apr 2025 13:26:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E7=94=B3=E8=AF=B7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=8D=E5=90=88?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packageoverRecordMain.data.ts             |  5 +++
 .../packageoverRequestMain.data.ts            | 41 +++++++++++++------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
index 2436a0a81..474ff23b3 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
@@ -14,6 +14,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '申请单号',
     field: 'requestNumber',
+    isSearch: true,
     sort: 'custom',
     table: {
       width: 180
@@ -282,6 +283,7 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '品番',
     field: 'itemCode',
+    isSearch:true,
     sort: 'custom',
     table: {
       width: 150
@@ -290,6 +292,7 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '品名',
     field: 'itemName',
+    isSearch:true,
     sort: 'custom',
     table: {
       width: 150
@@ -298,6 +301,7 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '背番',
     field: 'itemDesc1',
+    isSearch:true,
     sort: 'custom',
     table: {
       width: 150
@@ -357,6 +361,7 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '库位代码',
     field: 'locationCode',
+    isSearch:true,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
index 51f6e0d7b..b2005865e 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@@ -112,6 +112,7 @@ export const PackageoverRequestMain = useCrudSchemas(
       sort: 'custom',
       isForm: true,
       isTable: true,
+      isSearch: true,
       isDetail: true,
       table: {
         width: 150
@@ -221,7 +222,7 @@ export const PackageoverRequestMain = useCrudSchemas(
       field: 'fromAreaTypes',
       dictType: DICT_TYPE.AREA_TYPE,
       dictClass: 'string',
-      isSearch: true,
+      isSearch: false,
       isTable: false,
       sort: 'custom',
       table: {
@@ -264,16 +265,20 @@ export const PackageoverRequestMain = useCrudSchemas(
     {
       label: '入库库存状态范围',
       field: 'inInventoryStatuses',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
       sort: 'custom',
-      isTable: false,
-      isForm: false
+      isForm:false,
+      isTable:false,
     },
     {
       label: '出库库存状态范围',
       field: 'outInventoryStatuses',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
       sort: 'custom',
-      isTable: false,
-      isForm: false
+      isForm:false,
+      isTable:false,
     },
     {
       label: '部门',
@@ -430,7 +435,7 @@ export const PackageoverRequestMain = useCrudSchemas(
         }
       },
       isForm: false,
-      isSearch: true,
+      isSearch: false,
       search: {
         component: 'DatePicker',
         componentProps: {
@@ -520,6 +525,7 @@ export const PackageoverRequestDetail = useCrudSchemas(
       label: '品番',
       field: 'itemCode',
       sort: 'custom',
+      isSearch:true,
       table: {
         width: 150
       },
@@ -578,6 +584,7 @@ export const PackageoverRequestDetail = useCrudSchemas(
         width: 150
       },
       isTableForm: false,
+      isSearch: true,
       isForm: false
     },
     {
@@ -588,6 +595,7 @@ export const PackageoverRequestDetail = useCrudSchemas(
         width: 150
       },
       isTableForm: false,
+      isSearch: true,
       isForm: false
     },
     {
@@ -656,7 +664,7 @@ export const PackageoverRequestDetail = useCrudSchemas(
       label: '从包装规格',
       field: 'fromPackUnit',
       sort: 'custom',
-      isSearch: true,
+      isSearch: false,
       table: {
         width: 120
       },
@@ -735,7 +743,7 @@ export const PackageoverRequestDetail = useCrudSchemas(
       label: '到包装规格',
       field: 'toPackUnit',
       sort: 'custom',
-      isSearch: true,
+      isSearch: false,
       table: {
         width: 120
       },
@@ -955,26 +963,33 @@ export const PackageoverRequestDetail = useCrudSchemas(
     {
       label: '创建时间',
       field: 'createTime',
-      sort: 'custom',
-      isForm: false,
-      isTable: true,
       formatter: dateFormatter,
       detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
       },
+      isTable: false,
+      sort: 'custom',
       table: {
         width: 180
       },
       form: {
         component: 'DatePicker',
         componentProps: {
-          style: { width: '100%' },
           type: 'datetime',
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
       },
-      isTableForm: false
+      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: '创建者',