From 4d3effe4da9bbd4c2f9d0de99dbe2f85f9397fb1 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Sat, 11 Jan 2025 15:26:08 +0800
Subject: [PATCH] =?UTF-8?q?FWHL-66=20=E5=B7=B2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/customerDeliveryForecast/index.ts                 | 4 ++++
 .../customerDeliveryForecast/customerDeliveryForecast.data.ts | 2 +-
 .../customerManage/customerDeliveryForecast/index.vue         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/customerDeliveryForecast/index.ts b/src/api/wms/customerDeliveryForecast/index.ts
index 03f00d238..7594ed957 100644
--- a/src/api/wms/customerDeliveryForecast/index.ts
+++ b/src/api/wms/customerDeliveryForecast/index.ts
@@ -26,9 +26,13 @@ export interface CustomerDeliveryForecastVO {
 export const getCustomerDeliveryForecastPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
+    if(params.flag){
+      delete params.flag
+    }
     const data = {...params}
     return await request.post({ url: '/wms/customer-delivery-forecast/senior', data })
   } else {
+    params = getPageParams(params)
     return await request.get({ url: `/wms/customer-delivery-forecast/page`, params })
   }
 }
diff --git a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts
index 7611ead8a..70839cac9 100644
--- a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts
@@ -123,7 +123,7 @@ export const CustomerDeliveryForecast = useCrudSchemas(reactive<CrudSchema[]>([
           searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
           searchPage: CustomerDeliveryForecastApi.queryVersion, // 查询弹窗所需分页方法
           searchCondition: [{
-            key: 'itemCodes',
+            key: 'schdParts',
             value: 'schdPart',
             message: '请填写物料代码！',
             isMainValue: true,
diff --git a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue
index 7ea2310f4..aa712aeb1 100644
--- a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue
@@ -156,7 +156,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:customerDeliveryForecast:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:customerDeliveryForecast:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
+  // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',