From 02fe6bf922cccacb1f35f0cee9a64319579fce6c Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 13 Jun 2025 16:24:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5tongji?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/budget/seeBudget.vue |  2 +-
 src/views/dashboard/index.vue  | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/budget/seeBudget.vue b/src/views/budget/seeBudget.vue
index 4fcc6be..93d3157 100644
--- a/src/views/budget/seeBudget.vue
+++ b/src/views/budget/seeBudget.vue
@@ -92,7 +92,7 @@
       <template v-slot:btns>
         <el-table-column header-align="center" align="left" :width="150" label="操作" >
           <template #default="{ row }">
-            <Button v-if="row.pid === 0" size="small" type="primary" @click="$refs['payPlan'].rowName = row.name,$refs['payPlan'].setId(row.id),$refs['payPlan'].show();">预算执行计划填报</Button>
+            <Button v-if="row.pid != 0" size="small" type="primary" @click="$refs['payPlan'].rowName = row.name,$refs['payPlan'].setId(row.id),$refs['payPlan'].show();">预算执行计划填报</Button>
             <Button
               v-if="row.pid == 0"
               class="slot-btns-item"
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index f6794e1..23b5054 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -593,18 +593,22 @@ export default {
       // });
       let curPlan = res?.map(i => {
         const { use_money_total,paid_plan_total,money_total_2,money_total_1 } = i
-        return  Number(money_total_2) ? (Math.round((Number(paid_plan_total||0) / Number(money_total_2 ||0)) * 10000) / 100) :
-        (Math.round((Number(paid_plan_total||0) / Number(money_total_1 ||0)) * 10000) / 100);
+        let curPlan_total = Math.round(Number(paid_plan_total||0)) + Math.round(Number(use_money_total||0))
+        return  Number(money_total_2) ? ((( curPlan_total / Number(money_total_2 ||0)) * 10000) / 100).toFixed(2) :
+        ((( curPlan_total / Number(money_total_1 ||0)) * 10000) / 100).toFixed(2)
       });
+
       let curAct = res?.map(i => {
         const { use_money_total,money_total_2,money_total_1 } = i
-        return Number(money_total_2) ? (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100) :
-         (Math.round((Number(use_money_total||0) / Number(money_total_1||0)) * 10000) / 100);
+        return Number(money_total_2) ? (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100).toFixed(2) :
+         (Math.round((Number(use_money_total||0) / Number(money_total_1||0)) * 10000) / 100).toFixed(2);
       });
+
       let nextPlan = res?.map(i => {
-        const { use_money_total_next,paid_plan_total_next,money_total_2,money_total_1 } = i
-        return  Number(money_total_2) ? (Math.round((Number(paid_plan_total_next||0) / Number(money_total_2||0)) * 10000) / 100) :
-         (Math.round((Number(paid_plan_total_next||0) / Number(money_total_1||0)) * 10000) / 100);
+        const { use_money_total,use_money_total_next,paid_plan_total_next,money_total_2,money_total_1 } = i
+        let nextPlan_total = Math.round(Number(paid_plan_total_next||0)) + Math.round(Number(use_money_total||0))
+        return  Number(money_total_2) ? (((nextPlan_total / Number(money_total_2||0)) * 10000) / 100).toFixed(2) :
+         (((nextPlan_total / Number(money_total_1||0)) * 10000) / 100).toFixed(2);
       });
 
       let barWidth = 23;