From 624592a63dcbbb68a00b5fc638bbb50337f7f70f Mon Sep 17 00:00:00 2001
From: huang <1724659546@qq.com>
Date: Thu, 23 Oct 2025 15:45:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=A7=BB=E9=99=A4=E7=8C=AA?=
 =?UTF-8?q?=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PigBatchList.vue          | 16 +++++++++++++++-
 src/components/PigBatchPenCard.vue       |  2 +-
 src/views/pms/PigBatchManagementView.vue | 20 ++++++++------------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/components/PigBatchList.vue b/src/components/PigBatchList.vue
index 21808496..fd478e99 100644
--- a/src/components/PigBatchList.vue
+++ b/src/components/PigBatchList.vue
@@ -252,6 +252,20 @@ export default {
 }
 
 .batch-info-line .red-text {
-  color: red !important;
+  color: red !important; // src/api/pigBatch.js 中错误的部分
+
+  /**
+ * 从猪批次移除空栏
+ * @param {number} batchID - 猪批次ID
+ * @param {number} penID - 待移除的猪栏ID
+ * @returns {Promise<*>}
+ */
+  export const removePenFromBatch = (batchID, penID) = > {
+  // BUG: URL中的参数顺序 ${penID}/${batchID} 与函数签名 (batchID, penID) 不一致
+
+  return http.
+
+delete(` /api/ v1 /pig-batches/ remove-pen / ${penID} / ${batchID} `);
+};
 }
 </style>
diff --git a/src/components/PigBatchPenCard.vue b/src/components/PigBatchPenCard.vue
index c2232326..87df8b9b 100644
--- a/src/components/PigBatchPenCard.vue
+++ b/src/components/PigBatchPenCard.vue
@@ -11,7 +11,7 @@
     </div>
     <div class="actions-section">
       <el-button size="small" @click="emitAllocatePigs" :disabled="!isBatchActive">分配猪只</el-button>
-      <el-button size="small" type="danger" @click="emitRemove" :disabled="!isBatchActive">移除</el-button>
+      <el-button size="small" type="danger" @click="emitRemove" :disabled="!isBatchActive || pen.current_pig_count > 0">移除</el-button>
     </div>
   </div>
 </template>
diff --git a/src/views/pms/PigBatchManagementView.vue b/src/views/pms/PigBatchManagementView.vue
index 1a75448a..60591976 100644
--- a/src/views/pms/PigBatchManagementView.vue
+++ b/src/views/pms/PigBatchManagementView.vue
@@ -70,8 +70,8 @@
 </template>
 
 <script>
-import { getPigBatches, deletePigBatch, assignPensToBatch } from '@/api/pigBatch.js';
-import { getPens, deletePen } from '@/api/pen.js';
+import { getPigBatches, deletePigBatch, assignPensToBatch, removePenFromBatch } from '@/api/pigBatch.js';
+import { getPens } from '@/api/pen.js';
 import { getPigHouses } from '@/api/pigHouse.js';
 import PigBatchList from '@/components/PigBatchList.vue';
 import PigBatchForm from '@/components/PigBatchForm.vue';
@@ -215,22 +215,18 @@ export default {
     },
     async handleRemovePen(pen) {
       try {
-        await this.$confirm(`确认删除猪栏 "${pen.pen_number}" 吗？`, '提示', {
+        await this.$confirm(`确认将猪栏 "${pen.pen_number}" 从猪群中移除吗？`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         });
-        await deletePen(pen.id);
-        this.$message.success('删除成功');
-        // 本地更新数据
-        const batch = this.pigBatchesData.find(b => b.id === pen.pig_batch_id);
-        if (batch) {
-          batch.pens = batch.pens.filter(p => p.id !== pen.id);
-        }
+        await removePenFromBatch(pen.id, pen.pig_batch_id);
+        this.$message.success('猪栏已成功从猪群中移除');
+        await this.loadData(); // Refresh data to show updated state
       } catch (err) {
         if (err !== 'cancel') {
-          this.$message.error('删除失败: ' + (err.message || '未知错误'));
-          console.error('Failed to delete pen:', err);
+          this.$message.error('移除失败: ' + (err.message || '未知错误'));
+          console.error('Failed to remove pen from batch:', err);
         }
       }
     },