From 6ff280b44b0eea87de9e3c80455d9cb454f35e0b Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Thu, 19 Oct 2023 10:50:16 +0800
Subject: [PATCH] 2023-10-19

---
 src/views/statisticalReport/budgetProgress.vue | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index 32214f6..03df042 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -81,7 +81,8 @@
           department: '',
           showDatePicker:'',
           start_created_at:'',
-          end_created_at:''
+          end_created_at:'',
+          sort_type: 'asc'
         },
         rateTotal: '0%',
         moneyTotal: 0,
@@ -150,24 +151,14 @@
             width: 180
           },
           {
-            prop: 'rate',
+            prop: 'calculation_result',
             label: '进展率',
             width: 200,
             fixed: "right",
             customFn: (row) => {
-              let m2 = row.update_money;
-              let m1 = row.money;
-              let m3 = row.use_money_total;
-              let per = 0;
-
-              if (m2 != 0) {
-                per = ((m3 / m2) * 100).toFixed(2);
-              } else if (m1 != 0) {
-                per = ((m3 / m1) * 100).toFixed(2);
-              }
               return ( < div >
                 <el-progress percentage = {
-                  Number(per)
+                  (Number(row.calculation_result || 0)*100).toFixed(2)
                 } > </el-progress> </div >
               )
             }