支出

src/views/dashboard/index.vue

@@ -576,18 +576,37 @@ export default {
         return color
       }
 
+      // let curPlan = res?.map(i => {
+      //   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 Number(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,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 curPlan = res?.map(i => {
-        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;
+        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 curAct = res?.map(i => {
-        const { use_money_total,money_total_2 } = i
-        return Number(money_total_2) ? (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100) : 0;
+        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);
       });
       let nextPlan = res?.map(i => {
-        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;
+        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);
       });
+
       let barWidth = 23;
       let constData1 = [];
       let showData1 = [];

src/views/statisticalReport/budgetProgress.vue

@@ -460,7 +460,8 @@
           year: this.select.year,
           type: this.select.type,
           plan_department_id: this.select.department,
-          top_pid: 0,
+          // top_pid: 0,
+          top_pid: 1,
           dimension: this.select?.dimension?.toString()
         })
         for (var m of res.list.data) {