diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index c165c55e..c58a90b0 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -501,13 +501,19 @@ export default function Estimate({ params }) { //paDispOrder if (bomList) { bomList.map((bomItem, index) => { - let newItemDispOrder = Math.max(...estimateContextState.itemList.map((item) => item.dispOrder)) - if (newItemDispOrder == dispOrder) { - bomItem.dispOrder = (index + 1 + newItemDispOrder).toString() + let maxItemDispOrder = Math.max(...estimateContextState.itemList.map((item) => item.dispOrder)) + if (maxItemDispOrder == dispOrder) { + bomItem.dispOrder = (index + 1 + maxItemDispOrder).toString() bomItem.paDispOrder = dispOrder + bomItem.salePrice = '0' + //unitPrice는?? + bomItem.saleTotPrice = '0' } else { bomItem.dispOrder = (index + 1 + Number(dispOrder)).toString() bomItem.paDispOrder = dispOrder + bomItem.salePrice = '0' + //unitPrice는?? + bomItem.saleTotPrice = '0' } bomItem.delFlg = '0' @@ -589,10 +595,14 @@ export default function Estimate({ params }) { delete item.showSalePrice delete item.showSaleTotPrice if (item.delFlg === '0') { - const amount = Number(item?.amount?.replace(/[^0-9]/g, '').replaceAll(',', '')) - - const price = Number(item?.saleTotPrice?.replaceAll(',', '')) - + let amount = Number(item?.amount?.replace(/[^0-9]/g, '').replaceAll(',', '')) + if (isNaN(amount)) { + amount = 0 + } + let price = Number(item?.saleTotPrice?.replaceAll(',', '')) + if (isNaN(price)) { + price = 0 + } if (item.moduleFlg === '1') { //용량(Kw)은 모듈플래그 1만 합산 const volKw = (item.pnowW * amount) / 1000 @@ -621,10 +631,21 @@ export default function Estimate({ params }) { }) estimateContextState.itemList.map((item) => { if (item.delFlg === '0') { - const amount = Number(item.amount?.replace(/[^0-9]/g, '').replaceAll(',', '')) - const price = Number(item.saleTotPrice?.replaceAll(',', '')) - const salePrice = Number(item.salePrice?.replaceAll(',', '')) + let amount = Number(item.amount?.replace(/[^0-9]/g, '').replaceAll(',', '')) + let price = Number(item.saleTotPrice?.replaceAll(',', '')) + let salePrice = Number(item.salePrice?.replaceAll(',', '')) + if (isNaN(amount)) { + amount = 0 + } + + if (isNaN(price)) { + price = 0 + } + + if (isNaN(salePrice)) { + salePrice = 0 + } if (item.moduleFlg === '1') { //용량(Kw)은 모듈플래그 1만 합산 const volKw = (item.pnowW * amount) / 1000