diff --git a/apps/wr/app/map/pbnstPrfmncSttnPopup.tsx b/apps/wr/app/map/pbnstPrfmncSttnPopup.tsx index f6d870092..46fa9ba59 100644 --- a/apps/wr/app/map/pbnstPrfmncSttnPopup.tsx +++ b/apps/wr/app/map/pbnstPrfmncSttnPopup.tsx @@ -1,10 +1,10 @@ "use client"; import { useWrStore } from "@/app/store"; -import { initValInUsage, initValOutUsage, subTotalObj, totalObj, type FcPrfType, type PrfType } from "@/app/store/prfmncReg/pbnstPrfmncReg/type"; -import { CHART_FORM, ContentsDiv, MainChart, ScrollArea, SelectBox, UiTable, type ChartConfig, type ReturnType } from "@common/business_components"; +import { initValInUsage, initValOutUsage, subTotalObj, totalObj, type PrfType } from "@/app/store/prfmncReg/pbnstPrfmncReg/type"; +import { CHART_FORM, ContentsDiv, MainChart, ScrollArea, SelectBox, UiTable, type ChartConfig } from "@common/business_components"; import ListDiv from "@common/business_components/ui/list_div"; -import { useEffect, useRef, useState } from "react"; +import { useEffect, useState } from "react"; import { Toaster } from "react-hot-toast"; interface PbnstPrfmncSttnPopupProps { @@ -12,16 +12,10 @@ interface PbnstPrfmncSttnPopupProps { } export default function PbnstPrfmncSttnPopup({ isVisible = true }: PbnstPrfmncSttnPopupProps) { - const { code, tableHeadMaker, pbnstPrfmncSttn, pbnstPrfmncInit, pbnstPrfmncSearch, prfmnc } = useWrStore((state) => state); + const { pbnstPrfmncSttn, pbnstPrfmncInit, prfmnc } = useWrStore((state) => state); const { monthHeadList } = prfmnc - const { pbnstPrfHeadList, pbnstPrfmncRes, prfmncRes, rawData, selectYearList } = pbnstPrfmncSttn; - const [isChHead, setIsChHead] = useState(false); - const [fromDate, setFromDate] = useState(String(new Date().getFullYear())); - const [toDate, setToDate] = useState(String(new Date().getFullYear())); + const { prfmncRes, rawData, selectYearList } = pbnstPrfmncSttn; const [year, setYear] = useState(String(new Date().getFullYear())); - const [bdstTable, setbdstTable] = useState(); - const ref = useRef({} as ReturnType); - const [swtrmtFcltNm, setSwtrmtFcltNm] = useState(); const [chartConfig, setChartConfig] = useState({}); const [chartData, setChartData] = useState([]); const [dnInUsage, setDnInUsage] = useState([]); @@ -304,8 +298,8 @@ export default function PbnstPrfmncSttnPopup({ isVisible = true }: PbnstPrfmncSt let indstUswtr = 0; let inUsageSum = 0; let outUsageSum = 0; - let inUsageArr = []; - let outUsageArr = []; + const inUsageArr = []; + const outUsageArr = []; if (rawData) { @@ -518,10 +512,6 @@ export default function PbnstPrfmncSttnPopup({ isVisible = true }: PbnstPrfmncSt } }, [pbnstPrfmncSttn.isInit, pbnstPrfmncInit]); - useEffect(() => { - setbdstTable(prfmncRes); - }, [prfmncRes]); - return ( <> @@ -581,7 +571,7 @@ export default function PbnstPrfmncSttnPopup({ isVisible = true }: PbnstPrfmncSt total={0} cellClick={undefined} onPageChange={function (page: number): void { - throw new Error("Function not implemented."); + throw new Error("Function not implemented.", page); }}> diff --git a/apps/wr/app/map/rainPrfmncSttnPopup.tsx b/apps/wr/app/map/rainPrfmncSttnPopup.tsx index b6ebf11ef..7449772e8 100644 --- a/apps/wr/app/map/rainPrfmncSttnPopup.tsx +++ b/apps/wr/app/map/rainPrfmncSttnPopup.tsx @@ -4,23 +4,21 @@ import { useWrStore } from "@/app/store"; import { rainZod, selectClass, - TEST_UUID, type customRainBdst, } from "@/app/store/ruseFcltMng/fcltReg/rainReg"; -import { DatePicker, FormUi } from "@common/business_components"; -import { Form, FormField, SelectBox } from "@common/business_components/ui"; -import { Button, Input } from "@common/components/ui"; -import { zodResolver } from "@hookform/resolvers/zod"; -import { useEffect, useState } from "react"; -import { useForm, useWatch, type UseFormReturn } from "react-hook-form"; -import { z } from "zod"; -import BdstReg from "@/components/ui/form/fcltReg/bdstReg/bdstReg"; +import { formH1Class, formH2Class } from "@/components/lib/class/comClass"; import { formatCommaNumber, handleCommaNumberChange, } from "@/components/lib/func/commom"; -import { formH1Class, formH2Class } from "@/components/lib/class/comClass"; -import { Label } from "@common/business_components/ui/form/lib/label"; +import BdstReg from "@/components/ui/form/fcltReg/bdstReg/bdstReg"; +import { DatePicker, FormUi } from "@common/business_components"; +import { Form, FormField, SelectBox } from "@common/business_components/ui"; +import { Input } from "@common/components/ui"; +import { zodResolver } from "@hookform/resolvers/zod"; +import { useEffect } from "react"; +import { useForm } from "react-hook-form"; +import { z } from "zod"; export default function RainPrfmncSttnPopup({ rainForm, @@ -29,7 +27,7 @@ export default function RainPrfmncSttnPopup({ rainForm: customRainBdst; isModal: boolean; }) { - const { code, rainBdstReg, rainBdstUpdate, rain } = useWrStore( + const { code, rainBdstReg, rainBdstUpdate } = useWrStore( (state) => state ); const { rainFcltCd } = code; @@ -81,15 +79,6 @@ export default function RainPrfmncSttnPopup({ } }, [grntchBdstCertYn, instlCstSprtYn, filtrTrtmfctYn]); - // form 값이 변경될 때마다 로그 출력 - useEffect(() => { - const subscription = form.watch((value) => { - }); - - - return () => subscription.unsubscribe(); - }, [form]); - useEffect(() => { console.log("form errors:", form.formState.errors); }, [form.formState.errors]); diff --git a/apps/wr/app/map/rswtrPrfmncSttnPopup.tsx b/apps/wr/app/map/rswtrPrfmncSttnPopup.tsx index e7f94a3b5..161860c10 100644 --- a/apps/wr/app/map/rswtrPrfmncSttnPopup.tsx +++ b/apps/wr/app/map/rswtrPrfmncSttnPopup.tsx @@ -1,5 +1,17 @@ "use client"; +import { useWrStore } from "@/app/store"; +import { selectClass } from "@/app/store/ruseFcltMng/fcltReg/rainReg"; +import { + rswtZod, + type customRswtBdst, +} from "@/app/store/ruseFcltMng/fcltReg/rswtReg"; +import { formH1Class, formH2Class } from "@/components/lib/class/comClass"; +import { + formatCommaNumber, + handleCommaNumberChange, +} from "@/components/lib/func/commom"; +import BdstReg from "@/components/ui/form/fcltReg/bdstReg/bdstReg"; import { DatePicker, Form, @@ -7,24 +19,11 @@ import { FormUi, SelectBox, } from "@common/business_components/ui"; -import { Button, Input } from "@common/components/ui"; +import { Input } from "@common/components/ui"; import { zodResolver } from "@hookform/resolvers/zod"; +import { useEffect } from "react"; import { useForm } from "react-hook-form"; import { z } from "zod"; -import { useWrStore } from "@/app/store"; -import { selectClass } from "@/app/store/ruseFcltMng/fcltReg/rainReg"; -import { - rswtZod, - type customRswtBdst, -} from "@/app/store/ruseFcltMng/fcltReg/rswtReg"; -import { useEffect } from "react"; -import BdstReg from "@/components/ui/form/fcltReg/bdstReg/bdstReg"; -import { - formatCommaNumber, - handleCommaNumberChange, -} from "@/components/lib/func/commom"; -import { formH1Class, formH2Class } from "@/components/lib/class/comClass"; -import { Label } from "@common/business_components/ui/form/lib/label"; export default function RswtrPrfmncsSttnPopup({ rswtForm, @@ -33,7 +32,7 @@ export default function RswtrPrfmncsSttnPopup({ rswtForm: customRswtBdst; isModal: boolean; }) { - const { rswt, code, rswtBdstUpdate, rswtBdstReg } = useWrStore( + const { code, rswtBdstUpdate, rswtBdstReg } = useWrStore( (state) => state ); diff --git a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx index 15bff0b32..a1f484b83 100644 --- a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx +++ b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx @@ -1,13 +1,13 @@ "use client"; import { useWrStore } from "@/app/store"; +import { usageProcData } from "@/app/store/matDmd/coMatRvw/headList"; import { DmdCoReqSchema, - type DedMatUpdateType, type DmdCoReqType, type DmdMatTableType, } from "@/app/store/matDmd/coMatRvw/type"; -import { formH1Class, formTableName } from "@/components/lib/class/comClass"; +import { formH1Class } from "@/components/lib/class/comClass"; import { formatPhoneNumber, getCity, @@ -15,33 +15,30 @@ import { tableData, yearOptions, } from "@/components/lib/func/commom"; +import ConCostForm from "@/components/ui/form/coMat/conCostForm/conCostForm"; +import type { objSearchType } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal"; import { ContentsDiv, Form, FormField, FormUi, - ScrollArea, SearchDiv, SearchFormLeft, SearchFormRight, SearchInput, SelectBox, Title, - UiModal, UiTable, type SelectDataType, } from "@common/business_components/ui"; import ListDiv from "@common/business_components/ui/list_div"; import { Button, Input, Label } from "@common/components/ui"; +import { zodResolver } from "@hookform/resolvers/zod"; +import moment from "moment"; import { useEffect, useRef, useState } from "react"; import { useForm, useWatch } from "react-hook-form"; import toast, { Toaster } from "react-hot-toast"; import { z } from "zod"; -import moment from "moment"; -import { usageProcData } from "@/app/store/matDmd/coMatRvw/headList"; -import { zodResolver } from "@hookform/resolvers/zod"; -import ConCostForm from "@/components/ui/form/coMat/conCostForm/conCostForm"; -import type { objSearchType } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal"; export default function CoMatRvw() { const { code, coRvw, coMatRvwInit, coMatRvwSearch, coMatRvwInqua } = @@ -119,7 +116,7 @@ export default function CoMatRvw() { useEffect(() => { if (coMatRvwRes&&coMatRvwRes.length > 0) { - const data = coMatRvwRes?.map((item, index) => { + const data = coMatRvwRes?.map((item) => { let flag = ""; flag = getdmdMatFlag(item?.demandMatching?.splyFcltFlg ||undefined); @@ -238,7 +235,7 @@ export default function CoMatRvw() {
{ - setIsDmdModal({ isMoal: false, data: {} as DemandCompType }); + setIsDmdModal({ isMoal: false, data: {} as DemandCompType }); }} body={ { getDemandCompList(searchText, pageCnt); }} - rtnInputData={ async(data) => { - const con = (objSearch.sgg && objSearch.sgg !== "0") ? objSearch.sgg : objSearch.city; - console.log('data ', data) - if(upadateData?.dmdInfoPk){ - console.log('data ', data) - await updateDemandCompany(data as DemandCompType) + rtnInputData={async (data) => { + const con = + objSearch.sgg && objSearch.sgg !== "0" + ? objSearch.sgg + : objSearch.city; + console.log("data ", data); + if (upadateData?.dmdInfoPk) { + console.log("data ", data); + await updateDemandCompany(data as DemandCompType); coSttnInit("1", "13", String(con)); - setIsDmdModal({ isMoal: false, data: data as DemandCompType }); - }else{ - const dmd= await getFetch(fetchType.WR,`/reuseFc/request/${data.dmdInfoPk}`) - if(dmd) { - toast.error(`사업자번호 ${dmd.dmdInfoPk}는 이미 등록되었습니다. 다시등록해주세요`) - return - } - await regDemandCompany(data as DemandCompType); - coSttnInit("1", "13", String(con)); - setIsDmdModal({ isMoal: false, data: data as DemandCompType }); + setIsDmdModal({ + isMoal: false, + data: data as DemandCompType, + }); + } else { + const dmd = await getFetch( + fetchType.WR, + `/reuseFc/request/${data.dmdInfoPk}` + ); + if (dmd) { + toast.error( + `사업자번호 ${dmd.dmdInfoPk}는 이미 등록되었습니다. 다시등록해주세요` + ); + return; + } + await regDemandCompany(data as DemandCompType); + coSttnInit("1", "13", String(con)); + setIsDmdModal({ + isMoal: false, + data: data as DemandCompType, + }); } - - }} bodyClassNm={"w-full mx-auto bg-white rounded-lg shadow-md p-6"} updateList={upadateData} diff --git a/apps/wr/app/matMng/coMng/drgtSttn/page.tsx b/apps/wr/app/matMng/coMng/drgtSttn/page.tsx index 55dbeb454..e11b59f16 100644 --- a/apps/wr/app/matMng/coMng/drgtSttn/page.tsx +++ b/apps/wr/app/matMng/coMng/drgtSttn/page.tsx @@ -27,8 +27,8 @@ export default function DrgtSttn() { data: customDrgt | undefined; }>({ data: undefined, isOpen: false }); - const cellClick = (index: number | undefined, headId: string) => { - if (fromDate && toDate) { + const cellClick = (index: number) => { + if (fromDate && toDate && drgtRes[index]) { drgtModalSearch(fromDate, toDate, drgtRes[index].sggNm); } else { toast.error("조회기간을 선택해주세요."); diff --git a/packages/common/business_components/src/ui/sdmInsertForm/form.tsx b/packages/common/business_components/src/ui/sdmInsertForm/form.tsx index e58592837..a28b36b8c 100644 --- a/packages/common/business_components/src/ui/sdmInsertForm/form.tsx +++ b/packages/common/business_components/src/ui/sdmInsertForm/form.tsx @@ -1,11 +1,10 @@ -import React from 'react'; -import { FormField } from "../form"; -import { SelectBox } from "../select"; -import { Input } from "@common/components"; -import { FormUi } from "../form_ui"; -import { useCallback, useEffect, useState } from "react"; +import { Input } from "@common/components"; import { AsYouType } from "libphonenumber-js"; +import React, { useCallback, useEffect, useState } from 'react'; import type { ControllerRenderProps, UseFormReturn } from "react-hook-form"; +import { FormField } from "../form"; +import { FormUi } from "../form_ui"; +import { SelectBox } from "../select"; import { SdmSearchForm } from "./sdmNameBox"; // 수요처 정보 @@ -54,7 +53,6 @@ interface FormSchema { daddr: string; telno: string; bznmTotNo?: string; - rgtr?: string; dmdAplyPswd?: string; dmdAplyPswdConfirm?: string; }