From 8aaa8ae89b09df1dbb877c36ff5852f1c40d1d05 Mon Sep 17 00:00:00 2001 From: leedj312 Date: Tue, 27 May 2025 10:44:00 +0900 Subject: [PATCH] =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EC=9E=91=EC=97=85?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruseFcltMng/fcltReg/pbnstReg/headList.tsx | 5 ++++- .../ruseFcltMng/fcltReg/pbnstReg/type.tsx | 15 ++++++------- .../fcltReg/pbnstReg/mngReg/mngRegForm.tsx | 22 ++++++++----------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx index 5435ef8bf..a61b7552c 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx @@ -121,4 +121,7 @@ export const ruseWaterQulityList:formDetailType[]=[ {id:'ph' , lable:'수소이온농도'}, {id:'clIonQnt' , lable:'염화물(mg/L)'}, {id:'cdtnv' , lable:'전기전도도(μs/cm)​'}, -] \ No newline at end of file +] + + + diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx index 528f4c349..1aa1417e7 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx @@ -75,23 +75,23 @@ const fcOperSchema = z.object({ operMthd: z.string(), rprtvBzenty: z.string(), bgngDt: z.string(), - endDt: z.string(), + endDt: z.string().default("20250501"), regDt: z.date().nullish(), rgtr: z.string(), - mdfcnDt: z.date(), + mdfcnDt: z.date().nullish(), mdfr: z.string().default("test"), }); const fcOrgwtSchema = z.object({ pbnstRuseFcltBizFk: z.number().default(0), - swtrmtFcltFk: z.number().default(0), + swtrmtFcltFk: z.string().default(''), orgwtWtritQnt: z.string(), tmsYn: z.string(), dschgFmYn: z.string(), dtlPstnExpln: z.string(), - regDt: z.date().nullish(), + regDt: z.string().nullish(), rgtr: z.string(), - mdfcnDt: z.date().nullish(), + mdfcnDt: z.string().nullish(), mdfr: z.string(), }); @@ -414,7 +414,7 @@ export const exampleData = { fcOrgwts: [ { pbnstRuseFcltBizFk: 11, - swtrmtFcltFk: 1, + wtrmtFcltFk: "11000SW001R", orgwtWtritQnt: "152", tmsYn: "Y", dschgFmYn: "N", @@ -424,7 +424,7 @@ export const exampleData = { }, { pbnstRuseFcltBizFk: 11, - swtrmtFcltFk: 1, + wtrmtFcltFk: "11000SW001R", orgwtWtritQnt: "150", tmsYn: "Y", dschgFmYn: "N", @@ -445,7 +445,6 @@ export const exampleData = { operMthd: "위탁", rprtvBzenty: "기관명", bgngDt: "20230930", - mdfcnDt:"20231230", rgtr: TEST_UUID, mdfr: TEST_UUID, }, 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 247e66103..2028741de 100644 --- a/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegForm.tsx @@ -25,16 +25,6 @@ import { TusClientUpload } from "@/components/lib/useTus_wr/useTusWr"; import type { Upload } from "tus-js-client"; import { pbnstRegZod, type customPbnst, type fcltOperInfoType, type operType, type ruseFcltType } from "@/app/store/ruseFcltMng/fcltReg/pbnstReg/type"; -const formSchema = z.object({ - fcltNm: z.string().min(2).max(50), - psysScdg: z.string(), - designScdg: z.string(), - fcltCpct: z.number(), - swtrmtCpct: z.number(), - ruseCpct: z.number(), - splyExtraCpct: z.number(), -}); - export function PbnstMngForm({ data }: { data: customPbnst }) { const { pbnst, pbnstUpdate } = useWrStore((state) => state); const { pbnstMngUpHeadList} = pbnst; @@ -54,7 +44,7 @@ export function PbnstMngForm({ data }: { data: customPbnst }) { const form = useForm>({ resolver: zodResolver(pbnstRegZod), - defaultValues: {...data}, + defaultValues: pbnstRegZod.parse({}), }); const { fields: fcOpersField } = useFieldArray({ @@ -71,7 +61,10 @@ export function PbnstMngForm({ data }: { data: customPbnst }) { // 2. Define a submit handler. function onSubmit(values: z.infer) { - console.log(values); + + + console.log("onSubmit values", values); + console.log( ' 212 ', values); pbnstUpdate(values); } @@ -93,6 +86,9 @@ export function PbnstMngForm({ data }: { data: customPbnst }) { }, }); }; + useEffect(() => { + console.log("form errors:", form.formState.errors); + }, [form.formState.errors]); useEffect(() => { if (relationfiles && relationfiles[0]) @@ -120,7 +116,7 @@ export function PbnstMngForm({ data }: { data: customPbnst }) { {form.getValues("ruseUtztnFcltNm") ? ": " + form.getValues("ruseUtztnFcltNm") : ""} - +