From accc3e0ef16b063064afef12d55bacabadad8292 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Wed, 23 Jul 2025 13:13:33 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=B9=97=EB=AC=BC=20=EC=97=91=EC=85=80=20?= =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruseFcltMng/fcltSttn/rainSttn/excel.tsx | 10 ++++++---- apps/wr/components/lib/func/TableData.tsx | 4 +++- .../ui/form/fcltReg/rainReg/rainRegForm.tsx | 1 + apps/wr/public/sample_rainSttn.xlsx | Bin 10734 -> 10810 bytes apps/wr/public/sample_rswtSttn.xlsx | Bin 10848 -> 10856 bytes 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/excel.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/excel.tsx index 3de4ee1a6..b57e0edde 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/excel.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/excel.tsx @@ -1,6 +1,7 @@ import type { SelectDataType } from "@common/business_components/ui"; import type { customRainBdst } from "../../fcltReg/rainReg"; - +import { bdstUsgCd } from "@/app/store/common/code/basicCode"; +//TODO: 공통코드시 삭제되니 수정 해야됨 export const excelRainSttnParsing = ( excel: { data: customRainBdst[] }, sidoCode: SelectDataType[], @@ -9,14 +10,15 @@ export const excelRainSttnParsing = ( const excelExportData: string[][] = []; excel.data.forEach((item) => { + console.log("item", item) excelExportData.push([ sidoCode.find((sido) => sido.val === item.ctpvCd?.toString())?.text ?? "", sggCode.find((sgg) => sgg.val === item.sggCd?.toString())?.text ?? "", item.bdstNm ?? "", item.daddr ?? "", - String(item.bdstInfoSn ?? ""), + bdstUsgCd.find((cd) => cd.val === item.reuseBuilding?.[0]?.bdstUsgCd.toString())?.text ?? "", //건축물용도 String(item.frstArchPrmsnDt ?? ""), - String(item.archArea ?? ""), + String(item.archArea.split('.')[0] === '-1' ? '확인불가' : item.archArea.split('.')[0]), String(item.chgBuilding.length > 0 ? "Y" : "N"), String(item.reuseBuilding?.[0]?.lawTrgtYn ?? ""), String(item.reuseBuilding?.[0]?.instlCmptnDt ?? ""), @@ -28,7 +30,7 @@ export const excelRainSttnParsing = ( String(item.reuseBuilding?.[0]?.rainyObj?.filtrTrtmfctPrs ?? ""), String(item.reuseBuilding?.[0]?.rainyObj?.dtfcltCpct ?? ""), String(item.reuseBuilding?.[0]?.instlCstSprtYn ?? ""), - String(item.reuseBuilding?.[0]?.instlCstSprtAmt ?? ""), + String(item.reuseBuilding?.[0]?.instlCstSprtAmt === -1 ? "확인불가" : String(item.reuseBuilding?.[0]?.instlCstSprtAmt) ?? ""), String(item.reuseBuilding?.[0]?.grntchBdstCertYn ?? ""), String(item.reuseBuilding?.[0]?.grntchBdstCertYr ?? ""), String(item.reuseBuilding?.[0]?.grntchBdstCertNo ?? ""), diff --git a/apps/wr/components/lib/func/TableData.tsx b/apps/wr/components/lib/func/TableData.tsx index 24e6349a9..4440e3e54 100644 --- a/apps/wr/components/lib/func/TableData.tsx +++ b/apps/wr/components/lib/func/TableData.tsx @@ -339,7 +339,9 @@ export const InputTableBody = ( // className={`${head.id !== "utztnUsgCd" ? "text-right" : "text-center"} !text-xl h-10 w-full`} className={`${textAlignClass} !text-xl h-10 w-full`} onChange={(e) => - handleChange(dataIndex, head.id, e.target.value, setInputData) + handleCommaNumberChange(e, val => + handleChange(dataIndex, head.id, String(val), setInputData) + ) } value={formatCommaNumber(data[head.id as keyof any]) ?? ""} maxLength={numSize} diff --git a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx index 2b52bd50e..2da752028 100644 --- a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx @@ -511,6 +511,7 @@ export default function RainRegForm({ selectArray={code.bdstIncenYn} onSelectValue={readonly ? () => { } : field.onChange} value={field.value ?? code.yn[0]?.val} + readOnly={readonly} /> )} diff --git a/apps/wr/public/sample_rainSttn.xlsx b/apps/wr/public/sample_rainSttn.xlsx index f00a520cf6e2c26951ab8e345e30d95ce40b631f..f3e7a5ba86f0c084a54dc2c4470b6492cfb8d29d 100644 GIT binary patch delta 2799 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 diff --git a/apps/wr/public/sample_rswtSttn.xlsx b/apps/wr/public/sample_rswtSttn.xlsx index d97a79b6de6b52df015f9960225de3d41cd5921a..cec85971d65b2710e68f9de5473fd808795f6264 100644 GIT binary patch delta 2950 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 From bcdefaa828367b9ba5d7b309a819c9889fa8cf44 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Wed, 23 Jul 2025 17:58:07 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=9E=AC=EC=9D=B4=EC=9A=A9=EC=8B=A4?= =?UTF-8?q?=EC=A0=81=20=EB=93=B1=EB=A1=9D,=20=EC=A7=80=EB=8F=84=EC=A0=90?= =?UTF-8?q?=EA=B2=80=20=EB=93=B1=EB=A1=9D=20=EA=B6=8C=ED=95=9C=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx | 7 +++++++ .../wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx | 9 ++++++--- apps/wr/components/lib/func/TableData.tsx | 4 +++- .../components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx | 7 +++++-- .../chkgdTable/guideDetailTable/guideDetailTable.tsx | 5 +++-- .../ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx | 5 ++++- 6 files changed, 28 insertions(+), 9 deletions(-) diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx index 03397255c..d6fefe4d3 100644 --- a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx +++ b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx @@ -44,6 +44,7 @@ import { useTranslation } from "react-i18next"; export default function Page() { const { + auth, code, rainChkgdn, rswtChkgdn, @@ -64,6 +65,7 @@ export default function Page() { } = useWrStore((state) => { return state; }); + const { regAuthrtYn, mdfcnAuthrtYn, delAuthrtYn } = auth; const [isRegExcel, setIsRegExcel] = useState(false); const [updateRainDetail, setUpdateRainDetail] = useState( [] @@ -301,6 +303,7 @@ export default function Page() { onClick={() => { clickDelete(deleteIdx, selFcltDiv); }} + disabled={delAuthrtYn === 'N'} > 삭제 @@ -313,6 +316,7 @@ export default function Page() { onClick={() => { chkUpdateTable(selFcltDiv); }} + disabled={mdfcnAuthrtYn === 'N'} > 저장 @@ -330,6 +334,7 @@ export default function Page() { onClick={() => { setIsRegExcel(!isRegExcel); }} + disabled={regAuthrtYn === 'N'} > 결과등록 @@ -354,6 +359,7 @@ export default function Page() { pageNation={rainPageNation} onPageChange={rainPageChange} pageCount={rainChkgdn.rainChkCount} + readonly={mdfcnAuthrtYn === 'N'} /> ) : ( setIsModal((prev) => ({ ...prev, open }))} + readonly={mdfcnAuthrtYn === 'N' ? false : true} /> } > diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx index 0572acce9..9ca1d60d2 100644 --- a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx +++ b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx @@ -38,10 +38,11 @@ import { useTranslation } from "react-i18next"; import { headMakeprfmnc } from "../chkgdnReg/TableHead"; export default function PrfmncPrfmncReg() { - const { prfmnc, prfmncHasuInit, prfmnRegData, prfmncHasuNmSearch } = useWrStore( + const { auth, prfmnc, prfmncHasuInit, prfmnRegData, prfmncHasuNmSearch } = useWrStore( (state) => state ); const { pbnstPrfmncHeadList, monthHeadList, prfmncRes, prfmncResCount } = prfmnc; + const { regAuthrtYn, mdfcnAuthrtYn } = auth; const [bdstTable, setbdstTable] = useState(); const [searchTxt, setSearchTxt] = useState(); const [isExcelOpen, setIsExcelOPen] = useState<{ @@ -92,7 +93,7 @@ export default function PrfmncPrfmncReg() { searchYear, pbnstRuseFcltId ) as unknown as PrfType - ,searchYear + , searchYear ); }; @@ -259,6 +260,7 @@ export default function PrfmncPrfmncReg() { onClick={() => { onSave(); }} + disabled={mdfcnAuthrtYn === 'N'} > 저장 @@ -272,6 +274,7 @@ export default function PrfmncPrfmncReg() { setIsExcelOPen({ ...isExcelOpen, isModal: true }); } }} + disabled={regAuthrtYn === 'N'} > 파일등록 @@ -321,7 +324,7 @@ export default function PrfmncPrfmncReg() { {headMakeprfmnc(monthHeadList, [])} - {InputTableBody(inputData ?? [], monthHeadList, setInputData)} + {InputTableBody(inputData ?? [], monthHeadList, setInputData, mdfcnAuthrtYn === 'N' ? false : true)} diff --git a/apps/wr/components/lib/func/TableData.tsx b/apps/wr/components/lib/func/TableData.tsx index 4440e3e54..192bc43c3 100644 --- a/apps/wr/components/lib/func/TableData.tsx +++ b/apps/wr/components/lib/func/TableData.tsx @@ -95,7 +95,8 @@ export const chRowspanTable = ( ) => void, toggleSelection: (pk: number, checked: boolean) => void, selectedIds: number[], - handleCellClick: (index: number, headId: string) => void + handleCellClick: (index: number, headId: string) => void, + disable? : boolean ) => { let order = 0 // rowspan된 셀 렌더링 여부 추적용 @@ -138,6 +139,7 @@ export const chRowspanTable = ( onCheckedChange={(checked) => toggleSelection(row.chkgdnSn, checked === true) } + disabled={disable} > ) : key === "order" ? ( ++order diff --git a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx index 3675e3bfb..c528f5add 100644 --- a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx +++ b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx @@ -8,7 +8,7 @@ import { Button } from "@common/components/ui"; import React, { useEffect, useState } from "react"; import type { z } from "zod"; -export default function ChkgdModal({ type, obj, setIsModal }: { type: string; obj: any, setIsModal: (open: boolean) => void }) { +export default function ChkgdModal({ type, obj, setIsModal, readonly }: { type: string; obj: any, setIsModal: (open: boolean) => void, readonly: boolean }) { const { rainChkgdn, rswtChkgdn, @@ -247,7 +247,7 @@ export default function ChkgdModal({ type, obj, setIsModal }: { type: string; ob } > {!rainChkSttn.isSttn ? ( - ) : ( @@ -274,6 +274,7 @@ export default function ChkgdModal({ type, obj, setIsModal }: { type: string; ob setChGuidData={(data) => { setChGuidData(data); }} + readonly={readonly} />

