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

견적서YJOD 오픈가

Browse Source
This commit is contained in:
basssy 2024-12-03 09:54:02 +09:00
parent b480540368
commit 29cf1c11d9
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -600,7 +600,13 @@ export default function Estimate({ params }) {
updates.showSalePrice = '0' updates.showSalePrice = '0'
updates.showSaleTotPrice = '0' updates.showSaleTotPrice = '0'
} }
} else {
if (res.openFlg === '1') {
updates.showSalePrice = '0'
updates.showSaleTotPrice = '0'
}
} }
//104671 //104671
let bomList = res.itemBomList let bomList = res.itemBomList
@ -719,8 +725,6 @@ export default function Estimate({ params }) {
makeUniqueSpecialNoteCd(itemList) makeUniqueSpecialNoteCd(itemList)
itemList.forEach((item) => { itemList.forEach((item) => {
delete item.showSalePrice
delete item.showSaleTotPrice
if (item.delFlg === '0') { if (item.delFlg === '0') {
let amount = Number(item.amount?.replace(/[^0-9]/g, '').replaceAll(',', '')) || 0 let amount = Number(item.amount?.replace(/[^0-9]/g, '').replaceAll(',', '')) || 0
let price = Number(item.saleTotPrice?.replaceAll(',', '')) || 0 let price = Number(item.saleTotPrice?.replaceAll(',', '')) || 0
@ -731,6 +735,11 @@ export default function Estimate({ params }) {
} }
totals.totAmount += amount totals.totAmount += amount
totals.supplyPrice += price totals.supplyPrice += price
if (item.openFlg === '1') {
item.showSalePrice = '0'
item.showSaleTotPrice = '0'
}
} }
}) })
@ -802,6 +811,13 @@ export default function Estimate({ params }) {
item.showSaleTotPrice = '0' item.showSaleTotPrice = '0'
} }
}) })
estimateContextState.itemList.forEach((item) => {
if (estimateContextState.estimateType === 'YJOD' && item.openFlg === '1') {
item.showSalePrice = '0'
item.showSaleTotPrice = '0'
}
})
} }
}, [itemChangeYn, estimateContextState.itemList]) }, [itemChangeYn, estimateContextState.itemList])
@ -1465,6 +1481,10 @@ export default function Estimate({ params }) {
? true ? true
: item.pkgMaterialFlg !== '1' : item.pkgMaterialFlg !== '1'
: item.itemId === '' || !!item?.paDispOrder : item.itemId === '' || !!item?.paDispOrder
? true
: item.openFlg === '1'
? true
: false
} }
onChange={(e) => { onChange={(e) => {
onChangeSalePrice(e.target.value, item.dispOrder, index) onChangeSalePrice(e.target.value, item.dispOrder, index)

10
src/hooks/floorPlan/estimate/useEstimateController.js
View File

@ -153,7 +153,7 @@ export const useEstimateController = (planNo) => {
} }
if (flag) { if (flag) {
if (!originFileFlg) { if (!originFileFlg) {
if (estimateData.newFileList.length < 1) { if (estimateData.newFileList?.length < 1) {
if (estimateData.itemList.length > 1) { if (estimateData.itemList.length > 1) {
estimateData.itemList.map((row) => { estimateData.itemList.map((row) => {
if (row.delFlg === '0') { if (row.delFlg === '0') {
@ -195,9 +195,11 @@ export const useEstimateController = (planNo) => {
item.salePrice = '0' item.salePrice = '0'
} }
if (item.salePrice < 1) { if (item.openFlg !== '1') {
itemFlg = false if (item.salePrice < 1) {
return alert(getMessage('estimate.detail.save.requiredSalePrice')) itemFlg = false
return alert(getMessage('estimate.detail.save.requiredSalePrice'))
}
} }
estimateData.pkgAsp = '0' estimateData.pkgAsp = '0'