From 2e5c04d2d49794e27ef169d3a627a620744c5a11 Mon Sep 17 00:00:00 2001
From: huang <1724659546@qq.com>
Date: Thu, 23 Oct 2025 14:42:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=9C=AA=E5=88=86=E9=85=8D?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PigBatchList.vue          |  7 +++++++
 src/views/pms/PigBatchManagementView.vue | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/PigBatchList.vue b/src/components/PigBatchList.vue
index 98098015..2db5384c 100644
--- a/src/components/PigBatchList.vue
+++ b/src/components/PigBatchList.vue
@@ -21,6 +21,9 @@
                 {{ formatRFC3339(batch.end_date) }}
               </template>
             </span>
+            <span v-if="batch.unassigned_pig_count !== undefined && batch.unassigned_pig_count > 0" class="red-text">
+              未分配数量: {{ batch.unassigned_pig_count }}
+            </span>
           </div>
         </div>
         <div class="batch-actions">
@@ -221,4 +224,8 @@ export default {
   text-align: center;
   padding: 20px 0;
 }
+
+.batch-info-line .red-text {
+  color: red;
+}
 </style>
diff --git a/src/views/pms/PigBatchManagementView.vue b/src/views/pms/PigBatchManagementView.vue
index f63d8831..7d6ab4ca 100644
--- a/src/views/pms/PigBatchManagementView.vue
+++ b/src/views/pms/PigBatchManagementView.vue
@@ -144,12 +144,18 @@ export default {
           const penWithDetails = {
             ...pen,
             house_name: this.houseMap.get(pen.house_id) || '未知猪舍',
-            batch_number: batchMap.get(pen.pig_batch_id)?.batch_number || null // 添加这一行
+            batch_number: batchMap.get(pen.pig_batch_id)?.batch_number || null
           };
           batchMap.get(pen.pig_batch_id).pens.push(penWithDetails);
         }
       }
-      return Array.from(batchMap.values());
+      // Calculate unassigned_pig_count for each batch using currentTotalQuantity and currentTotalPigsInPens
+      const assembledBatches = Array.from(batchMap.values());
+      assembledBatches.forEach(batch => {
+        // Use currentTotalQuantity and currentTotalPigsInPens directly from the batch object
+        batch.unassigned_pig_count = (batch.currentTotalQuantity || 0) - (batch.currentTotalPigsInPens || 0);
+      });
+      return assembledBatches;
     },
     // --- 猪群操作 ---
     handleAddBatch() {