From fb9ed9949d8e6ce229527ca8e8f4bb6b9335f6e4 Mon Sep 17 00:00:00 2001 From: ysCha Date: Mon, 21 Jul 2025 15:36:23 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[1196]=20=EC=9D=BC=EC=8B=9C=EC=A0=81?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=202=EC=B0=A8=EC=A0=90=20=EC=88=A8=EA=B9=80?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/estimate/Estimate.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index 2fe098cf..4a3337db 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -1458,7 +1458,7 @@ export default function Estimate({}) { - {session?.storeLvl === '1' && agencyCustList.length > 0 ? ( + {session?.storeLvl === '100000' && agencyCustList.length > 0 ? ( //일시적으로 1 => 100000로 정리
From ef607afcf389bc2f8a100c9113380d478a963438 Mon Sep 17 00:00:00 2001 From: ysCha Date: Tue, 22 Jul 2025 09:07:16 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[1196]=20=EC=9E=90=EB=8F=99=ED=9A=8C?= =?UTF-8?q?=EB=A1=9C=EA=B5=AC=EC=84=B1=EC=8B=9C=20=ED=9A=8C=EB=A1=9C?= =?UTF-8?q?=EA=B5=AC=EC=84=B1=ED=9B=84=20=EB=82=A8=EB=8A=94=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=EC=97=90=EB=8C=80=ED=95=B4=20=EC=96=BC=EB=9F=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../floor-plan/modal/circuitTrestle/step/StepUp.jsx | 11 +++++++++-- src/locales/ja.json | 1 + src/locales/ko.json | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx index 5b706264..b0222aa3 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx @@ -109,6 +109,7 @@ export default function StepUp(props) { /** 캔버스에 회로 정보 적용 */ // 병설일때 pcs 있으면 setSubOpsions, 없으면 setMainOptions console.log('stepUpListData', stepUpListData) + let mChk = 0; stepUpListData[0].pcsItemList.forEach((pcsItem, index) => { const optionList = formatOptionCodes(pcsItem.optionList) if (isMultiOptions()) { @@ -164,6 +165,8 @@ export default function StepUp(props) { targetModule.pcsItemId = module.pcsItemId targetModule.circuitNumber = module.circuit canvas.add(moduleCircuitText) + } else { + mChk++; } }) }) @@ -172,6 +175,10 @@ export default function StepUp(props) { canvas.renderAll() setModuleStatisticsData() + + if (mChk > 0) { + swalFire({ text: getMessage('modal.circuit.trestle.setting.step.up.allocation.module.over.count') }) + } } else { swalFire({ text: getMessage('common.message.send.error') }) } @@ -467,7 +474,7 @@ export default function StepUp(props) { module.pcsItemId = null }) - /** 선택된 모듈 목록 추가 */ + /** 선택된 모듈 목록 추가 */ selectedData.roofSurfaceList.forEach((roofSurface) => { const targetSurface = canvas.getObjects().filter((obj) => obj.id === roofSurface.roofSurfaceId)[0] const moduleIds = targetSurface.modules.map((module) => { @@ -516,7 +523,7 @@ export default function StepUp(props) { canvas.renderAll() setModuleStatisticsData() - } + } /** * 현재 선택된 값들을 가져오는 함수 추가 diff --git a/src/locales/ja.json b/src/locales/ja.json index 5cd08828..ec579c8e 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -197,6 +197,7 @@ "modal.circuit.trestle.setting.step.up.allocation.circuit.amount": "昇圧回路数", "modal.circuit.trestle.setting.step.up.allocation.option": "昇圧オプション", "modal.circuit.trestle.setting.step.up.allocation.select.monitor": "オプションを選択", + "modal.circuit.trestle.setting.step.up.allocation.module.over.count": "一部モジュールに回路を構成できません", "plan.menu.module.circuit.setting.plan.orientation": "図面方位の適用", "plan.menu.estimate": "見積書", "plan.menu.estimate.roof.alloc": "屋根面の割り当て", diff --git a/src/locales/ko.json b/src/locales/ko.json index 19864ac4..de8f56c2 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -197,6 +197,7 @@ "modal.circuit.trestle.setting.step.up.allocation.circuit.amount": "승압회로수", "modal.circuit.trestle.setting.step.up.allocation.option": "승압옵션", "modal.circuit.trestle.setting.step.up.allocation.select.monitor": "옵션선택", + "modal.circuit.trestle.setting.step.up.allocation.module.over.count": "일부 모듈에서는 회로를 구성할 수 없습니다.", "plan.menu.module.circuit.setting.plan.orientation": "도면 방위 적용", "plan.menu.estimate": "견적서", "plan.menu.estimate.roof.alloc": "지붕면 할당",