Commit d72ab46b authored by Damon's avatar Damon

fix: 材料工艺金额计算

parent 14aec756
......@@ -644,12 +644,13 @@
let amount = 0
if(arr){
arr.forEach(item =>{
if (Number(item.useLength) && Number(item.freeLength) && Number(item.unitAmt)) {
amount += Math.max(Number(item.useLength) - Number(item.freeLength), 0) * Number(item.unitAmt)
}
if(Number(item.extraAmt)){
amount += Number(item.extraAmt)
}
const useLength = Number(item.useLength) || 0
const freeLength = Number(item.freeLength) || 0
const unitAmt = Number(item.unitAmt) || 0
amount += Math.max(useLength - freeLength, 0) * unitAmt
if (item.extraAmt) {
amount += Number(item.extraAmt)
}
})
}
return amount
......
......@@ -107,9 +107,7 @@
money() { // 总额
var amount = 0
for (var item of this.list) {
if (Number(item.useLength) && Number(item.freeLength) && Number(item.unitAmt)) {
amount += Math.max(Number(item.useLength) - Number(item.freeLength), 0) * Number(item.unitAmt)
}
amount += Math.max(Number(item.useLength) - Number(item.freeLength), 0) * Number(item.unitAmt)
}
for (var item of this.other) {
if (item.extraAmt && Number(item.extraAmt)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment