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)