From c6d75babe315008bb27adbf667237b3e956c3db8 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Wed, 18 Jun 2025 10:24:23 +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=EB=93=B1=EB=A1=9D,=20=EC=83=81=EC=84=B8=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=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 | 18 ++++------- .../app/store/matDmd/ldrmntCoSttn/excel.tsx | 32 +++++++++++++------ .../store/matDmd/ldrmntCoSttn/headList.tsx | 5 ++- .../app/store/matDmd/ldrmntCoSttn/index.tsx | 15 ++++++++- .../coReg/coRegExcel/coRegExcelModal.tsx | 9 +++--- .../sttn/sttnDetailModal/coDatailModal.tsx | 28 ++++++++++++---- 6 files changed, 75 insertions(+), 32 deletions(-) diff --git a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx index 4b2fe4416..2fe3cd93a 100644 --- a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx +++ b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx @@ -2,7 +2,7 @@ import { useWrStore } from "@/app/store"; import { btnClass } from "@/app/store/common/code"; -import { type customLdrmntBdst } from "@/app/store/matDmd/ldrmntCoSttn"; +import { type customLdrmnt } from "@/app/store/matDmd/ldrmntCoSttn"; import { ldrmntNodeListExport } from "@/app/store/matDmd/ldrmntCoSttn/headList"; import { excelDownload, @@ -34,23 +34,18 @@ export default function LdrmntCoSttn() { (state) => state ); const { ldrmntRes } = ldrmnt; - const [detailModal, setDetailModal] = useState<{ isOpen: boolean, data: customLdrmntBdst | undefined }>({ data: undefined, isOpen: false }) + const [detailModal, setDetailModal] = useState<{ isOpen: boolean, data: customLdrmnt | undefined }>({ data: undefined, isOpen: false }) const [pageNation, setPageNation] = useState(1); const [selectSgg, setSelectSgg] = useState() const [objSearch, setObjSearch] = useState({ sgg: "", city: "" }); - const ref = useRef({} as ReturnType); - const [bdstTable, setBdstTable] = useState(); - const [codeData, setCodeData] = useState(); + const [bdstTable, setBdstTable] = useState(); const [searchTxt, setSearchTxt] = useState(); - const [bdstChgProps, setBdstChgProps] = useState<{ - isOpen: boolean; - data: customLdrmntBdst[]; - }>({ isOpen: false, data: [] }); + const excelClick = useCallback(() => { excelDownload( [[]], "잠재수요처 관리", - "sample_ldrmnt.xlsx", + "sample_ldrmntCoSttn.xlsx", "A1:AL1", 2 ); @@ -86,8 +81,9 @@ export default function LdrmntCoSttn() { useEffect(() => { const data = tableData(ldrmntRes, { code }); + console.log("data", data) const tbData = Array.isArray(data) - ? data.map((item: customLdrmntBdst) => ({ + ? data.map((item: customLdrmnt) => ({ ...item, ctpvCd: item.fctryAddr.split(" ")[0] || "", sggCd: item.fctryAddr.split(" ")[1] || "" diff --git a/apps/wr/app/store/matDmd/ldrmntCoSttn/excel.tsx b/apps/wr/app/store/matDmd/ldrmntCoSttn/excel.tsx index 5c0936357..dc0601127 100644 --- a/apps/wr/app/store/matDmd/ldrmntCoSttn/excel.tsx +++ b/apps/wr/app/store/matDmd/ldrmntCoSttn/excel.tsx @@ -46,16 +46,30 @@ export const names: nameMap = { } -export const excelToLdrmntData = (excelData: File[],) => { +export const excelPbnstSttnParsing = (data: any[]): string[][] => { - const ldrmntData = Object.values(excelData); - const data = ldrmntData.map((item) => { + const excelExportData: string[][] = []; - return ({ - ...(item as object), - rgtr: TEST_UUID, - mdfr: TEST_UUID, - }) + data.forEach((item) => { + excelExportData.push([ + item.rvbsn, + String(item.lgbsn), + item.mdmbsn ?? "", + item.rgnNm ?? "", + String(item.sido ?? ""), + String(item.gugun ?? ""), + String(item.bscFctNm ?? ""), + String(item.efflWqltStndrdNm ?? ""), + String(item.fctCpc ?? ""), + String(item.tel ?? ""), + String(item.ruseUtztnFcltNm ?? ""), + String(item.fcltCpct ?? ""), + String(item.splyExtraCpct ?? ""), + String(item.ruseCpct ?? ""), + String(item.usageTotal ?? ""), + String(item.inUsage ?? ""), + String(item.outUsage ?? ""), + ]) }) - return data; + return excelExportData; }; \ No newline at end of file diff --git a/apps/wr/app/store/matDmd/ldrmntCoSttn/headList.tsx b/apps/wr/app/store/matDmd/ldrmntCoSttn/headList.tsx index d9159e1b5..67c02cabf 100644 --- a/apps/wr/app/store/matDmd/ldrmntCoSttn/headList.tsx +++ b/apps/wr/app/store/matDmd/ldrmntCoSttn/headList.tsx @@ -1,10 +1,12 @@ import { z } from "zod"; import type { CommonTableProps } from "../../common/type/header"; +import { TEST_UUID } from "../../ruseFcltMng/fcltReg/rainReg"; export const ldrmntZod = z.object({ + fctryMngSn: z.string().default(''), ctpvCd: z.string().default(''), sggCd: z.string().default(''), - mngInst: z.string().default('').nullish(), + mngInstNm: z.string().default('').nullish(), dmdCoNm: z.string().default(''), fctrySe: z.string().default(''), cmpxNm: z.string().default(''), @@ -40,6 +42,7 @@ export const ldrmntZod = z.object({ fctryAddr: z.string().default(''), fctryLotnoAddr: z.string().default(''), fctryMngNo: z.string().default(''), + rgtr:z.string().default(TEST_UUID).nullish() }) export const ldrmntHeadListExport: CommonTableProps[] = [ diff --git a/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx b/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx index a54e5a1e7..cf6c316a4 100644 --- a/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx +++ b/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx @@ -1,8 +1,9 @@ import type { CommonTableProps } from "@/app/store/common/type/header"; -import { fetchType, getFetch, postFectch, putFectch } from "@/components/lib/api"; +import { deleteFectch, fetchType, getFetch, postFectch, putFectch } from "@/components/lib/api"; import { ToastFormUi } from "@/components/ui/toast/toastFromUi"; import { z } from "zod"; import { ldrmntHeadListExport, ldrmntNodeListExport, ldrmntZod } from "./headList"; +import { TEST_UUID } from "../../ruseFcltMng/fcltReg/rainReg"; @@ -29,6 +30,7 @@ type ldrmntActions = { ldrmntInit: () => void; ldrmntSearch: (sggCd: string, coNm: string) => void; ldrmntUpdate: (ldrmntRes: customLdrmnt) => void; + ldrmntDelete: () => void; }; export type ldrmntType = ldrmntState & ldrmntActions; @@ -127,6 +129,7 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = ( }, ldrmntUpdate: async (ldrmntRes: customLdrmnt) => { try { + ldrmntRes.rgtr = TEST_UUID; console.log("ldrmntRes", ldrmntRes) const response = await putFectch( `/reuseFc/request/temp`, @@ -146,5 +149,15 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = ( console.error("Error ldrmntUpdate:", error); } }, + ldrmntDelete: async () => { + try { + const response = await deleteFectch( + `/reuseFc/request/temp`, + ); + + } catch (error) { + console.error("Error ldrmntDelete:", error); + } + }, } } \ No newline at end of file diff --git a/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx b/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx index ffd255579..1fa8fa8f3 100644 --- a/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx +++ b/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx @@ -1,6 +1,6 @@ import { useWrStore } from "@/app/store"; import { coRegExcel } from "@/app/store/matDmd/coSttn/headList"; -import type { customLdrmntBdst } from "@/app/store/matDmd/ldrmntCoSttn"; +import type { customLdrmnt } from "@/app/store/matDmd/ldrmntCoSttn"; import { excelToLdrmntData, names } from "@/app/store/matDmd/ldrmntCoSttn/excel"; import { filePicked, FileUpload, FormUi, Title } from "@common/business_components/ui"; import { Form, FormField } from "@common/business_components/ui/form"; @@ -16,13 +16,14 @@ export default function CoRegExcel() { const form = useForm>({ resolver: zodResolver(coRegExcel), }); - const { ldrmntRegData } = useWrStore((state) => state); - const [excelData, setExcelData] = useState(); + const { ldrmntRegData, ldrmntDelete } = useWrStore((state) => state); + const [excelData, setExcelData] = useState(); const [file, setFiles] = useState(); const onSubmit = (values: z.infer) => { + ldrmntDelete(); if (file) { filePicked(file, 0).then((res) => { try { @@ -50,7 +51,7 @@ export default function CoRegExcel() { } }) ldrmntRegData(array); - console.log("array22", array) + console.log("array끝", array) } catch (e) { console.log(e) } diff --git a/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx b/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx index 75df712a8..edffcc71d 100644 --- a/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx +++ b/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx @@ -17,8 +17,8 @@ export default function SttnDetailModal({ formObj: any; }) { const { ldrmntUpdate } = useWrStore( - (state) => state - ); + (state) => state + ); const defaultValues: z.infer = ldrmntZod.parse({}); const form = useForm>({ resolver: zodResolver(ldrmntZod), @@ -35,7 +35,6 @@ export default function SttnDetailModal({ if (ldrmntZod) form.reset(formObj); }, [formObj]); - return (
@@ -50,6 +49,23 @@ export default function SttnDetailModal({
+ ( + + { + }} + value={field.value ?? ""} + /> + + )} + /> +
(
- +
( + render={({ field, fieldState }) => (