@@ -288,6 +289,7 @@ export default function ChkgdModal({ type, obj, setIsModal }: { type: string; ob setChGuidData={(data) => { setChGuidData(data); }} + readonly={readonly} /> {type !== "RNB" && polutionData !== undefined ? ( @@ -310,6 +312,7 @@ export default function ChkgdModal({ type, obj, setIsModal }: { type: string; ob setChGuidData={(data) => { getPolutionData(data); }} + readonly={readonly} /> ); diff --git a/apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx b/apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx index 7676f7e71..7522fdbfd 100644 --- a/apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx +++ b/apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx @@ -17,12 +17,14 @@ export function GuideDetailsTable({ headList, upheadList, setChGuidData, + readonly }: { chgRes: any[]; headList: TableUpperProps[]; upheadList: chHeadType[]; type: string; setChGuidData: (chgRes: any[]) => void; + readonly?: boolean; }) { const [inputData, setInputData] = useState(); @@ -30,7 +32,6 @@ export function GuideDetailsTable({ setInputData(chgRes); }, [chgRes]); - useEffect(() => { setChGuidData(inputData ?? []); @@ -43,7 +44,7 @@ export function GuideDetailsTable({ {headMakeprfmnc(headList, upheadList)} - {InputTableBody(inputData ?? [], headList, setInputData)} + {InputTableBody(inputData ?? [], headList, setInputData, readonly)}

diff --git a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx index f607c289e..f016a0cc3 100644 --- a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx +++ b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx @@ -25,6 +25,7 @@ export default function RainChkgdTable({ pageNation, onPageChange, pageCount, + readonly, }: { detailUp: (data: rainChkZodType[]) => void; handleClick?: (data: any) => void; @@ -33,6 +34,7 @@ export default function RainChkgdTable({ pageNation: number; onPageChange: (page: number) => void; pageCount: number; + readonly: boolean; }) { const { code, rainChkgdn, rainChkSttn, getRainSttnExcel } = useWrStore((state) => state); const [makeTableData, setMakeTableData] = useState([]); @@ -191,7 +193,8 @@ export default function RainChkgdTable({ handleChange, toggleSelection, selectedIds, - handleCellClick + handleCellClick, + readonly )} From 1daa92501998495e444bf6e379aa51a4329aea16 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Thu, 24 Jul 2025 11:04:41 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=9E=A0=EC=9E=AC=EC=88=98=EC=9A=94?= =?UTF-8?q?=EC=B2=98=20=EA=B6=8C=ED=95=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wr/app/matMng/coMng/ldrmntCoSttn/page.tsx | 22 ++++--- .../sttn/sttnDetailModal/coDatailModal.tsx | 63 ++++++++++++++----- 2 files changed, 59 insertions(+), 26 deletions(-) diff --git a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx index 36a8b7151..8c4976e09 100644 --- a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx +++ b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx @@ -33,7 +33,7 @@ import toast, { Toaster } from "react-hot-toast"; import { useTranslation } from "react-i18next"; export default function LdrmntCoSttn() { - const { code, ldrmnt, ldrmntInit, ldrmntSearch, ldrmntUpdate } = useWrStore( + const { auth, code, ldrmnt, ldrmntInit, ldrmntSearch, ldrmntUpdate } = useWrStore( (state) => state ); const { ldrmntRes, excelList, ldrmntResCount } = ldrmnt; @@ -47,6 +47,7 @@ export default function LdrmntCoSttn() { const [resetPage, isResetPage] = useState(false); const [isDownloadClicked, setIsDownloadClicked] = useState(false); const { t } = useTranslation('base'); + const { regAuthrtYn, mdfcnAuthrtYn } = auth; const excelClick = useCallback(() => { excelDownload( @@ -224,6 +225,7 @@ export default function LdrmntCoSttn() { onClick={() => { setIsExcelOpen({ isModal: true }); }} + disabled={regAuthrtYn === 'N'} > 엑셀등록 @@ -269,14 +271,16 @@ export default function LdrmntCoSttn() { setDetailModal({ ...detailModal, isOpen: !detailModal.isOpen }) }} bodyClass={"w-[40vw] max-w-none max-h-[calc(100%-70px)]"} - body={ { - const handleConfirm = async () => { - await ldrmntUpdate(value); - setDetailModal({ ...detailModal, isOpen: false }); - ldrmntSearch(false, pageNation, '20', computeCityNm(), searchTxt || ""); - }; - confirmToast(t('isUpdateMsg'), handleConfirm); - }} />} + body={ { + const handleConfirm = async () => { + await ldrmntUpdate(value); + setDetailModal({ ...detailModal, isOpen: false }); + ldrmntSearch(false, pageNation, '20', computeCityNm(), searchTxt || ""); + }; + confirmToast(t('isUpdateMsg'), handleConfirm); + }} />} /> void; + onFormSubmit: (values: customLdrmnt) => void; + readonly?: boolean; }) { const defaultValues: z.infer = ldrmntZod.parse({}); const form = useForm>({ @@ -52,7 +55,11 @@ export default function CoDetailModal({

잠재수요처 상세정보

- @@ -71,7 +78,6 @@ export default function CoDetailModal({ )} /> -
{ field.onChange(e.target.value); }} - value={field.value ?? ""} + value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -108,13 +115,13 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} />
-
)} @@ -151,6 +159,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -173,6 +182,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -193,6 +203,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -213,6 +224,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -235,12 +247,12 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} />
-
)} @@ -278,6 +291,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -298,6 +312,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -318,14 +333,13 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={13} + readOnly={readonly} /> )} />
- -
)} @@ -365,6 +380,7 @@ export default function CoDetailModal({ value={formatCommaNumber(field.value)} min={0} maxLength={8} + readOnly={readonly} /> )} @@ -386,6 +402,7 @@ export default function CoDetailModal({ value={formatCommaNumber(field.value)} min={0} maxLength={8} + readOnly={readonly} /> )} @@ -407,6 +424,7 @@ export default function CoDetailModal({ value={formatCommaNumber(field.value)} min={0} maxLength={8} + readOnly={readonly} /> )} @@ -434,7 +452,6 @@ export default function CoDetailModal({ />
-
)} @@ -471,6 +489,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -491,13 +510,13 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} />
-
)} @@ -534,6 +554,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -554,14 +575,13 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} />
- -
)} @@ -598,6 +619,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -618,14 +640,13 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} />
- -
)} @@ -662,6 +684,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -682,13 +705,13 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} />
-
)} @@ -725,6 +749,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -745,6 +770,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -767,6 +793,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} @@ -787,13 +814,13 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={txtSize} + readOnly={readonly} /> )} />
-
)} @@ -830,6 +858,7 @@ export default function CoDetailModal({ }} value={field.value ?? ""} maxLength={50} + readOnly={readonly} /> )} From 32b16055fb34e758084b993b8e786140048f5645 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Thu, 24 Jul 2025 11:05:19 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=ED=95=98=EC=88=98=EC=9E=AC=EC=9D=B4?= =?UTF-8?q?=EC=9A=A9=EC=8B=9C=EC=84=A4=20=ED=98=84=ED=99=A9=20=EB=AA=A8?= =?UTF-8?q?=EB=8B=AC=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=EB=B0=8F?= =?UTF-8?q?=20=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94=20=EC=A3=BC=EC=84=9D=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruseFcltMng/fcltSttn/pbnstSttn/page.tsx | 23 ++-- .../prfmncReg/pbnstPrfmncReg/page.tsx | 2 +- .../ruseFcltMng/fcltSttn/pbnstSttn/index.tsx | 129 +++++++++--------- .../sttn/pbnstSttnModal/pbnstSttnModal.tsx | 8 -- 4 files changed, 79 insertions(+), 83 deletions(-) diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx index 9793a5116..2daef0074 100644 --- a/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx @@ -1,6 +1,11 @@ "use client"; import { useWrStore } from "@/app/store"; import { btnClass } from "@/app/store/common/code"; +import type { customPbnst } from "@/app/store/ruseFcltMng/fcltReg/pbnstReg/type"; +import type { WaterReuseFacility } from "@/app/store/ruseFcltMng/fcltSttn/pbnstSttn/type"; +import { excelDownload, yearOptions } from "@/components/lib/func/commom"; +import HeadChModal from "@/components/ui/modal/sttn/headChModal/headChModal"; +import { PbnstSttnModal } from "@/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal"; import { ContentsDiv, SearchBaseForm, @@ -12,14 +17,9 @@ import { type ReturnType, } from "@common/business_components/ui"; import ListDiv from "@common/business_components/ui/list_div"; -import { Button, Label } from "@common/components/ui"; -import HeadChModal from "@/components/ui/modal/sttn/headChModal/headChModal"; -import { useCallback, useEffect, useRef, useState } from "react"; import { HeadMakeColSpan } from "@common/business_components/ui/table/HeadMakeColSpan"; -import type { customPbnst } from "@/app/store/ruseFcltMng/fcltReg/pbnstReg/type"; -import { excelDownload, yearOptions } from "@/components/lib/func/commom"; -import type { WaterReuseFacility } from "@/app/store/ruseFcltMng/fcltSttn/pbnstSttn/type"; -import { PbnstSttnModal } from "@/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal"; +import { Button, Label } from "@common/components/ui"; +import { useCallback, useEffect, useRef, useState } from "react"; export default function PbnstSttn() { const { @@ -29,6 +29,7 @@ export default function PbnstSttn() { pbnSttnInit, getPbnStnDetail, getFlcts, + resetPbnstDetail } = useWrStore((state) => state); const { pbnstSttnRes, fclts, pbnstSttnResCount } = pbnstSttn; @@ -103,9 +104,6 @@ export default function PbnstSttn() { }); }, [pbnstSttn.pbnstDetail]); - useEffect(() => { - console.log("pbnDetaileData.isModal ", pbnDetaileData.isModal); - }, [pbnDetaileData.isModal]); return ( <> @@ -233,8 +231,9 @@ export default function PbnstSttn() { open={pbnDetaileData.isModal} onOpenChange={(open) => { //TODO:OPEN 상태 확인필요 - if(!open) - setPbnDetaileData({ data: {} as customPbnst, isModal: open }); + if (!open) + setPbnDetaileData({ data: {} as customPbnst, isModal: open }); + resetPbnstDetail(); }} /> diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx index 9ca1d60d2..c4e62a861 100644 --- a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx +++ b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx @@ -351,7 +351,7 @@ export default function PrfmncPrfmncReg() { } open={isExcelOpen.isModal} onOpenChange={() => { - setIsExcelOPen({ isModal: false, data: {} as FcPrfType }); + setIsExcelOPen({ ...isExcelOpen, isModal: false }); }} > diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx index e94c7a002..3c59c9e3b 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx @@ -27,9 +27,9 @@ export type pbnstSttnState = { ruseGuranteeHeadList: TableUpperProps[] ruseDmdHeadList: TableUpperProps[] ruseFcltHeadList: TableUpperProps[] - pbnstSttnResCount:number; + pbnstSttnResCount: number; excelList: []; - fclts:string[] + fclts: string[] isInit: boolean; }; }; @@ -43,15 +43,15 @@ type pbnstSttnActions = { reurnValue: ReturnType, searchNm: string | undefined, year: string, - fclts:string[] + fclts: string[] ) => void; - getFlcts:()=>void; + getFlcts: () => void; pbnSttnInit: ( page: string, total: string, reurnValue: ReturnType, year: string, - flcts:string[] + flcts: string[] ) => void; getPbnStnDetail: (pbnstRuseFcltId: string) => void; pbnNmSearch: ( @@ -60,8 +60,9 @@ type pbnstSttnActions = { reurnValue: ReturnType, searchNm: string | undefined, year: string, - flcts:string[] + flcts: string[] ) => void; + resetPbnstDetail: () => void; }; export type pbnstSttnType = pbnstSttnState & pbnstSttnActions; @@ -77,11 +78,11 @@ export const pbnstSttnStateExport: pbnstSttnState = { ruseDmdHeadList: ruseDmdHeadListExport, ruseFcltHeadList: ruseFcltHeadListExport, pbnstSttnRes: [], - pbnstSttnResCount:1, + pbnstSttnResCount: 1, pbnstDetail: {} as customPbnst, pbnstSearchData: [], excelList: [], - fclts:[], + fclts: [], isInit: false, }, }; @@ -92,12 +93,12 @@ const hasuListFetch = async ( reurnValue: ReturnType, searchNm: string | undefined, year: string, - flcts:string[] + flcts: string[] ) => { let url = `/prcsFclt/ruseInfo/`; if (reurnValue.partValue === "A") { - url+=`${page}/${total}/${reurnValue.partValue}/${ + url += `${page}/${total}/${reurnValue.partValue}/${ // reurnValue.sidoValue ? reurnValue.sidoValue : reurnValue.sigunValue reurnValue.sigunValue !== '0' ? reurnValue.sigunValue : reurnValue.sidoValue }/0/1/SW` @@ -108,12 +109,12 @@ const hasuListFetch = async ( ? reurnValue.unitWaterShedValue : reurnValue.middleRegionValue }/0/1/SW` - } else if( reurnValue.partValue === 'G'){ + } else if (reurnValue.partValue === 'G') { url += `${page}/${total}/${reurnValue.envPartValue}/${reurnValue.sigunValue !== '0' ? reurnValue.sigunValue : reurnValue.sidoValue}/0/1/SW` - }else{ + } else { url += `1/2/A/0/0/1/SW` } @@ -121,8 +122,7 @@ const hasuListFetch = async ( url += "/" + searchNm } - console.log(' flcts ' ,flcts) - const pbnList = await postFectch(url, flcts,fetchType.COMMON); + const pbnList = await postFectch(url, flcts, fetchType.COMMON); const getRuseList = await postFectch( `/reuseFc/pubDetailList/${year}`, flcts, @@ -139,7 +139,7 @@ const hasuListFetch = async ( fclt.bscFctCd === item.pbnstRuseFcltId.substring(0, 11) ); - if(findData){ + if (findData) { const usage = item.prfList.reduce( (acc, cur) => { @@ -161,48 +161,42 @@ const hasuListFetch = async ( cur.rvrKeepUswtr + cur.indstUswtr; acc.total = acc.inUsage + acc.outUsage; - + return acc; }, { total: 0, inUsage: 0, outUsage: 0 } ); - console.log('findData ', findData) return { - rvbsn: findData?.rvbsn ||'-', - lgbsn: findData?.lgbsn||'-', - mdmbsn: findData?.mdmbsn||'-', - rgnNm: findData?.rgnNm||'-', - sido: findData?.sido||'-', - gugun: findData?.gugun||'-', - bscFctNm: findData?.bscFctNm||'-', - efflWqltStndrdNm: findData?.efflWqltStndrdNm||'-', - fctCpc: Number(findData?.fctCpc)||0, + rvbsn: findData?.rvbsn || '-', + lgbsn: findData?.lgbsn || '-', + mdmbsn: findData?.mdmbsn || '-', + rgnNm: findData?.rgnNm || '-', + sido: findData?.sido || '-', + gugun: findData?.gugun || '-', + bscFctNm: findData?.bscFctNm || '-', + efflWqltStndrdNm: findData?.efflWqltStndrdNm || '-', + fctCpc: Number(findData?.fctCpc) || 0, tel: findData?.tel ?? "-", - ruseUtztnFcltNm: item?.ruseUtztnFcltNm||'-', - fcltCpct: item?.fcltCpct||'-', - splyExtraCpct: item?.splyExtraCpct||'-', - ruseCpct: item?.ruseCpct||'-', - pbnstRuseFcltId: item.pbnstRuseFcltId||'-', + ruseUtztnFcltNm: item?.ruseUtztnFcltNm || '-', + fcltCpct: item?.fcltCpct || '-', + splyExtraCpct: item?.splyExtraCpct || '-', + ruseCpct: item?.ruseCpct || '-', + pbnstRuseFcltId: item.pbnstRuseFcltId || '-', usageTotal: usage?.total, inUsage: usage?.inUsage, outUsage: usage?.outUsage, - operMthd: item.operList[0]?.operMthd||'-', + operMthd: item.operList[0]?.operMthd || '-', rprtvBzenty: item.operList[0]?.rprtvBzenty, bgngDt: moment(item.operList[0]?.bgngDt).format("YYYY-MM-DD") ?? "", endDt: moment(item.operList[0]?.endDt).format("YYYY-MM-DD") ?? "", - searchNm: findData?.bscFctNm||'-', - searchPk: findData?.bscFctCd||'-', + searchNm: findData?.bscFctNm || '-', + searchPk: findData?.bscFctCd || '-', prfList: item?.prfList ?? [] }; } } ).filter(Boolean); - - - console.log( ' checkWrRegListRes ', getRuseList.data) - console.log( ' data ', data) - return data; }; @@ -210,12 +204,12 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( set: any ) => { return { - getFlcts:async ()=>{ - const fclts= await getFetch(fetchType.WR,'/reuseFc/pubFc') + getFlcts: async () => { + const fclts = await getFetch(fetchType.WR, '/reuseFc/pubFc') return set((state: pbnstSttnState) => ({ pbnstSttn: { ...state.pbnstSttn, - fclts:fclts + fclts: fclts }, })); }, @@ -239,11 +233,11 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( reurnValue: ReturnType, searchNm: string | undefined, year: string, - fclts:string[] + fclts: string[] ) => { try { - - + + const pbnstSttnRes = await hasuListFetch( page, total, @@ -265,7 +259,7 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( }, }; }); - } else{ + } else { set((state: pbnstSttnState) => { return { @@ -273,8 +267,8 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( pbnstSttn: { ...state.pbnstSttn, pbnstSttnRes: pbnstSttnRes, - pbnstSttnResCount:pbnstSttnRes.length - // isInit: false, + pbnstSttnResCount: pbnstSttnRes.length + // isInit: false, }, }; }); @@ -283,31 +277,31 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( console.log("error", erTxt); } }, - pbnSttnInit: async( + pbnSttnInit: async ( page: string, total: string, reurnValue: ReturnType, year: string, - fclts:string[] + fclts: string[] ) => { try { const pbnstSttnRes = await hasuListFetch( - page, - total, - reurnValue, - undefined, - year, - fclts - ); - console.log('pbnstSttnRes ' , pbnstSttnRes) - set( (state: pbnstSttnState) => { + page, + total, + reurnValue, + undefined, + year, + fclts + ); + set((state: pbnstSttnState) => { return { ...state, pbnstSttn: { ...state.pbnstSttn, pbnstSttnRes: pbnstSttnRes, - pbnstSttnResCount:pbnstSttnRes.length, + pbnstSttnResCount: pbnstSttnRes.length, isInit: false, + pbnstDetail: {} as customPbnst }, }; }); @@ -315,6 +309,17 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( console.log("error", erTxt); } }, + resetPbnstDetail: async () => { + set((state: pbnstSttnState) => { + return { + ...state, + pbnstSttn: { + ...state.pbnstSttn, + pbnstDetail: {} as customPbnst + }, + }; + }) + }, getPbnStnDetail: async (pbnstRuseFcltId: string) => { try { let pbnstDetail = await getFetch("wr", `/reuseFc/pubFc/${pbnstRuseFcltId}`); @@ -340,7 +345,7 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( reurnValue: ReturnType, searchNm: string | undefined, year: string, - flcts:string[] + flcts: string[] ) => { try { @@ -359,7 +364,7 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( pbnstSttn: { ...state.pbnstSttn, pbnstSearchData: pbnstSttnRes, - pbnstSttnResCount:pbnstSttnRes.length, + pbnstSttnResCount: pbnstSttnRes.length, }, }; }); diff --git a/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx b/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx index b23a52056..1a16c1fef 100644 --- a/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx +++ b/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx @@ -138,7 +138,6 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl }); }); } - console.log(tableData); if (tableData && tableData.length > 0) { setRuseTableData(tableData as any[]); } @@ -216,9 +215,6 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl (usageTotalObj as any)[key] = val; } const tableData = [...inUsageData, ...outUsageData, usageTotalObj]; - console.log("inusageData", inUsageData) - console.log("outUsageData", outUsageData) - console.log("tableData", tableData) setPrfData({ inPrf: inUsageData, outPrf: outUsageData, @@ -248,10 +244,6 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl }, [data, form]) - - useEffect(() => { - console.log("prfData", prfData); - }, [prfData]) return ( <>