From 3ea47545f69ed52e651a97162312f1f2cb02fd85 Mon Sep 17 00:00:00 2001
From: 18631081161 <2088094923@qq.com>
Date: Sat, 17 Jan 2026 21:40:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/allocations/AllocationList.vue  | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/frontend/src/views/allocations/AllocationList.vue b/src/frontend/src/views/allocations/AllocationList.vue
index 948072e..d6cc581 100644
--- a/src/frontend/src/views/allocations/AllocationList.vue
+++ b/src/frontend/src/views/allocations/AllocationList.vue
@@ -64,7 +64,7 @@
           </template>
         </el-table-column>
         <!-- 师团级显示总配额,团级显示本单位配额,营部及以下隐藏配额 -->
-        <el-table-column v-if="authStore.canCreateAllocations" prop="totalQuota" label="总配额" width="120" align="right">
+        <el-table-column v-if="authStore.canCreateAllocations" prop="totalQuota" label="总配额" width="120" align="center">
           <template #default="{ row }">
             <span class="quota-value">{{ formatNumber(row.totalQuota) }}</span>
           </template>
@@ -76,18 +76,10 @@
             </div>
           </template>
         </el-table-column>
-        <!-- 师团级显示分配情况,团级显示消耗情况(含总数和百分比),营部及以下只显示上报数量 -->
-        <el-table-column v-if="authStore.canCreateAllocations" label="分配情况" width="150" align="center">
+        <!-- 师团级显示总消耗,团级显示消耗情况(含总数和百分比),营部及以下只显示上报数量 -->
+        <el-table-column v-if="authStore.canCreateAllocations" label="总消耗" width="120" align="center">
           <template #default="{ row }">
-            <div class="distribution-info">
-              <span class="dist-count">{{ row.distributions?.length || 0 }} 个单位</span>
-              <el-progress 
-                :percentage="getDistributionPercentage(row)" 
-                :stroke-width="6"
-                :show-text="false"
-                style="width: 60px; margin-left: 8px"
-              />
-            </div>
+            <span class="consumed-value">{{ formatNumber(getTotalActualCompletion(row)) }}</span>
           </template>
         </el-table-column>
         <el-table-column v-else-if="authStore.organizationalLevelNum === 2" label="消耗情况" width="200" align="center">
@@ -175,7 +167,7 @@
               </div>
             </div>
           </el-col>
-          <!-- 师团级显示总配额、已分配、分配单位数 -->
+          <!-- 师团级显示总配额、总消耗、分配单位数 -->
           <template v-if="authStore.canCreateAllocations">
             <el-col :span="6">
               <div class="summary-item">
@@ -188,9 +180,9 @@
             </el-col>
             <el-col :span="6">
               <div class="summary-item">
-                <div class="summary-label">已分配</div>
-                <div class="summary-value allocated">
-                  <span class="number">{{ formatNumber(getTotalDistributed()) }}</span>
+                <div class="summary-label">总消耗</div>
+                <div class="summary-value consumed">
+                  <span class="number">{{ formatNumber(getTotalConsumed()) }}</span>
                   <span class="unit">{{ selectedAllocation?.unit }}</span>
                 </div>
               </div>
@@ -549,6 +541,11 @@ function getDistributionPercentage(allocation: MaterialAllocation): number {
   return Math.round((distributed / allocation.totalQuota) * 100)
 }
 
+function getTotalActualCompletion(allocation: MaterialAllocation): number {
+  if (!allocation.distributions || allocation.distributions.length === 0) return 0
+  return allocation.distributions.reduce((sum, d) => sum + (d.actualCompletion || 0), 0)
+}
+
 function getMyUnitQuota(allocation: MaterialAllocation): number {
   if (!authStore.user || !allocation.distributions) return 0
   // 先查找分配给当前单位的配额
@@ -776,6 +773,12 @@ onMounted(() => {
   font-size: 14px;
 }
 
+.consumed-value {
+  font-weight: 600;
+  color: #67C23A;
+  font-size: 14px;
+}
+
 .quota-cell {
   display: flex;
   justify-content: center;