diff --git a/src/common/common.js b/src/common/common.js
index 1452aa3a..ca472a11 100644
--- a/src/common/common.js
+++ b/src/common/common.js
@@ -116,6 +116,15 @@ export const POLYGON_TYPE = {
OBJECT_SURFACE: 'objectOffset',
}
+// 가대 관련 상수
+export const TRESTLE_MATERIAL = {
+ EAVE_BAR: 'eaveBar',
+ HALF_EAVE_BAR: 'halfEaveBar',
+ RACK: 'rack',
+ SMART_RACK: 'smartRack',
+ BRACKET: 'bracket',
+}
+
export const SAVE_KEY = [
'selectable',
'name',
diff --git a/src/components/floor-plan/CanvasFrame.jsx b/src/components/floor-plan/CanvasFrame.jsx
index 6f0ac28c..6e302fa1 100644
--- a/src/components/floor-plan/CanvasFrame.jsx
+++ b/src/components/floor-plan/CanvasFrame.jsx
@@ -67,7 +67,7 @@ export default function CanvasFrame() {
useEffect(() => {
loadCanvas()
resetRecoilData()
- Object.keys(currentCanvasPlan).length > 0 && handleModuleSelectionTotal()
+ Object.keys(currentCanvasPlan).length > 0 && canvas && handleModuleSelectionTotal()
/* 플랜번호가 있으면 베이직세팅 팝업 데이터 로드 */
if (currentCanvasPlan.planNo) {
diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx
index 9c2db6bd..515ff459 100644
--- a/src/components/floor-plan/CanvasMenu.jsx
+++ b/src/components/floor-plan/CanvasMenu.jsx
@@ -410,7 +410,7 @@ export default function CanvasMenu(props) {
(['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.type === 'outline') ||
(selectedMenu === 'module' && ['drawing', 'placement'].includes(menu.type)) ||
(isExistModule() && ['placement', 'outline'].some((num) => num === menu.type)) ||
- (['estimate', 'simulation'].includes(selectedMenu) && ['drawing', 'placement', 'outline', 'surface'].includes(menu.type))
+ (['estimate', 'simulation'].includes(selectedMenu) && ['placement', 'outline', 'surface'].includes(menu.type))
)
}
diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx
index aacaeea4..0c825c20 100644
--- a/src/components/management/StuffDetail.jsx
+++ b/src/components/management/StuffDetail.jsx
@@ -1625,17 +1625,6 @@ export default function StuffDetail() {
input.value = input.value.replace(/[^0-9]/g, '')
}
- //자동완성 옵션 없을때 메세지 컴포넌트..
- const NoOptionsMessage = (props) => {
- return (
-
-
- TEXTTTTTTT
-
-
- )
- }
-
// 그리드 더블 클릭 해당플랜의 도면작성 화면으로 이동
const getCellDoubleClicked = (params) => {
if (managementState?.createSaleStoreId === 'T01') {
@@ -1653,7 +1642,13 @@ export default function StuffDetail() {
pid: planNo,
objectNo: objectNo,
}
- setSelectedMenu(null)
+ // 견적서 생성 여부에 따라 selectedMenu 셋팅
+ if (params?.data?.estimateDate) {
+ setSelectedMenu('module')
+ } else {
+ setSelectedMenu('surface')
+ }
+
const url = `/floor-plan?${queryStringFormatter(param)}`
router.push(url)
}
@@ -1946,7 +1941,6 @@ export default function StuffDetail() {