diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index 093815b8..81d2a7e8 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -309,18 +309,19 @@ export default function Estimate({ params }) { const onChangeAmount = (value, dispOrder, index) => { //itemChangeFlg = 1, partAdd = 0 셋팅 let amount = value - amount = Number(value.replaceAll(',', '')) + amount = Number(value.replace(/[^0-9]/g, '').replaceAll(',', '')) if (isNaN(amount)) { amount = 0 } else { amount = amount.toLocaleString() } + let updateList = [] let updates = {} updates.amount = amount updates.itemChangeFlg = '1' updates.partAdd = '0' - updates.saleTotPrice = (Number(value.replaceAll(',', '')) * state.itemList[index].salePrice).toLocaleString() + updates.saleTotPrice = (Number(amount.replaceAll(',', '')) * state.itemList[index].salePrice.replaceAll(',', '')).toLocaleString() updateList = state.itemList.map((item) => { if (item.dispOrder === dispOrder) { @@ -341,7 +342,7 @@ export default function Estimate({ params }) { const onChangeSalePrice = (value, dispOrder, index) => { //itemChangeFlg, partAdd 받아온 그대로 let salePrice - salePrice = Number(value.replaceAll(',', '')) + salePrice = Number(value.replace(/[^0-9]/g, '').replaceAll(',', '')) if (isNaN(salePrice)) { salePrice = 0 } else { @@ -350,7 +351,7 @@ export default function Estimate({ params }) { let updateList = [] let updates = {} updates.salePrice = salePrice - updates.saleTotPrice = (Number(value.replaceAll(',', '')) * state.itemList[index].amount).toLocaleString() + updates.saleTotPrice = (Number(salePrice.replaceAll(',', '')) * state.itemList[index].amount.replaceAll(',', '')).toLocaleString() updateList = state.itemList.map((item) => { if (item.dispOrder === dispOrder) { @@ -476,16 +477,32 @@ export default function Estimate({ params }) { useEffect(() => { if (itemChangeYn) { - console.log('아이템 상태 가져오기::::::::::', state.itemList) + // console.log('아이템 상태 가져오기::::::::::', state.itemList) // console.log('토탈쪽 셋팅해주기위한 함수::::::', itemList) //delFlg 0인거 중에.. - setItemChangeYn(false) + //수량(PCS) : totAmount + //용량( Kw) : totVolKw + //공급가액 : supplyPrice + //부가세(10%) : vatPrice + //총액 :totPrice - // settingToalInfo(state.itemList) + let totAmount = 0 + let amount = 0 + state.itemList.map((item) => { + if (item.delFlg === '0') { + amount = item.amount.replace(/[^0-9]/g, '').replaceAll(',', '') + totAmount += Number(amount) + } + }) + + setState({ + totAmount: totAmount, + }) + + setItemChangeYn(false) } }, [itemChangeYn]) - // const settingToalInfo = (itemList) => {} return (