From 610aa3433f61cef981189394a0036ae50e0495ff Mon Sep 17 00:00:00 2001 From: basssy Date: Mon, 9 Dec 2024 09:55:40 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EB=B4=84=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/estimate/Estimate.jsx | 4 ++++ src/components/management/StuffDetail.jsx | 24 ++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index 4f42af51..96749fb0 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -885,6 +885,10 @@ export default function Estimate({ params }) { item.showSalePrice = '0' item.showSaleTotPrice = '0' } + if (estimateContextState.estimateType === 'YJOD' && item.paDispOrder) { + item.showSalePrice = '0' + item.showSaleTotPrice = '0' + } }) } }, [itemChangeYn, estimateContextState.itemList]) diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index fce17748..bba99266 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -1403,15 +1403,21 @@ export default function StuffDetail() { alert(getMessage('stuff.detail.delete.message1')) } else { if (confirm(getMessage('common.message.data.delete'))) { - del({ url: `/api/object/${objectNo}?${queryStringFormatter(delParams)}` }).then(() => { - setFloorPlanObjectNo({ floorPlanObjectNo: '' }) - if (session.storeId === 'T01') { - stuffSearchParams.code = 'DELETE' - } else { - resetStuffRecoil() - } - router.push('/management/stuff', { scroll: false }) - }) + // setIsGlobalLoading(true) + del({ url: `/api/object/${objectNo}?${queryStringFormatter(delParams)}` }) + .then(() => { + setFloorPlanObjectNo({ floorPlanObjectNo: '' }) + if (session.storeId === 'T01') { + stuffSearchParams.code = 'DELETE' + } else { + resetStuffRecoil() + } + // setIsGlobalLoading(false) + router.push('/management/stuff', { scroll: false }) + }) + .catch(() => { + // setIsGlobalLoading(false) + }) } } }