This commit is contained in:
2025-10-23 13:26:20 +08:00
parent 0026f24002
commit 1a55330734

View File

@@ -120,8 +120,9 @@ export default {
const pens = Array.isArray(pensResponse.data) ? pensResponse.data : []; const pens = Array.isArray(pensResponse.data) ? pensResponse.data : [];
const houses = Array.isArray(housesResponse.data) ? housesResponse.data : []; const houses = Array.isArray(housesResponse.data) ? housesResponse.data : [];
// 更新 houseMap // 更新 batchMap 和 houseMap
this.houseMap = new Map(houses.map(h => [h.id, h.name])); this.houseMap = new Map(houses.map(h => [h.id, h.name]));
this.batchMap = new Map(batches.map(batch => [batch.id, batch.batch_number]));
this.pigBatchesData = this.assembleData(batches, pens); this.pigBatchesData = this.assembleData(batches, pens);
} catch (err) { } catch (err) {
@@ -142,7 +143,8 @@ export default {
if (pen.pig_batch_id && batchMap.has(pen.pig_batch_id)) { if (pen.pig_batch_id && batchMap.has(pen.pig_batch_id)) {
const penWithDetails = { const penWithDetails = {
...pen, ...pen,
house_name: this.houseMap.get(pen.house_id) || '未知猪舍' house_name: this.houseMap.get(pen.house_id) || '未知猪舍',
batch_number: batchMap.get(pen.pig_batch_id)?.batch_number || null // 添加这一行
}; };
batchMap.get(pen.pig_batch_id).pens.push(penWithDetails); batchMap.get(pen.pig_batch_id).pens.push(penWithDetails);
} }
@@ -257,7 +259,6 @@ export default {
}, },
async handleAssignPenToBatch({ batchId, penId }) { async handleAssignPenToBatch({ batchId, penId }) {
try { try {
// Corrected the request body to use penIds (camelCase)
await assignPensToBatch(batchId, { penIds: [penId] }); await assignPensToBatch(batchId, { penIds: [penId] });
this.$message.success('猪栏分配成功'); this.$message.success('猪栏分配成功');
await this.loadData(); // Refresh data to show assigned pen await this.loadData(); // Refresh data to show assigned pen