diff --git a/apps/dm/.env.local b/apps/dm/.env.local index 47ff660f3..df18c9228 100644 --- a/apps/dm/.env.local +++ b/apps/dm/.env.local @@ -18,7 +18,7 @@ NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload NEXT_PUBLIC_NGII_URL = https://map.ngii.go.kr NEXT_PUBLIC_NGII_PARAM = 04trYP9_xwLAfALjwZ-B8g&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={x}&tilerow={y} NEXT_PUBLIC_GATEWAY_URL=http://con.mind-one.co.kr:11083 # 개발 서버 API -# NEXT_PUBLIC_GATEWAY_URL=http://localhost:8883 # 개발 서버 API # 박이정 +# NEXT_PUBLIC_GATEWAY_URL=http://localhost:8883 # 개발 서버 API NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do diff --git a/apps/dm/app/(with-layout)/apply/dmdco/page.tsx b/apps/dm/app/(with-layout)/apply/dmdco/page.tsx index 38b3941d1..4e8dc5195 100644 --- a/apps/dm/app/(with-layout)/apply/dmdco/page.tsx +++ b/apps/dm/app/(with-layout)/apply/dmdco/page.tsx @@ -1,3 +1,6 @@ +/** + * 수요처 등록/수정 + */ "use client"; import { useEffect, useMemo, useRef, useState, type ReactNode, type RefObject } from "react"; @@ -15,6 +18,7 @@ type SessionUser = { dmdCoNm?: string; zip?: string; daddr?: string; + daddr2?: string; telno?: string; ctpvCd?: string; sggCd?: string; @@ -170,7 +174,7 @@ export default function DemandPlaceRegisterPage() { const [company, setCompany] = useState(""); const [bizNo, setBizNo] = useState(""); const [workerNo, setWorkerNo] = useState(""); - const [noWorkerNo, setNoWorkerNo] = useState(false); + const [noWorkerNo, setNoWorkerNo] = useState(true); // 종사업자번호 해당없음 default 선택으로 설정 const [zip, setZip] = useState(""); const [addr1, setAddr1] = useState(""); @@ -218,7 +222,7 @@ export default function DemandPlaceRegisterPage() { setCompany(String(user.dmdCoNm ?? "")); setZip(String(user.zip ?? "")); setAddr1(String(user.daddr ?? "")); - setAddr2(""); + setAddr2(String(user.daddr2 ?? "")); setTel(formatKoreanPhoneNumber(String(user.telno ?? ""))); setSido(String(user.ctpvCd ?? "")); setSigungu(String(user.sggCd ?? "")); @@ -305,9 +309,11 @@ export default function DemandPlaceRegisterPage() { } } - const mergedAddress = [addr1.trim(), addr2.trim()].filter(Boolean).join(" "); - if (!mergedAddress) return alert("사업자주소를 입력해 주세요."); - if (mergedAddress.length > 40) return alert("주소는 40자 이내로 입력해주세요."); + const baseAddress = addr1.trim(); + const detailAddress = addr2.trim(); + if (!baseAddress && !detailAddress) return alert("사업자주소를 입력해 주세요."); + if (baseAddress.length > 40) return alert("주소는 40자 이내로 입력해주세요."); + if (detailAddress.length > 40) return alert("상세 주소는 40자 이내로 입력해주세요."); if (!telDigits) return alert("전화번호를 입력해 주세요."); if (!/^\d{8,11}$/.test(telDigits)) { @@ -341,7 +347,8 @@ export default function DemandPlaceRegisterPage() { dmdInfoId: fullDmdInfoId, bzmnNo: bizDigits, zip: zip.trim(), - daddr: mergedAddress, + daddr: baseAddress, + daddr2: detailAddress, telno: telDigits, rgtr: (sessionUser?.rgtr as string) || myUUID, }; diff --git a/apps/dm/app/(with-layout)/status/_components/RainStatusSection.tsx b/apps/dm/app/(with-layout)/status/_components/RainStatusSection.tsx index 34560ef75..90fd0520c 100644 --- a/apps/dm/app/(with-layout)/status/_components/RainStatusSection.tsx +++ b/apps/dm/app/(with-layout)/status/_components/RainStatusSection.tsx @@ -278,12 +278,12 @@ export default function RainStatusSection() {