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) + }) } } }