From 65a7126a591ceba1c75d1a99f553e450cd46cb51 Mon Sep 17 00:00:00 2001 From: basssy Date: Fri, 10 Jan 2025 10:48:35 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BA=94=EB=B2=84=EC=8A=A4=20=EB=A9=94?= =?UTF-8?q?=EB=89=B4=20=ED=83=AD=EC=97=90=20=EB=AC=BC=EA=B1=B4=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20&=20=EA=B2=AC=EC=A0=81=EC=84=9C=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=8F=99=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 21 +++++++++++++++++++-- src/locales/ja.json | 1 + src/locales/ko.json | 1 + 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index d61c29c6..91173b89 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -135,6 +135,15 @@ export default function CanvasMenu(props) { const onClickNav = (menu) => { switch (menu.index) { + case 0: + swalFire({ + text: getMessage('stuff.detail.move.confirmMsg'), + type: 'confirm', + confirmFn: () => { + router.push(`/management/stuff/detail?objectNo=${objectNo}`) + }, + }) + break case 1: setType('placementShape') onClickPlacementInitialMenu() @@ -153,6 +162,11 @@ export default function CanvasMenu(props) { case 4: setType('module') break + case 5: + setMenuNumber(menu.index) + setCurrentMenu(menu.title) + router.push(`/floor-plan/estimate/5?pid=${pid}&objectNo=${objectNo}`) + break case 6: promiseGet({ url: `/api/estimate/${objectNo}/${pid}/detail` }).then((res) => { if (res.status === 200) { @@ -169,12 +183,14 @@ export default function CanvasMenu(props) { break } - if (menu.index !== 6) { + if (menu.index !== 6 && menu.index !== 0) { setMenuNumber(menu.index) setCurrentMenu(menu.title) } - if (pathname !== '/floor-plan') router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`) + if (pathname !== '/floor-plan' && pathname !== '/floor-plan/estimate/5') { + router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`) + } } const changeSelectedRoofMaterial = (e) => { @@ -236,6 +252,7 @@ export default function CanvasMenu(props) { // 견적서 초기화 버튼 const handleEstimateReset = () => { + return alert('개발전입니다;;;') // console.log('estimateRecoilState::', estimateRecoilState) //objectNo, planNo swalFire({ diff --git a/src/locales/ja.json b/src/locales/ja.json index b589de1d..829c5e61 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -687,6 +687,7 @@ "stuff.detail.save.valierror2": "設置高さ0より大きい値を入力してください", "stuff.detail.save.valierror3": "{0} 必須入力項目です.", "stuff.detail.save.valierror4": "二次販売店名は必須オプションです.", + "stuff.detail.move.confirmMsg": "商品情報画面に移動します。 [保存]していない図面情報は削除されます。商品情報画面に移動しますか?", "stuff.planReqPopup.popTitle": "設計依頼検索", "stuff.planReqPopup.btn1": "検索", "stuff.planReqPopup.btn2": "初期化", diff --git a/src/locales/ko.json b/src/locales/ko.json index b85beaa0..2f7b3df6 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -697,6 +697,7 @@ "stuff.detail.save.valierror2": "설치높이는 0보다 큰 값을 입력하세요", "stuff.detail.save.valierror3": "{0} 필수 입력 항목입니다.", "stuff.detail.save.valierror4": "2차 판매점명은 필수 선택사항입니다.", + "stuff.detail.move.confirmMsg": "물건정보 화면으로 이동합니다. [저장]하지 않은 도면정보는 삭제됩니다. 물건정보 화면으로 이동하시겠습니까?", "stuff.planReqPopup.popTitle": "설계 의뢰 검색", "stuff.planReqPopup.btn1": "검색", "stuff.planReqPopup.btn2": "초기화",