From 27136292aaed13bcf4fd6651f3abdb47182adfcf Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 5 Feb 2025 13:41:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=90=88=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerDeliveryForecast/index.vue | 98 ++++++++++++++++--- 1 file changed, 86 insertions(+), 12 deletions(-) diff --git a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue index f91b97318..a5db1afd8 100644 --- a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue @@ -1,7 +1,15 @@ + @@ -94,6 +123,38 @@ const updataTableColumns = (val) => { orginTableColumns.value = val } +// 月合计--列表头部 +const isToMonth = ref(false) +const toMonthSearchClick = async ()=>{ + isToMonth.value = true + console.log('data',searchRef.value.getSearchFormData()) + let data = searchRef.value.getSearchFormData() + await setSearchParamsHeadToMonth(data) + // updateDateTableColumns() + setSearchParamsToMonth(data) +} +const { tableObject:tableObjectHeadToMonth, tableMethods:tableMethodsHeadToMonth } = useTable({ + getListApi: CustomerDeliveryForecastApi.getPageTableHeadToMonth // 分页接口 +}) + +// 获得表格的各种操作 +const { getList:getListHeadToMonth, setSearchParams:setSearchParamsHeadToMonth } = tableMethodsHeadToMonth + +watch(()=>tableObjectHeadToMonth.tableList,()=>{ + updateDateTableColumns(true) +},{deep:true}) + +// 月合计-列表 +const { tableObject:tableObjectToMonth, tableMethods:tableMethodsToMonth } = useTable({ + getListApi: CustomerDeliveryForecastApi.getCustomerDeliveryForecastPageToMonth // 分页接口 +}) + +// 获得表格的各种操作 +const { getList:getListToMonth, setSearchParams:setSearchParamsToMonth } = tableMethodsToMonth + + + +// 要货预测--列表头部 const { tableObject:tableObjectHead, tableMethods:tableMethodsHead } = useTable({ getListApi: CustomerDeliveryForecastApi.getPageTableHead // 分页接口 }) @@ -102,18 +163,29 @@ const { tableObject:tableObjectHead, tableMethods:tableMethodsHead } = useTable( const { getList:getListHead, setSearchParams:setSearchParamsHead } = tableMethodsHead watch(()=>tableObjectHead.tableList,()=>{ - updateDateTableColumns() + updateDateTableColumns(false) },{deep:true}) -const updateDateTableColumns = ()=>{ +const updateDateTableColumns = (toMonth)=>{ console.log('tableObjectHead',tableObjectHead) let dateColumns = [] - tableObjectHead.tableList.forEach(item=>{ - dateColumns.push({ - width:120, - field: item, - label: item + if(toMonth){ + // 月合计 + tableObjectHeadToMonth.tableList.forEach(item=>{ + dateColumns.push({ + width:120, + field: item, + label: item + }) }) - }) + }else{ + tableObjectHead.tableList.forEach(item=>{ + dateColumns.push({ + width:120, + field: item, + label: item + }) + }) + } tableColumns.value = [...orginTableColumns.value,...dateColumns] console.log('tableColumns',tableColumns.value) } @@ -137,8 +209,9 @@ const searchQueryTableSuccess = (formField, searchField, val, formRef, type, row } }) } -const seachRef = ref() +const searchRef = ref() const searchClick = async (data)=>{ + isToMonth.value = false await setSearchParamsHead(data) // updateDateTableColumns() setSearchParams(data) @@ -182,6 +255,7 @@ const buttonBaseClick = async (val, item) => { filters: tableObject.params.filters }) } else { + isToMonth.value = false await getListHead() // updateDateTableColumns() getList() @@ -310,7 +384,7 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { - seachRef.value.search() + searchRef.value.search() // getList() importTemplateData.templateUrl = await CustomerDeliveryForecastApi.importTemplate() })