From 0f9429be45d1ca1bcb7ea6397ea358bec7ff3584 Mon Sep 17 00:00:00 2001
From: huang <1724659546@qq.com>
Date: Thu, 23 Oct 2025 10:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8C=AA=E6=A0=8F=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87=E6=89=B9=E6=AC=A1=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PigPenInfoCard.vue       |  2 +-
 src/views/pms/PigFarmManagementView.vue | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/components/PigPenInfoCard.vue b/src/components/PigPenInfoCard.vue
index bb916ae2..677240d6 100644
--- a/src/components/PigPenInfoCard.vue
+++ b/src/components/PigPenInfoCard.vue
@@ -4,7 +4,7 @@
       <div class="title">猪栏: {{ pen.pen_number }}</div>
       <div class="info-item">状态: <el-tag size="small" :type="statusType">{{ pen.status || '未知' }}</el-tag></div>
       <div class="info-item">容量: {{ pen.capacity }}</div>
-      <div class="info-item">批次ID: {{ pen.pig_batch_id || '未分配' }}</div>
+      <div class="info-item">批次: {{ pen.batch_number || '未分配' }}</div>
     </div>
     <div class="actions-section">
       <el-button size="small" @click="emitEdit">编辑</el-button>
diff --git a/src/views/pms/PigFarmManagementView.vue b/src/views/pms/PigFarmManagementView.vue
index f2bb6195..a2ac7f9e 100644
--- a/src/views/pms/PigFarmManagementView.vue
+++ b/src/views/pms/PigFarmManagementView.vue
@@ -70,6 +70,7 @@
 <script>
 import { getPigHouses, deletePigHouse } from '@/api/pigHouse.js';
 import { getPens, deletePen } from '@/api/pen.js';
+import { getPigBatches } from '@/api/pigBatch.js';
 import PigHouseList from '@/components/PigHouseList.vue';
 import PigHouseForm from '@/components/PigHouseForm.vue';
 import PenForm from '@/components/PenForm.vue';
@@ -106,15 +107,17 @@ export default {
       this.loading = true;
       this.error = null;
       try {
-        const [pigHousesResponse, pensResponse] = await Promise.all([
+        const [pigHousesResponse, pensResponse, batchesResponse] = await Promise.all([
           getPigHouses(),
-          getPens()
+          getPens(),
+          getPigBatches()
         ]);
         
         const houses = Array.isArray(pigHousesResponse.data) ? pigHousesResponse.data : [];
         const pens = Array.isArray(pensResponse.data) ? pensResponse.data : [];
+        const batches = Array.isArray(batchesResponse.data) ? batchesResponse.data : [];
 
-        this.pigHousesData = this.assembleData(houses, pens);
+        this.pigHousesData = this.assembleData(houses, pens, batches);
       } catch (err) {
         this.error = err.message || '无法获取数据';
         console.error('Failed to fetch pig farm data:', err);
@@ -122,11 +125,17 @@ export default {
         this.loading = false;
       }
     },
-    assembleData(houses, pens) {
+    assembleData(houses, pens, batches) {
+      const batchMap = new Map(batches.map(batch => [batch.id, batch.batch_number]));
       const houseMap = new Map(houses.map(house => [house.id, { ...house, pens: [], isExpanded: false }]));
+      
       for (const pen of pens) {
         if (houseMap.has(pen.house_id)) {
-          houseMap.get(pen.house_id).pens.push(pen);
+          const penWithBatch = {
+            ...pen,
+            batch_number: batchMap.get(pen.pig_batch_id) || null
+          };
+          houseMap.get(pen.house_id).pens.push(penWithBatch);
         }
       }
       return Array.from(houseMap.values());