diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx
index d77f4d7f0..bb1cade10 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx
@@ -50,7 +50,7 @@ export const pbnstOrgwtHeadListRxport: TableUpperProps[] = [
{ id: "orgwtWtritQnt", title: "원수취수량" },
{ id: "tmsYn", title: "하수처리량TMS 전후" },
{ id: "dschgFmYn", title: "하수처리장 방류 유량계 전·후" },
- { id: "dtlPstnExpln", title: "상세위치 설명" },
+ { id: "dtlPstnExpln", title: "상세위치", edit: true },
];
export const fcOrgwtsHeadListExport: TableUpperProps[] = [
{ id: "choose", title: "선택", type: "checkbox" },
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx
index e4bedff60..66c8c4dc8 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx
@@ -124,6 +124,7 @@ if(searchTxt){
const hasuList = rainRes.data.map((item: any) => {
return {
...item,
+ fctCpc: Number(item.fctCpc) || 0,
ruse: item.ruse === false ? "N" : "Y",
};
});
@@ -181,6 +182,7 @@ export const pubFacActionsExport: (set: any) => pubFacActions = (set: any) => {
const pbnstHasuRes = await hasuListFetch(page, sggOrCity);
+
return set((state: pubFacState) => ({
...state,
pbnst: {
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 e1454342b..b1bbffc34 100644
--- a/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegForm.tsx
@@ -64,7 +64,7 @@ export function PbnstMngForm({
const {
fields: fcOpersField,
- append,
+ prepend,
remove,
} = useFieldArray({
control: form.control,
@@ -77,7 +77,7 @@ export function PbnstMngForm({
});
const plusHist = () => {
- append({
+ prepend({
choose: false,
pbnstRuseFcltFk:
form.getValues(`items.${indexMng}.pbnstRuseFcltPk`) ?? "",
@@ -310,42 +310,43 @@ export function PbnstMngForm({
+ {/*
*/}
+
+
재이용시설 운영정보
+ {formType === "sttn" ? (
+ <>>
+ ) : (
+
+
+
+
+ )}
+
-
-
재이용시설 운영정보
- {formType === "sttn" ? (
- <>>
- ) : (
-
-
-
-
- )}
-
{
- return {
- ...item,
- readonly: true,
- };
- })
+ return {
+ ...item,
+ readonly: true,
+ };
+ })
: pbnst.pbnstMngUpHeadList
}
upHeadList={pbnst.pbnstMngNm}
@@ -356,7 +357,7 @@ export function PbnstMngForm({
indexMng={indexMng}
form={form}
formNm={"fcOpers"}
- // ref={ref}
+ // ref={ref}
>
diff --git a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx
index 7333f6091..bc3a6a74d 100644
--- a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx
@@ -13,7 +13,7 @@ import {
} from "@/components/lib/func/commom";
import { DatePicker, FormUi } from "@common/business_components";
import { Form, FormField, SelectBox } from "@common/business_components/ui";
-import { Button, Checkbox, Input, Label } from "@common/components/ui";
+import { Button, Checkbox, Input, Label, ScrollArea } from "@common/components/ui";
import { zodResolver } from "@hookform/resolvers/zod";
import { useEffect, useState } from "react";
import { useForm } from "react-hook-form";
@@ -158,6 +158,7 @@ export default function RainRegForm({
)}
+
{isModal && rainForm != undefined ? : <>>}
{isModal ? (
@@ -583,6 +584,7 @@ export default function RainRegForm({
/>
+
diff --git a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
index c534c38af..25e5ef976 100644
--- a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
+++ b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
@@ -114,7 +114,7 @@ export function BdstReg({ moType,setIsModal,isModal }: BdstReg
>
{" "}
-
+
setSearchTxt(e.target.value)}/>
@@ -142,7 +142,7 @@ export function BdstReg({ moType,setIsModal,isModal }: BdstReg
-
+ {/* */}
{ moType === 'RNB'?
@@ -152,7 +152,7 @@ export function BdstReg({ moType,setIsModal,isModal }: BdstReg
}
-
+ {/* */}
>
);
diff --git a/apps/wr/components/ui/table/pbnstReg/ruseMngTableForm/ruseMngTableForm.tsx b/apps/wr/components/ui/table/pbnstReg/ruseMngTableForm/ruseMngTableForm.tsx
index 6f4832c68..e746ab1f5 100644
--- a/apps/wr/components/ui/table/pbnstReg/ruseMngTableForm/ruseMngTableForm.tsx
+++ b/apps/wr/components/ui/table/pbnstReg/ruseMngTableForm/ruseMngTableForm.tsx
@@ -76,20 +76,20 @@ const RuseMngTableForm = React.forwardRef(
{tableData.map((item, i) => (
-
+
{headList.map((head, j) => (
{}}
+ onClick={() => { }}
>
= 0 &&
- typeof indexBiz === "number" &&
- indexBiz >= 0
+ indexMng >= 0 &&
+ typeof indexBiz === "number" &&
+ indexBiz >= 0
? `items.${indexMng}.fcBizs.${indexBiz}.${formNm}.${i}.${head.id}`
: typeof indexMng === "number" && indexMng >= 0
? `items.${indexMng}.${formNm}.${i}.${head.id}`
@@ -134,7 +134,7 @@ const RuseMngTableForm = React.forwardRef(
}
}}
readOnly={head.readonly ? true : false}
- // Disabled prop removed as SelectBox does not support it
+ // Disabled prop removed as SelectBox does not support it
>
) : head.type === "date" ? (