From ed69943dc6386b8c203cd3c23d35aee906828aff Mon Sep 17 00:00:00 2001 From: ysCha Date: Mon, 14 Apr 2025 15:01:18 +0900 Subject: [PATCH] =?UTF-8?q?975-=20=EC=95=84=EC=9D=B4=ED=85=9C(=EC=96=91?= =?UTF-8?q?=EB=8B=A8=EC=BC=80=EC=9D=B4=EB=B8=94)=20=ED=83=80=EC=9E=85=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20=EC=95=84=EC=9D=B4=ED=85=9C=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/estimate/Estimate.jsx | 8 ++++---- src/hooks/floorPlan/estimate/useEstimateController.js | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index e2c6c088..aa11943e 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -717,7 +717,7 @@ export default function Estimate({}) { /* 케이블 select 변경시 */ const onChangeDisplayCableItem = (value, itemList) => { itemList.map((item, index) => { - if (item.dispCableFlg === '1') { + if (item.dispCableFlg === '1' && item.itemTpCd !== 'M12') { if (value !== '') { onChangeDisplayItem(value, item.dispOrder, index, true) } @@ -1146,7 +1146,7 @@ export default function Estimate({}) { dispCableFlgCnt++ } - if (item.dispCableFlg === '1') { + if (item.dispCableFlg === '1' && item.itemTpCd !== 'M12') { setCableItem(item.itemId) } } @@ -1968,13 +1968,13 @@ export default function Estimate({}) { getOptionValue={(x) => x.clRefChr1} components={{ SingleValue: ({ children, ...props }) => { - return {props.data.clRefChr3} + return {(item.itemTpCd === 'M12')? item.itemName : props.data.clRefChr3} }, }} isClearable={false} isDisabled={true} value={cableItemList.filter(function (option) { - return option.clRefChr1 === item.itemId + return (item.itemTpCd === 'M12')? item.itemId : option.clRefChr1 === item.itemId })} /> )} diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js index 2e0bbe1a..34ac80fb 100644 --- a/src/hooks/floorPlan/estimate/useEstimateController.js +++ b/src/hooks/floorPlan/estimate/useEstimateController.js @@ -130,6 +130,7 @@ export const useEstimateController = (planNo, flag) => { addFlg: true, paDispOrder: null, dispCableFlg: '0', + itemTpCd:'', }, ], })