qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Q-CAST-III-MR-372: 견적서 상세

Browse Source
This commit is contained in:
상연 정 2024-11-25 08:33:44 +00:00 committed by Space Cloud
commit 997b8febeb
No known key found for this signature in database
GPG Key ID: 2F4D45726235F749
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/components/estimate/Estimate.jsx
View File

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