From 01b74db164bc774d50ecc9bb2897dd4fc9eff689 Mon Sep 17 00:00:00 2001 From: basssy Date: Thu, 6 Feb 2025 10:26:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=ED=83=AD=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=EC=8B=9C=20=EC=A1=B0=EA=B1=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 68 +++++++++++++----------- src/hooks/usePlan.js | 4 +- 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index 12cb0bf8..a8a191b2 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -184,7 +184,8 @@ export default function CanvasMenu(props) { promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => { if (res.status === 200) { const estimateDetail = res.data - if (estimateDetail.tempFlg === '0' && estimateDetail.estimateDate !== null) { + // if (estimateDetail.tempFlg === '0' && estimateDetail.estimateDate !== null) { + if (estimateDetail.estimateDate !== null) { setMenuNumber(menu.index) setCurrentMenu(menu.title) setFloorPlanObjectNo({ floorPlanObjectNo: objectNo }) @@ -215,9 +216,10 @@ export default function CanvasMenu(props) { setMenuNumber(menu.index) setCurrentMenu(menu.title) } - if (pathname !== '/floor-plan') { - if (menu.index !== 0) { + // if (menu.index !== 0 ) { + //견적서 or 발전시뮬레이션 탭에서 같은 탭 클릭시 화면 이동했다 돌아오지않도록.. + if (menu.index !== 0 && menu.index !== 5 && menu.index !== 6) { router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`) } } @@ -372,39 +374,45 @@ export default function CanvasMenu(props) { useEffect(() => { if (isObjectNotEmpty(estimateRecoilState)) { - if (estimateRecoilState?.createUser === 'T01') { - if (sessionState.storeId !== 'T01') { - setButtonStyle1('none') - setButtonStyle2('none') - setButtonStyle3('none') - setButtonStyle4('none') - setButtonStyle5('none') - } - } else { - if (estimateRecoilState?.tempFlg === '1') { - setButtonStyle1('none') - setButtonStyle2('') - setButtonStyle3('none') - setButtonStyle4('none') - setButtonStyle5('none') - } else { - if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') { - setButtonStyle1('') - setButtonStyle2('') - setButtonStyle3('') - setButtonStyle4('') - setButtonStyle5('') - } else { - setButtonStyle1('') + if (estimateRecoilState?.createUser && estimateRecoilState?.tempFlg && estimateRecoilState.lockFlg) { + if (estimateRecoilState?.createUser === 'T01') { + if (sessionState.storeId !== 'T01') { + setButtonStyle1('none') setButtonStyle2('none') setButtonStyle3('none') - setButtonStyle4('') - setButtonStyle5('') + setButtonStyle4('none') + setButtonStyle5('none') + } + } else { + if (isObjectNotEmpty(estimateRecoilState)) { + if (estimateRecoilState?.tempFlg && estimateRecoilState.lockFlg) { + if (estimateRecoilState?.tempFlg === '1') { + setButtonStyle1('none') + setButtonStyle2('') + setButtonStyle3('none') + setButtonStyle4('none') + setButtonStyle5('none') + } else { + if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') { + setButtonStyle1('') + setButtonStyle2('') + setButtonStyle3('') + setButtonStyle4('') + setButtonStyle5('') + } else { + setButtonStyle1('') + setButtonStyle2('none') + setButtonStyle3('none') + setButtonStyle4('') + setButtonStyle5('') + } + } + } } } } } - }, [estimateRecoilState.tempFlg, estimateRecoilState.lockFlg]) + }, [estimateRecoilState?.createUser, estimateRecoilState?.tempFlg, estimateRecoilState?.lockFlg]) /** * 견적서 잠금 / 해제 diff --git a/src/hooks/usePlan.js b/src/hooks/usePlan.js index dd3c2739..d9dbfaaa 100644 --- a/src/hooks/usePlan.js +++ b/src/hooks/usePlan.js @@ -238,7 +238,9 @@ export function usePlan(params = {}) { if (res.status === 200) { const estimateDetail = res.data if (pathname === '/floor-plan/estimate/5') { - if (estimateDetail.tempFlg === '0' && estimateDetail.estimateDate !== null) { + // 견적서 이동 조건 수정 + // if (estimateDetail.tempFlg === '0' && estimateDetail.estimateDate !== null) { + if (estimateDetail.estimateDate !== null) { res.data.resetFlag = 'N' if (res.data.itemList.length > 0) { From 4ef736015fa241d3ceff9220d91e2d84b1e9e9c3 Mon Sep 17 00:00:00 2001 From: LEEYONGJAE Date: Thu, 6 Feb 2025 10:33:09 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=B0=9C=EC=A0=84=EC=8B=9C=EB=AE=AC?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=ED=83=AD=20=EC=9D=B4=EB=8F=99=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 2 +- src/hooks/usePlan.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index a8a191b2..68808aa9 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -200,7 +200,7 @@ export default function CanvasMenu(props) { promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => { if (res.status === 200) { const estimateDetail = res.data - if (estimateDetail.tempFlg === '0') { + if (estimateDetail.estimateDate !== null) { setMenuNumber(menu.index) setCurrentMenu(menu.title) router.push(`/floor-plan/simulator/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`) diff --git a/src/hooks/usePlan.js b/src/hooks/usePlan.js index d9dbfaaa..d560dec1 100644 --- a/src/hooks/usePlan.js +++ b/src/hooks/usePlan.js @@ -265,7 +265,7 @@ export function usePlan(params = {}) { } } else { // 발전시뮬레이션 - if (estimateDetail.tempFlg === '0') { + if (estimateDetail.estimateDate !== null) { setCurrentCanvasPlan(plans.find((plan) => plan.id === newCurrentId)) setPlans((plans) => plans.map((plan) => ({ ...plan, isCurrent: plan.id === newCurrentId }))) } else {