From bc36857c7250658cbf1eda58938afead86d76004 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Tue, 29 Oct 2024 11:22:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E9=A2=84=E7=AE=97=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E6=83=85=E5=86=B5=E9=87=91=E9=A2=9D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E8=B0=83=E6=95=B4=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statisticalReport/quarterlyStatistics.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/statisticalReport/quarterlyStatistics.vue b/src/views/statisticalReport/quarterlyStatistics.vue index 2d00c2c..1586877 100644 --- a/src/views/statisticalReport/quarterlyStatistics.vue +++ b/src/views/statisticalReport/quarterlyStatistics.vue @@ -239,7 +239,7 @@ export default { index: planIndex+1, isSummary: 0, name: plan.name, - issueBudget: parseFloat(plan.money), + issueBudget: parseFloat(plan.update_money) || parseFloat(plan.money), planExpend, actExpend, impltRate: planExpend.map((j, ji) => (this.percent(parseFloat(actExpend[ji]),parseFloat(j)))), @@ -277,7 +277,7 @@ export default { isSummary: 1, name: item.department?.name, issueBudget: item.plan?.reduce((a, b) => { - return parseFloat(a) + parseFloat(b.money??0) + return parseFloat(a) + (parseFloat(b.update_money??0) || parseFloat(b.money??0)) },0), planExpend, actExpend,