From beb28281e27cccad229780671b52f9954e12806c Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 17 Jul 2025 10:20:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E8=B5=84=E9=87=91=E9=A2=84?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/departmentProgressDetail.vue                | 2 +-
 src/views/departmentProgress/index.vue                     | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/departmentProgress/components/departmentProgressDetail.vue b/src/views/departmentProgress/components/departmentProgressDetail.vue
index e514094..c75b3db 100644
--- a/src/views/departmentProgress/components/departmentProgressDetail.vue
+++ b/src/views/departmentProgress/components/departmentProgressDetail.vue
@@ -217,7 +217,7 @@
         if (isNaN(num)) return '0元';
 
         if (Math.abs(num) < 10000) {
-          return num.toString() + '元'; // 小于1万直接返回原数值
+          return num.toFixed(2).toString() + '元'; // 小于1万直接返回原数值
         } else {
           return (num / 10000).toFixed(2) + '万元'; // 除以1万并保留两位小数
         }
diff --git a/src/views/departmentProgress/index.vue b/src/views/departmentProgress/index.vue
index 365e719..ce4ca0f 100644
--- a/src/views/departmentProgress/index.vue
+++ b/src/views/departmentProgress/index.vue
@@ -42,8 +42,9 @@
                   <div class="text-muted fw-bold text-success">{{ formatToWan(dept.use_money_total) }}</div>
                 </el-col>
                 <el-col :span="8">
-                  <div class="text-muted">进行中</div>
-                  <div class="text-muted fw-bold text-warning">{{ getDoingMoneyTotal(dept.money_total,dept.use_money_total) }}</div>
+                  <div class="text-muted">进行中</div>
+                  <!-- getDoingMoneyTotal(dept.money_total,dept.use_money_total) -->
+                  <div class="text-muted fw-bold text-warning">{{ formatToWan(dept.contractPlanIngSum)}}</div>
                 </el-col>
               </el-row>
               <div class="mt-3 detail"  @click="goToDetail(dept)">
@@ -102,7 +103,7 @@
         if (isNaN(num)) return '0元';
 
         if (Math.abs(num) < 10000) {
-          return num.toString() + '元'; // 小于1万直接返回原数值
+          return num.toFixed(2).toString() + '元'; // 小于1万直接返回原数值
         } else {
           return (num / 10000).toFixed(2) + '万元'; // 除以1万并保留两位小数
         }