diff --git a/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx b/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx index 3685d932a..d48c24960 100644 --- a/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx +++ b/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx @@ -1,6 +1,7 @@ "use client"; import { useWrStore } from "@/app/store"; +import { btnClass } from "@/app/store/common/code"; import { usageProcData } from "@/app/store/matDmd/coMatRvw/headList"; import { DmdCoReqSchema, @@ -148,9 +149,12 @@ export default function CoMatRvw() { const getSelCity = (val: string | number) => { const cityValue = String(val); // Ensure val is treated as a string - const data = getCity(cityValue, code.sggCd); + const data = + cityValue === "0" + ? [{ val: "0", text: "전체" }] + : getCity(cityValue, code.sggCd); setSelectSgg(data); - setObjSearch({ city: cityValue, sgg: "" }); + setObjSearch({ city: cityValue, sgg: "0" }); }; const getSgg = (val: string | number) => { @@ -191,6 +195,7 @@ export default function CoMatRvw() { selectClass={""} selectArray={code.cityCd || []} onSelectValue={getSelCity} + value={objSearch.city} />
@@ -241,7 +247,7 @@ export default function CoMatRvw() {
-
diff --git a/apps/wr/app/(with-layout)/matMng/coMng/coSttn/page.tsx b/apps/wr/app/(with-layout)/matMng/coMng/coSttn/page.tsx index fb1ed639e..f5104154f 100644 --- a/apps/wr/app/(with-layout)/matMng/coMng/coSttn/page.tsx +++ b/apps/wr/app/(with-layout)/matMng/coMng/coSttn/page.tsx @@ -69,7 +69,10 @@ export default function CoSttn() { const getSelCity = useCallback( (val: string | number) => { const cityValue = String(val); - const data = getCity(cityValue, code.sggCd); + const data = + cityValue === "0" + ? [{ val: "0", text: "전체" }] + : getCity(cityValue, code.sggCd); setSelectSgg(data); // 시/도를 변경하면 시/군/구는 '전체'("0")로 초기화합니다. setObjSearch({ city: cityValue, sgg: "0" }); @@ -216,11 +219,10 @@ export default function CoSttn() {
-
{ - setIsChHead(!isChHead); - }} + onOpenChange={() => setIsChHead(!isChHead)} bodyClass={""} body={ setIsChHead(false)} /> } /> @@ -305,7 +302,7 @@ export default function RainSttn() { onOpenChange={() => { setDetailModal({ ...detailModal, isOpen: !detailModal.isOpen }); }} - bodyClass={"w-[40vw] max-w-none max-h-[calc(100%-70px)]"} + bodyClass={"w-[40vw] max-w-none max-h-[calc(100%-70px)] overflow-y-auto"} body={} /> @@ -313,4 +310,3 @@ export default function RainSttn() { ); } - diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rswtSttn/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rswtSttn/page.tsx index 99b0219ef..fb1aecd7d 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rswtSttn/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/rswtSttn/page.tsx @@ -188,7 +188,7 @@ export default function RswtSttn() { className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2 ">
-
diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx index 87d89d6c5..8f093fea9 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx @@ -1,5 +1,6 @@ "use client"; import { useWrStore } from "@/app/store"; +import { btnClass } from "@/app/store/common/code"; import { excelToPbnPrfData } from "@/app/store/prfmncReg/pbnstPrfmncReg/excel"; import { initValInUsage, @@ -230,8 +231,8 @@ export default function PrfmncPrfmncReg() {
-
-