diff --git a/src/components/approval/balancepayment.vue b/src/components/approval/balancepayment.vue index 39bb490..658fbde 100644 --- a/src/components/approval/balancepayment.vue +++ b/src/components/approval/balancepayment.vue @@ -37,7 +37,10 @@ @@ -191,20 +194,21 @@ export default { let num = 0, total = 0 for (let index = 0; index < data.goodsList.length; index++) { let item = data.goodsList[index] + let real_amount = item.real_unit_price * item.real_quantity + total += real_amount * 100 if(item.apply_amount) { num += item.apply_amount * 100 - total += item.apply_amount * 100 } else if(item.real_unit_price && item.real_quantity) { - let real_amount = item.real_unit_price * item.real_quantity num += real_amount * 100 - item.has_paid_amount * 100 - total += real_amount * 100 } } for (let index = 0; index < data.feesList.length; index++) { let item = data.feesList[index] - if(item.amount && item.has_paid_amount * 1 > 0) { - total += item.amount * 100 - if(!item.id && item.amount) { + if(item.amount) { + if((item.has_paid_amount * 1 > 0 && item.id) || !item.id) { + total += item.amount * 100 + } + if(!item.id) { num += item.amount * 100 } } @@ -229,13 +233,16 @@ export default { for (let index = 0; index < data.goodsList.length; index++) { let item = data.goodsList[index] num += item.apply_amount * 100 - total += item.apply_amount * 100 + let real_amount = item.real_unit_price * item.real_quantity + total += real_amount * 100 } for (let index = 0; index < data.feesList.length; index++) { let item = data.feesList[index] - if(item.amount && item.has_paid_amount * 1 > 0) { - total += item.amount * 100 - if(!item.id && item.amount) { + if(item.amount) { + if((item.has_paid_amount * 1 > 0 && item.id) || !item.id) { + total += item.amount * 100 + } + if(!item.id) { num += item.amount * 100 } } diff --git a/src/views/purchase/waitapproval.vue b/src/views/purchase/waitapproval.vue index 01c44b0..c42d37a 100644 --- a/src/views/purchase/waitapproval.vue +++ b/src/views/purchase/waitapproval.vue @@ -41,6 +41,7 @@ +