From 514d5707753e667fafedd7e604b50963d47d4292 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Thu, 7 Dec 2023 19:50:55 +0800
Subject: [PATCH] 2023-12-7

---
 src/views/dashboard/index.vue                  | 14 +++++++-------
 src/views/statisticalReport/budgetProgress.vue |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e90d51c..db7c6df 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -220,7 +220,7 @@
                         >
                           <template slot-scope="scope">
                             <router-link
-                              :to="`/statisticalReport/budgetProgress?departmentId=${scope.row.plan_department_id}`"
+                              :to="`/contract/statisticalReport/budgetProgress?departmentId=${scope.row.plan_department_id}`"
                               >查看
                             </router-link>
                           </template>
@@ -260,7 +260,7 @@
                         >
                           <template slot-scope="scope">
                             <router-link
-                              :to="`/statisticalReport/budgetProgress?typeId=${scope.row.type}`"
+                              :to="`/contract/statisticalReport/budgetProgress?typeId=${scope.row.type}`"
                               >查看
                             </router-link>
                           </template>
@@ -279,7 +279,7 @@
     <Card>
       <template #title>
         <div style="display: flex;justify-content: space-between;align-items: center;">
-          <p>各科室执行率</p>
+          <p>各科室预算计划完成对比图</p>
           <el-date-picker v-model="carrySelect.month"
                           format="yyyy-MM"
                           :clearable="false"
@@ -567,16 +567,16 @@ export default {
       }
 
       let curPlan = res?.map(i => {
-        const { use_money_total,paid_plan_total } = i
-        return paid_plan_total ? (Math.round((Number(use_money_total||0) / Number(paid_plan_total ||0)) * 10000) / 100) : 0;
+        const { use_money_total,paid_plan_total,money_total_2 } = i
+        return paid_plan_total ? (Math.round((Number(paid_plan_total||0) / Number(money_total_2 ||0)) * 10000) / 100) : 0;
       });
       let curAct = res?.map(i => {
         const { use_money_total,money_total_2 } = i
         return money_total_2 ? (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100) : 0;
       });
       let nextPlan = res?.map(i => {
-        const { use_money_total_next,paid_plan_total_next } = i
-        return paid_plan_total_next ? (Math.round((Number(use_money_total_next||0) / Number(paid_plan_total_next||0)) * 10000) / 100) : 0;
+        const { use_money_total_next,paid_plan_total_next,money_total_2 } = i
+        return paid_plan_total_next ? (Math.round((Number(paid_plan_total_next||0) / Number(money_total_2||0)) * 10000) / 100) : 0;
       });
       let barWidth = 23;
       let constData1 = [];
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index 25e9c79..2f373a7 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -12,7 +12,7 @@
         <span style="padding: 0 6px;word-break: keep-all;">预算类型</span>
         <span>
           <el-cascader
-            :options="type"
+            :options="types"
             :props="{
                 checkStrictly: false,
                 label: 'name',
@@ -74,7 +74,7 @@
   export default {
     data() {
       return {
-        type: [], //预算类型
+        types: [], //预算类型
         departments: [],
         select: {
           pageIndex: 1,