diff --git a/apps/wr/app/matMng/coMng/coSttn/page.tsx b/apps/wr/app/matMng/coMng/coSttn/page.tsx index 5c4f85849..e2f600b85 100644 --- a/apps/wr/app/matMng/coMng/coSttn/page.tsx +++ b/apps/wr/app/matMng/coMng/coSttn/page.tsx @@ -129,7 +129,7 @@ export default function CoSttn() { coExcel as [], "수요처 관리", "sample_coSttn.xlsx", - "A1:H1", + "A1:G1", 2 ); } @@ -289,7 +289,7 @@ export default function CoSttn() { { diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx index 8aea16c00..21f72f449 100644 --- a/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx @@ -21,6 +21,8 @@ import ListDiv from "@common/business_components/ui/list_div"; import { HeadMakeColSpan } from "@common/business_components/ui/table/HeadMakeColSpan"; import { Button, Label } from "@common/components/ui"; import { useCallback, useEffect, useRef, useState } from "react"; +import toast, { Toaster } from "react-hot-toast"; +import { useTranslation } from "react-i18next"; export default function PbnstSttn() { const { @@ -46,10 +48,11 @@ export default function PbnstSttn() { isModal: boolean; data: customPbnst; }>({ isModal: false, data: {} as customPbnst }); - + const isDownloadTriggered = useRef(false); const [pbnRuseNm, setPbnRuseNm] = useState(""); - + const { t } = useTranslation('base'); const excelClick = useCallback(() => { + isDownloadTriggered.current = true; pbnstSttnSearch( true, String(1), @@ -77,9 +80,9 @@ export default function PbnstSttn() { }, [pbnstSttn.isInit]); useEffect(() => { - pbnSttnInit("1", "15", ref.current, searchYear, fclts); + pbnSttnInit("1", "15", ref.current, searchYear, fclts); }, [fclts]); - + useEffect(() => { if (pbnstSttnRes && pbnstSttnRes.length > 0) { setBdstTable(pbnstSttnRes); @@ -90,7 +93,10 @@ export default function PbnstSttn() { useEffect(() => { - if (pbnstSttn.excelList.length >= 0) { + if (!isDownloadTriggered.current) { + return; + } + if (pbnstSttn.excelList.length > 0) { excelDownload( pbnstSttn.excelList, "하수재이용시설 현황", @@ -98,7 +104,10 @@ export default function PbnstSttn() { "A1:U2", 3 ); + } else { + toast.error(t('excelDownErrMsg')); } + isDownloadTriggered.current = false; }, [pbnstSttn.excelList]); @@ -162,8 +171,8 @@ export default function PbnstSttn() { /> } - queryClick={ ()=> { - // pbnSearch(returnType); + queryClick={() => { + // pbnSearch(returnType); //setTableIndex(0) setIsReset(true); @@ -202,7 +211,7 @@ export default function PbnstSttn() { ); setIsReset(false); }} - + resetPageNo={isReset} > @@ -242,6 +251,7 @@ export default function PbnstSttn() { }} /> + ); } diff --git a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx index 59ce18d93..055d0372f 100644 --- a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx @@ -158,7 +158,7 @@ export default function RswtrRegForm({

- 건축물 운영정보 + 건축물 정보

{!readonly && ( -
- + + +
+

+ 잠재수요처 상세정보 +

+ +
+ - - - + + + ); }