From 0f07b885d5f04eaf4d7698d7f6df735bdb8d2ca7 Mon Sep 17 00:00:00 2001 From: basssy Date: Wed, 19 Feb 2025 15:27:57 +0900 Subject: [PATCH 1/3] =?UTF-8?q?docNo=EC=A0=95=EC=B1=85=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index a5fd5587..065a827e 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -498,16 +498,11 @@ export default function CanvasMenu(props) { estimateRecoilState.lockFlg = estimateRecoilState.lockFlg === '0' ? '1' : '0' const { createUser, tempFlg, lockFlg } = estimateRecoilState if (createUser && tempFlg && lockFlg) { - if (createUser === 'T01') { - if (sessionState.storeId !== 'T01') { - setAllButtonStyles('none') - } else { - setEstimateContextState({ tempFlg: estimateRecoilState.tempFlg, lockFlg: estimateRecoilState.lockFlg }) - handleButtonStyles(estimateRecoilState.tempFlg, estimateRecoilState.lockFlg) - } + if (createUser === 'T01' && sessionState.storeId !== 'T01') { + setAllButtonStyles('none') } else { setEstimateContextState({ tempFlg: estimateRecoilState.tempFlg, lockFlg: estimateRecoilState.lockFlg }) - handleButtonStyles(estimateRecoilState.tempFlg, estimateRecoilState.lockFlg) + handleButtonStyles(estimateRecoilState.tempFlg, estimateRecoilState.lockFlg, estimateContextState.docNo) } } } From c35bc134b80cccbfd2abceb8ae5227493d45d6d0 Mon Sep 17 00:00:00 2001 From: basssy Date: Wed, 19 Feb 2025 15:59:26 +0900 Subject: [PATCH 2/3] =?UTF-8?q?#754=20=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index 065a827e..cb46640e 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -215,9 +215,6 @@ export default function CanvasMenu(props) { setType('module') } } else { - //menuNumber가 모듈,회로 구성(4) 보다 큰 경우. (견적서:5, 발전시뮬:6) - //화면은 이동되는데 MenuDapth01 type이 null로 들어가서 모듈/가대설정, 회로설정 하위뎁스메뉴 안나오는 문제 수정 - setType('module') router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`) } await reloadCanvasStatus(objectNo, pid) From 074b405abacc898fcb491e7b19e2833260657bff Mon Sep 17 00:00:00 2001 From: basssy Date: Wed, 19 Feb 2025 16:38:02 +0900 Subject: [PATCH 3/3] =?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=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=B0=9C=EC=A0=84=EC=8B=9C=EB=AE=AC=EB=A0=88=EC=9D=B4=EC=85=98?= =?UTF-8?q?=20=ED=83=AD=20=EB=8B=A4=EC=8B=9C=20=EB=88=8C=EB=A0=80=EC=9D=84?= =?UTF-8?q?=EB=95=8C=20=EB=A1=9C=EB=94=A9=EB=B0=94=20=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 1 + src/components/management/StuffSearchCondition.jsx | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index cb46640e..b3b461b3 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -246,6 +246,7 @@ export default function CanvasMenu(props) { setMenuNumber(menu.index) setCurrentMenu(menu.title) router.push(`/floor-plan/simulator/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`) + setIsGlobalLoading(false) } else { setIsGlobalLoading(false) swalFire({ text: getMessage('simulator.menu.move.valid1') }) diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx index 58be659c..05c00a13 100644 --- a/src/components/management/StuffSearchCondition.jsx +++ b/src/components/management/StuffSearchCondition.jsx @@ -761,6 +761,15 @@ export default function StuffSearchCondition() { setSchSelSaleStoreId('') setOtherSaleStoreId('') } else { + setObjectNo(stuffSearch.schObjectNo ? stuffSearch.schObjectNo : objectNo) + setSaleStoreName(stuffSearch.schSaleStoreName ? stuffSearch.schSaleStoreName : saleStoreName) + setDispCompanyName(stuffSearch.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName) + setObjectName(stuffSearch.schObjectName ? stuffSearch.schObjectName : objectName) + setReceiveUser(stuffSearch.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser) + setAddress(stuffSearch.schAddress ? stuffSearch.schAddress : address) + setDateType(stuffSearch.schDateType ? stuffSearch.schDateType : dateType) + setStartDate(stuffSearch?.schFromDt ? stuffSearch.schFromDt : dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD')) + setEndDate(stuffSearch?.schToDt ? stuffSearch.schToDt : dayjs(new Date()).format('YYYY-MM-DD')) setTempFlg(stuffSearch.schTempFlg ? stuffSearch.schTempFlg : tempFlg) } } else {