From 43889ac579a3bb6ead202a2d071519f5f9865bbd Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Tue, 17 Jun 2025 17:59:49 +0800 Subject: [PATCH] revert po fetch --- src/components/PoSearch/PoSearch.tsx | 23 ++++++++++++++------- src/components/PoSearch/PoSearchWrapper.tsx | 10 ++++----- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/components/PoSearch/PoSearch.tsx b/src/components/PoSearch/PoSearch.tsx index b3943bc..e4d0916 100644 --- a/src/components/PoSearch/PoSearch.tsx +++ b/src/components/PoSearch/PoSearch.tsx @@ -151,17 +151,17 @@ const PoSearch: React.FC = ({ const res = await fetchPoListClient(params); // const res = await testing(params); if (res) { - console.log(res.records); - setFilteredPo(res.records); - setTotalCount(res.total); + console.log(res); + // setFilteredPo(res.records); + // setTotalCount(res.total); } }, [fetchPoListClient, pagingController] ); - useEffect(() => { - newPageFetch(pagingController, filterArgs); - }, [newPageFetch, pagingController, filterArgs]); + // useEffect(() => { + // newPageFetch(pagingController, filterArgs); + // }, [newPageFetch, pagingController, filterArgs]); return ( <> @@ -183,7 +183,16 @@ const PoSearch: React.FC = ({ { - setFilterArgs({ ...query }); + // setFilterArgs({ ...query }); + setFilteredPo((prev) => + prev.filter((p) => { + return ( + p.code.toLowerCase().includes(query.code.toLowerCase()) && + (query.status === "All" || p.status === query.status) && + (query.escalated === "All" || p.escalated === (query.escalated === t("Escalated"))) + ) + }) + ); }} onReset={onReset} /> diff --git a/src/components/PoSearch/PoSearchWrapper.tsx b/src/components/PoSearch/PoSearchWrapper.tsx index a3c278a..b244da3 100644 --- a/src/components/PoSearch/PoSearchWrapper.tsx +++ b/src/components/PoSearch/PoSearchWrapper.tsx @@ -32,13 +32,13 @@ const PoSearchWrapper: React.FC & SubComponents = async ( po, warehouse, ] = await Promise.all([ - fetchPoList({ - "pageNum": 1, - "pageSize": 10, - }), + // fetchPoList({ + // "pageNum": 1, + // "pageSize": 10, + // }), + fetchPoList(), fetchWarehouseList(), ]); - console.log(po.records.length) const fixPoDate = po.records.map((p) => { return ({ ...p,