From 351adea87fee7c6137eda5219687ae692fa3dad2 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Wed, 9 Jul 2025 18:01:04 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=A0=EC=9E=AC=EC=88=98=EC=9A=94=EC=B2=98?= =?UTF-8?q?=20=EC=83=81=EC=84=B8=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EC=8B=9C=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EB=9D=84=EC=9A=B0?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wr/app/matMng/coMng/ldrmntCoSttn/page.tsx | 25 +++++++++++-------- .../app/store/matDmd/ldrmntCoSttn/index.tsx | 22 ++++++++-------- .../sttn/sttnDetailModal/coDatailModal.tsx | 16 +++--------- 3 files changed, 29 insertions(+), 34 deletions(-) diff --git a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx index 5ce69d508..d5861e173 100644 --- a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx +++ b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx @@ -31,7 +31,7 @@ import { useCallback, useEffect, useState } from "react"; import { Toaster } from "react-hot-toast"; export default function LdrmntCoSttn() { - const { code, ldrmnt, ldrmntInit, ldrmntSearch, } = useWrStore( + const { code, ldrmnt, ldrmntInit, ldrmntSearch, ldrmntUpdate} = useWrStore( (state) => state ); const { ldrmntRes, excelList, ldrmntResCount } = ldrmnt; @@ -42,6 +42,7 @@ export default function LdrmntCoSttn() { const [bdstTable, setBdstTable] = useState(); const [searchTxt, setSearchTxt] = useState(); const [excelData, setExcelData] = useState(); + const [resetPage, isResetPage] = useState(false); // const [isExcelDownload, setIsExcelDownload] = useState(false); const excelClick = useCallback(() => { @@ -76,9 +77,9 @@ export default function LdrmntCoSttn() { const excelDownloadClick = useCallback(() => { const cityNm = computeCityNm(); - ldrmntSearch(true, pageNation, String(ldrmntResCount), cityNm, searchTxt || ""); + ldrmntSearch(true, 1, String(ldrmntResCount), cityNm, searchTxt || ""); // setIsExcelDownload(true); - }, [objSearch, pageNation, searchTxt, code, ldrmntSearch, computeCityNm, ldrmntResCount]); + }, [objSearch, searchTxt, code, ldrmntSearch, computeCityNm, ldrmntResCount]); useEffect(() => { if (/*isExcelDownload &&*/ excelData && excelData.length > 0) { @@ -111,7 +112,6 @@ export default function LdrmntCoSttn() { } else { const data = getCity(cityValue, code.sggCd); setSelectSgg(data); - const firstSggVal = data.find(item => item.val === "0")?.val || (data[0]?.val ?? ""); setObjSearch({ city: cityValue, sgg: firstSggVal }); } @@ -141,7 +141,7 @@ export default function LdrmntCoSttn() { setBdstTable(tbData); }, [ldrmntRes, code]); - + useEffect(() => { const transData = Array.isArray(excelList) ? excelList : [excelList]; const exData = tableData(transData, { code }); @@ -160,8 +160,8 @@ export default function LdrmntCoSttn() { }, [excelList]) useEffect(() => { - const cityNm = computeCityNm(); - ldrmntSearch(false, pageNation, '20', cityNm, searchTxt || ""); + ldrmntSearch(false, pageNation, '20', computeCityNm(), searchTxt || ""); + isResetPage(false) }, [pageNation]); return ( @@ -204,8 +204,8 @@ export default function LdrmntCoSttn() {