Skip to content

S
self-support
Commit d72ab46b authored by Damon's avatar Damon
Browse files
Options

fix: 材料工艺金额计算

parent 14aec756
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
src/pages/order/complete.vue
View file @ d72ab46b
...@@ -644,10 +644,11 @@ ...@@ -644,10 +644,11 @@
let amount = 0 let amount = 0
if(arr){ if(arr){
arr.forEach(item =>{ arr.forEach(item =>{
if (Number(item.useLength) && Number(item.freeLength) && Number(item.unitAmt)) { const useLength = Number(item.useLength) || 0
amount += Math.max(Number(item.useLength) - Number(item.freeLength), 0) * Number(item.unitAmt) const freeLength = Number(item.freeLength) || 0
} const unitAmt = Number(item.unitAmt) || 0
if(Number(item.extraAmt)){ amount += Math.max(useLength - freeLength, 0) * unitAmt
if (item.extraAmt) {
amount += Number(item.extraAmt) amount += Number(item.extraAmt)
} }
}) })
......
src/pages/order/material.vue
View file @ d72ab46b
...@@ -107,10 +107,8 @@ ...@@ -107,10 +107,8 @@
money() { // 总额 money() { // 总额
var amount = 0 var amount = 0
for (var item of this.list) { 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) { for (var item of this.other) {
if (item.extraAmt && Number(item.extraAmt)) { if (item.extraAmt && Number(item.extraAmt)) {
amount += Number(item.extraAmt) amount += 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