diff --git a/src/components/PigBatchList.vue b/src/components/PigBatchList.vue
index f81d4962..a7f58571 100644
--- a/src/components/PigBatchList.vue
+++ b/src/components/PigBatchList.vue
@@ -52,6 +52,7 @@
               :key="pen.id"
               :pen="pen"
               :isBatchActive="batch.is_active"
+              :batchUnassignedPigCount="batch.unassigned_pig_count"
               @allocate-pigs="showAllocatePigsDialog($event, batch)"
               @remove="emitRemovePen"
           />
@@ -82,8 +83,7 @@
 
     <!-- 分配猪只对话框 -->
     <AllocatePigsDialog
-        v-if="allocatePigsDialogVisible"
-        :visible.sync="allocatePigsDialogVisible"
+        v-model:visible="allocatePigsDialogVisible"
         :unassigned-pig-count="currentBatch ? currentBatch.unassigned_pig_count : 0"
         :pen-id="selectedPenForAllocation ? selectedPenForAllocation.id : 0"
         @confirm="handleAllocatePigs"
diff --git a/src/components/PigBatchPenCard.vue b/src/components/PigBatchPenCard.vue
index 87df8b9b..8e153193 100644
--- a/src/components/PigBatchPenCard.vue
+++ b/src/components/PigBatchPenCard.vue
@@ -10,7 +10,7 @@
       <div class="info-item border-left">存栏: {{ pen.current_pig_count || 0 }}</div>
     </div>
     <div class="actions-section">
-      <el-button size="small" @click="emitAllocatePigs" :disabled="!isBatchActive">分配猪只</el-button>
+      <el-button size="small" @click="emitAllocatePigs" :disabled="!isBatchActive || batchUnassignedPigCount <= 0">分配猪只</el-button>
       <el-button size="small" type="danger" @click="emitRemove" :disabled="!isBatchActive || pen.current_pig_count > 0">移除</el-button>
     </div>
   </div>
@@ -29,6 +29,10 @@ export default {
     isBatchActive: {
       type: Boolean,
       default: true // 默认活跃，以防万一没有传递
+    },
+    batchUnassignedPigCount: {
+      type: Number,
+      default: 0
     }
   },
   emits: ['remove', 'allocate-pigs'],