From 9828c1a62f46034a5dbf1509437c55da6bf214cc Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Sep 2024 09:36:19 +0800 Subject: [PATCH] =?UTF-8?q?HL-5830=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B-?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=91=98=EF=BC=8C=E5=8F=AA=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/demandforecastingDetail/index.ts | 4 ++++ src/api/wms/demandforecastingMain/index.ts | 4 ++++ .../demandforecastingMain/demandforecastingMain.data.ts | 2 +- .../supplierdeliver/demandforecastingMain/index.vue | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts index 309422d37..a2de6e22b 100644 --- a/src/api/wms/demandforecastingDetail/index.ts +++ b/src/api/wms/demandforecastingDetail/index.ts @@ -35,6 +35,10 @@ const getPageParams = (params)=>{ params.endDate = params.dueDate[1].format('YYYY-MM-DD') } } + if (!params.dueDate || params.dueDate.length == 0) { + params.startDate = '' + params.endDate = '' + } params.dueDate = '' //计划员 diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts index 0433af12c..95049aa46 100644 --- a/src/api/wms/demandforecastingMain/index.ts +++ b/src/api/wms/demandforecastingMain/index.ts @@ -85,6 +85,10 @@ const getPageParams = (params)=>{ params.endDate = params.dueDate[1].format('YYYY-MM-DD') } } + if (!params.dueDate || params.dueDate.length == 0) { + params.startDate = '' + params.endDate = '' + } params.dueDate = '' //计划员 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index ee80b26df..ea3762b98 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -265,7 +265,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ isForm: false, search: { component: 'DatePicker', - value: [dayjs(), dayjs().subtract(-3,'month')], + // value: [dayjs(), dayjs().subtract(-3,'month')], componentProps: { valueFormat: 'YYYY-MM-DD', type: 'daterange', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index 094a5d307..0d02568a3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -171,7 +171,7 @@ const onSearchChange = (field, value)=>{ } } const searchClick = async (data)=>{ - console.log('searchClick',data) + console.log('3444',tableObject.params) await setSearchParamsHead(data) // updateDateTableColumns() setSearchParams(data)