From 225bae08d32387394b8b47ba9b7a2b0dcdde8bd6 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Tue, 22 Jul 2025 13:09:20 +0900 Subject: [PATCH] =?UTF-8?q?readOnly=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ruseFcltMng/fcltReg/pbnstReg/page.tsx | 1 + .../fcltReg/pbnstReg/buseReg/bugRegForm.tsx | 2 +- .../buseWaterQulity/buseWaterQulity.tsx | 30 +++++------ .../fcltReg/pbnstReg/mngReg/mngRegForm.tsx | 10 ++-- .../fcltReg/pbnstRegModal/pbnstRegModal.tsx | 1 + .../sttn/pbnstSttnModal/pbnstSttnModal.tsx | 51 ++++++++++--------- .../sttn/sttnDetailModal/coDatailModal.tsx | 6 +-- 7 files changed, 54 insertions(+), 47 deletions(-) diff --git a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx index 5a962fc0a..614a8f90e 100644 --- a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx @@ -364,6 +364,7 @@ export default function PublicReuseFaciltyInsert() { setIndexMng(index); }} indexMng={indexMng} + readonly={false} /> diff --git a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx index 85fdd0c0b..5c1edb471 100644 --- a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx @@ -494,7 +494,7 @@ export function PbnstBuseForm({ sonClass="col-span-4" indexMng={indexMng} indexBiz={indexBiz} - formType={""} + readonly={false} /> diff --git a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/buseWaterQulity/buseWaterQulity.tsx b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/buseWaterQulity/buseWaterQulity.tsx index cba4c4c81..121957b8e 100644 --- a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/buseWaterQulity/buseWaterQulity.tsx +++ b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/buseWaterQulity/buseWaterQulity.tsx @@ -13,7 +13,7 @@ export function BuseWaterQulity({ sonClass, indexMng, indexBiz, - formType, + readonly, }: { form: UseFormReturn<{ items: PbnstRegArrrayType }>; h1Title: string; @@ -22,7 +22,7 @@ export function BuseWaterQulity({ sonClass: string; indexMng: number; indexBiz: number; - formType?: string; + readonly?: boolean; }) { const [frontPHdata, setFrontPHdata] = useState("0"); const [backPHdata, setBackPHdata] = useState("0"); @@ -131,7 +131,7 @@ export function BuseWaterQulity({ ? `${field.value}` : "" } - readOnly={formType === "sttn" ? true : false} + readOnly={readonly} maxLength={6} /> @@ -168,7 +168,7 @@ export function BuseWaterQulity({ ? `${field.value}` : "" } - readOnly={formType === "sttn" ? true : false} + readOnly={readonly} maxLength={6} /> {/* TODO: 총대장균군수 확인 필요*/} @@ -203,7 +203,7 @@ export function BuseWaterQulity({ ? `${field.value}` : "" } - readOnly={formType === "sttn" ? true : false} + readOnly={readonly} maxLength={6} /> @@ -237,7 +237,7 @@ export function BuseWaterQulity({ ? `${field.value}` : "" } - readOnly={formType === "sttn" ? true : false} + readOnly={readonly} maxLength={6} /> @@ -267,7 +267,7 @@ export function BuseWaterQulity({ field.onChange(String(e.target.value)); }} value={field.value ?? ""} - readOnly={formType === "sttn" ? true : false} + readOnly={readonly === "sttn" ? true : false} maxLength={txtSize} /> */} { field.onChange(val); }} @@ -310,7 +310,7 @@ export function BuseWaterQulity({ ? `${field.value}` : "" } - readOnly={formType === "sttn" ? true : false} + readOnly={readonly} maxLength={6} /> @@ -344,7 +344,7 @@ export function BuseWaterQulity({ ? `${field.value}` : "" } - readOnly={formType === "sttn" ? true : false} + readOnly={readonly} maxLength={6} /> @@ -379,7 +379,7 @@ export function BuseWaterQulity({ ? `${field.value}` : "" } - readOnly={formType === "sttn" ? true : false} + readOnly={readonly} maxLength={6} /> @@ -413,7 +413,7 @@ export function BuseWaterQulity({ ? `${field.value}` : "" } - readOnly={formType === "sttn" ? true : false} + readOnly={readonly} maxLength={7} /> @@ -448,7 +448,7 @@ export function BuseWaterQulity({ ? `${field.value}` : "" } - readOnly={formType === "sttn" ? true : false} + readOnly={readonly} maxLength={7} /> @@ -472,7 +472,7 @@ export function BuseWaterQulity({ isSetFrontPh(e.target.value) } value={frontPHdata ?? ""} - readOnly={formType === "sttn"} + readOnly={readonly} maxLength={3} /> ~ @@ -484,7 +484,7 @@ export function BuseWaterQulity({ isSetBackPh(e.target.value); }} value={backPHdata ?? ""} - readOnly={formType === "sttn"} + readOnly={readonly} maxLength={3} /> diff --git a/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegForm.tsx b/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegForm.tsx index ee3fe8363..f7355bfd9 100644 --- a/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegForm.tsx @@ -41,11 +41,13 @@ export function PbnstMngForm({ formType, indexMng, setIndexMng, + readonly }: { form: UseFormReturn<{ items: PbnstRegArrrayType }>; formType: string; indexMng: number; setIndexMng: (index: number) => void; + readonly:boolean }) { const { code, pbnst, fileDelete, fileDownLoad } = useWrStore( (state) => state @@ -293,7 +295,7 @@ export function PbnstMngForm({ field.onChange(String(e.target.value)); }} value={field.value ?? ""} - readOnly={formType === "sttn" ? true : false} + readOnly={readonly} maxLength={txtSize} /> @@ -374,7 +376,7 @@ export function PbnstMngForm({ handleCommaNumberChange(e, field.onChange); }} value={formatCommaNumber(field.value)} - readOnly={formType === "sttn" ? true : false} + readOnly={readonly} /> )} @@ -398,7 +400,7 @@ export function PbnstMngForm({ handleCommaNumberChange(e, field.onChange); }} value={formatCommaNumber(field.value)} - readOnly={formType === "sttn" ? true : false} + readOnly={readonly} /> )} @@ -421,7 +423,7 @@ export function PbnstMngForm({ handleCommaNumberChange(e, field.onChange); }} value={formatCommaNumber(field.value)} - readOnly={formType === "sttn" ? true : false} + readOnly={readonly} /> )} diff --git a/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx index 8275e472b..c0cbdda30 100644 --- a/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx +++ b/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx @@ -99,6 +99,7 @@ export function PbnstRegModal({ formType={"reg"} indexMng={indexMng} setIndexMng={setIndexMng} + readonly={false} /> diff --git a/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx b/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx index 20a13dc31..b23a52056 100644 --- a/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx +++ b/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx @@ -35,7 +35,7 @@ import { useForm } from "react-hook-form"; import { z } from "zod"; export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titleVisible?: boolean }) { - const { pbnstSttn, prfmnc , pbnstPrfmncSttn} = useWrStore((state) => state); + const { pbnstSttn, prfmnc, pbnstPrfmncSttn } = useWrStore((state) => state); const [fcltTab, setFcltTab] = useState("fclt"); const [ruseTab, setRuseTab] = useState("totalPrf"); const [ruseHeadList, setRuseHeadList] = useState([]); @@ -67,10 +67,10 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl cusrAlotm: item.cusrAlotm ?? "-", etc: item.etc ?? "-", totalMoney: - Number(item.addr) + Number(item.gvsbs) + Number(item.lcep) + - Number(item.cusrAlotm), + Number(item.cusrAlotm) + + (isNaN(Number(item.etc)) ? 0 : Number(item.etc)), instlAprvSncnDt: item.instlAprvSncnDt?.toISOString ?? "-", bizCmcnDay: item.bizCmcnDay?.toISOString ?? "-", rprcsFcltCpct: item.rprcsFcltCpct ?? "-", @@ -167,8 +167,8 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl const getTablePrfData = (prfList: PrfType[]) => { const inUsageData = structuredClone(initValInUsage); const outUsageData = structuredClone(initValOutUsage); - const inSubtotal = structuredClone(subTotalObj); - const outSubtotal = structuredClone(subTotalObj); + const inSubtotal = { ...structuredClone(subTotalObj), 구분: "장내용수" }; + const outSubtotal = { ...structuredClone(subTotalObj), 구분: "장외용수" }; if (prfList) { prfList?.forEach((prfItem) => { @@ -216,7 +216,9 @@ 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, @@ -264,6 +266,7 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl formType={"sttn"} indexMng={indexMng} setIndexMng={setIndexMng} + readonly={true} />
@@ -300,8 +303,8 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl }} > {fcltTab === "fclt" ? ( - - ) : undefined} + + ) : undefined} @@ -323,22 +326,22 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl {prfData && ( - -
-

- {"하수처리수재이용 실적(m³) 등록결과"} -

-
- - - {headMakeprfmnc(pbnstPrfmncSttn.monthSttnHeadList, [])} - - - {InputTableBody(prfData[ruseTab as keyof typeof prfData] || [], pbnstPrfmncSttn.monthSttnHeadList, setPrfData as any)} - -
- - + +
+

+ {"하수처리수재이용 실적(m³) 등록결과"} +

+
+ + + {headMakeprfmnc(pbnstPrfmncSttn.monthSttnHeadList, [])} + + + {InputTableBody(prfData[ruseTab as keyof typeof prfData] || [], pbnstPrfmncSttn.monthSttnHeadList, setPrfData as any)} + +
+ + )} diff --git a/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx b/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx index 8ad5da057..1db650f09 100644 --- a/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx +++ b/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx @@ -421,11 +421,11 @@ export default function CoDetailModal({ { - field.onChange(e.target.value); + handleCommaNumberChange(e, field.onChange); }} - value={field.value ?? 0} + value={formatCommaNumber(field.value) ?? 0} min={0} readOnly={true} />