From 31376355d0d7575cffcbc190d1fc1ec8003ecb75 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Mon, 9 Mar 2020 19:22:49 +0800 Subject: [PATCH] a --- .../PurchasingCenter/FundApproval1/index.vue | 25 +++++++-- .../PurchaseContractRequestFund/index.vue | 54 +++++++++++-------- 2 files changed, 52 insertions(+), 27 deletions(-) diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue index 7850b0eb..e5fa266a 100644 --- a/src/views/PurchasingCenter/FundApproval1/index.vue +++ b/src/views/PurchasingCenter/FundApproval1/index.vue @@ -168,18 +168,33 @@ export default { columns.forEach((column, index) => { if (index === 0) { sums[index] = '总价' - } else if (index === 6) { - const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量']))) + } else if (index === 3) { + const values = data.map(item => Number(item['数量'])) if (!values.every(value => isNaN(value))) { sums[index] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) { - return prev + curr + return Number(prev) + Number(curr) } else { - return prev + return Number(prev) } }, 0) - sums[index] = sums[index].toFixed(2) + ' 元' + sums[index] + } else { + sums[index] = 'N/A' + } + } else if (index === 4) { + const values = data.map(item => Number(item['到货数量'])) + if (!values.every(value => isNaN(value))) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return Number(prev) + Number(curr) + } else { + return Number(prev) + } + }, 0) + sums[index] } else { sums[index] = 'N/A' } diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue index 2c4f68d6..d06a5709 100644 --- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue @@ -1,9 +1,8 @@