From 7a7c34de4d35c76d5be59b045cf28ba11ac42130 Mon Sep 17 00:00:00 2001 From: basssy Date: Thu, 28 Nov 2024 16:50:53 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/estimate/Estimate.jsx | 45 +++---------------- .../estimate/useEstimateController.js | 3 ++ 2 files changed, 10 insertions(+), 38 deletions(-) diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index dcaef5f5..a52f8423 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -273,12 +273,6 @@ export default function Estimate({ params }) { }) } - //비워주기 - setEstimateContextState({ - pkgAsp: '0', - pkgTotPrice: '0', - }) - //YJOD로 돌아가도 UNIT_PRICE로 프라이싱 실행해서 정가로 셋팅 if (handlePricingFlag) { handlePricing('UNIT_PRICE') @@ -456,6 +450,9 @@ export default function Estimate({ params }) { updates.itemChangeFlg = '1' updates.partAdd = '0' updates.saleTotPrice = (Number(amount.replaceAll(',', '')) * estimateContextState.itemList[index].salePrice.replaceAll(',', '')).toLocaleString() + updates.showSaleTotPrice = ( + Number(amount.replaceAll(',', '')) * estimateContextState.itemList[index].showSalePrice?.replaceAll(',', '') + ).toLocaleString() updateList = estimateContextState.itemList.map((item) => { if (item.dispOrder === dispOrder) { @@ -487,6 +484,8 @@ export default function Estimate({ params }) { let updates = {} updates.salePrice = salePrice updates.saleTotPrice = (Number(salePrice.replaceAll(',', '')) * estimateContextState.itemList[index].amount.replaceAll(',', '')).toLocaleString() + updates.showSalePrice = updates.salePrice + updates.showSaleTotPrice = updates.saleTotPrice updateList = estimateContextState.itemList.map((item) => { if (item.dispOrder === dispOrder) { @@ -675,34 +674,6 @@ export default function Estimate({ params }) { } } }) - let estimateOption = estimateContextState?.estimateOption?.split('、') - // console.log('오리진::', estimateOption) - let removeEstimateOption = estimateOption.filter((option) => !pushData.includes(option)) - // console.log('남길거?? ', removeEstimateOption) - let removeEstimateOptionString = removeEstimateOption.join('、') - - // console.log('SpecialNoteLis::', specialNoteList) - - // specialNoteList.map((row) => { - // row.check = false - // estimateOption.map((row2) => { - // if (row.pkgYn === '0') { - // if (row2 === row.code) { - // row.check = true - // } - // } else { - // // console.log('지울꺼::', removeEstimateOptionString) - // if (row.code.includes(removeEstimateOptionString)) { - // // console.log('removeEstimateOption::::', removeEstimateOption) - // // row.check = false - // return - // } else { - // // console.log('제품가대세팅::::', row.code) - // // row.check = true - // } - // } - // }) - // }) estimateContextState.itemList.map((item) => { delete item.showSalePrice @@ -1221,7 +1192,7 @@ export default function Estimate({ params }) {
{getMessage('estimate.detail.sepcialEstimateProductInfo.totVolKw')}
-
{convertNumberToPriceDecimalToFixed(estimateContextState?.totVolKw, 2)}
+
{convertNumberToPriceDecimalToFixed(estimateContextState?.totVolKw, 3)}
{getMessage('estimate.detail.sepcialEstimateProductInfo.supplyPrice')}
@@ -1466,9 +1437,7 @@ export default function Estimate({ params }) { { itemFlg = false return alert(getMessage('estimate.detail.save.requiredSalePrice')) } + + estimateData.pkgAsp = '0' + estimateData.pkgTotPrice = '0' } } }