From 83beadc988952b4b71f8854324a7b20f4392fec8 Mon Sep 17 00:00:00 2001
From: zyh <2066096076@qq.com>
Date: Sun, 1 Mar 2026 15:21:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A0=8F=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=86=BB=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/frozen/embryo/index.vue             | 135 +++++++++--------
 src/views/frozen/sperm/index.vue              | 124 ++++++++--------
 .../produce/bodyManage/body_measure/index.vue | 140 +++++++++---------
 .../produce/bodyManage/body_score/index.vue   |  82 +++++-----
 .../bodyManage/breast_rating/index.vue        |  84 ++++++-----
 .../manage_sheep/changeComment/index.vue      |  68 +++++----
 .../produce/manage_sheep/changeEar/index.vue  |  84 ++++++-----
 .../manage_sheep/changeVariety/index.vue      |  81 +++++-----
 .../manage_sheep/trans_group/index.vue        |  70 +++++----
 .../manage_sheep/transition_info/index.vue    |  96 ++++++------
 src/views/produce/other/castrate/index.vue    |  69 +++++----
 src/views/produce/other/fixHoof/index.vue     |  70 +++++----
 12 files changed, 586 insertions(+), 517 deletions(-)

diff --git a/src/views/frozen/embryo/index.vue b/src/views/frozen/embryo/index.vue
index 515be98..d20d29f 100644
--- a/src/views/frozen/embryo/index.vue
+++ b/src/views/frozen/embryo/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"
+    style="height: calc(100vh - 84px); display: flex; flex-direction: column; overflow: hidden;">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="胚胎编号" prop="code">
         <el-input v-model="queryParams.code" placeholder="请输入胚胎编号" clearable @keyup.enter="handleQuery"
@@ -56,67 +57,71 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="embryoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="主键" align="center" prop="id" /> -->
-      <el-table-column label="胚胎编号" align="center" prop="code" width="130px" fixed="fixed" />
-      <el-table-column label="冻胚日期" align="center" prop="freezeDate" width="130px">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.freezeDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="供体公羊耳号" align="center" prop="drId" width="130px" />
-      <el-table-column label="供体公羊品种" align="center" prop="drBreed" width="130px" />
-      <el-table-column label="供体母羊耳号" align="center" prop="deId" width="130px" />
-      <el-table-column label="供体母羊品种" align="center" prop="deBreed" width="130px" />
-      <el-table-column label="胚胎品种" align="center" prop="embBreed" />
-      <el-table-column label="胚胎阶段等级" align="center" prop="grade" width="130px" />
-      <el-table-column label="胚胎数量" align="center" prop="qty" width="130px" sortable />
-      <el-table-column label="是否性控" align="center" width="80">
-        <template #default="scope">
-          {{ scope.row.sexCtl === 1 ? '是' : '否' }}
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template #default="scope">
-          <el-tag :type="scope.row.status === '正常' ? 'primary'
-            : scope.row.status === '销售' ? 'success'
-              : scope.row.status === '自用' ? 'warning'
-                : 'danger'">
-            {{ scope.row.status }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="技术员" align="center" prop="tech" />
-      <el-table-column label="液氮罐ID" align="center" prop="tankId" />
-      <el-table-column label="提桶ID" align="center" prop="bucketId" />
-      <el-table-column label="冷冻架ID" align="center" prop="rackId" />
-      <el-table-column label="出库日期" align="center" prop="outDate" width="130px">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.outDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="废弃原因" align="center" prop="discardTxt" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="160px">
-        <template #default="scope">
-          {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
-        <template #default="scope">
-          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+    <div style="flex: 1; overflow: hidden;">
+      <el-table v-loading="loading" :data="embryoList" @selection-change="handleSelectionChange" height="100%"
+        style="width: 100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="主键" align="center" prop="id" /> -->
+        <el-table-column label="胚胎编号" align="center" prop="code" width="130px" fixed="fixed" />
+        <el-table-column label="冻胚日期" align="center" prop="freezeDate" width="130px">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.freezeDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="供体公羊耳号" align="center" prop="drId" width="130px" />
+        <el-table-column label="供体公羊品种" align="center" prop="drBreed" width="130px" />
+        <el-table-column label="供体母羊耳号" align="center" prop="deId" width="130px" />
+        <el-table-column label="供体母羊品种" align="center" prop="deBreed" width="130px" />
+        <el-table-column label="胚胎品种" align="center" prop="embBreed" />
+        <el-table-column label="胚胎阶段等级" align="center" prop="grade" width="130px" />
+        <el-table-column label="胚胎数量" align="center" prop="qty" width="130px" sortable />
+        <el-table-column label="是否性控" align="center" width="80">
+          <template #default="scope">
+            {{ scope.row.sexCtl === 1 ? '是' : '否' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" prop="status">
+          <template #default="scope">
+            <el-tag :type="scope.row.status === '正常' ? 'primary'
+              : scope.row.status === '销售' ? 'success'
+                : scope.row.status === '自用' ? 'warning'
+                  : 'danger'">
+              {{ scope.row.status }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="技术员" align="center" prop="tech" />
+        <el-table-column label="液氮罐ID" align="center" prop="tankId" />
+        <el-table-column label="提桶ID" align="center" prop="bucketId" />
+        <el-table-column label="冷冻架ID" align="center" prop="rackId" />
+        <el-table-column label="出库日期" align="center" prop="outDate" width="130px">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.outDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="废弃原因" align="center" prop="discardTxt" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="160px">
+          <template #default="scope">
+            {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+          <template #default="scope">
+            <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['frozen:embryo:edit']">修改</el-button> -->
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['frozen:embryo:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" />
-
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['frozen:embryo:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    
+    <div style="flex-shrink: 0; padding: 10px 0;">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </div>
     <!-- 添加或修改冻胚库存对话框 -->
     <el-dialog :title="title" v-model="open" width="900px" append-to-body>
       <el-form ref="embryoRef" :model="form" :rules="rules" label-width="120px">
@@ -472,11 +477,11 @@ function handleDelete(row) {
 /** 导出按钮操作 */
 function handleExport() {
   queryParams.value.ids = ids.value;
-  
+
   try {
-    proxy.download('frozen/embryo/export', 
-      {...queryParams.value}, 
-     `冻胚记录${Date.now()}.xlsx`);
+    proxy.download('frozen/embryo/export',
+      { ...queryParams.value },
+      `冻胚记录${Date.now()}.xlsx`);
   } finally {
     queryParams.value.ids = null;
   }
diff --git a/src/views/frozen/sperm/index.vue b/src/views/frozen/sperm/index.vue
index 6efa8bf..30a9755 100644
--- a/src/views/frozen/sperm/index.vue
+++ b/src/views/frozen/sperm/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"
+    style="height: calc(100vh - 84px); display: flex; flex-direction: column; overflow: hidden;">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="冻精号" prop="code">
         <el-input v-model="queryParams.code" placeholder="请输入冻精号/公羊耳号" clearable @keyup.enter="handleQuery"
@@ -52,62 +53,67 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="spermList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="主键" align="center" prop="id" /> -->
-      <el-table-column label="冻精号" align="center" prop="code" width="130px" fixed="fixed" />
-      <el-table-column label="冻精日期" align="center" prop="freezeDt" width="130px">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.freezeDt, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="冻精品种" align="center" prop="breed" />
-      <el-table-column label="生产批次" align="center" prop="batch" width="130px" />
-      <el-table-column label="规格" align="center" prop="spec" />
-      <el-table-column label="数量" align="center" prop="qty" sortable />
-      <el-table-column label="是否性控" align="center">
-        <template #default="scope">
-          {{ scope.row.sexCtl === 1 ? '是' : '否' }}
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="stat">
-        <template #default="scope">
-          <el-tag :type="scope.row.stat === '正常' ? 'primary'
-            : scope.row.stat === '销售' ? 'success'
-              : scope.row.stat === '自用' ? 'warning'
-                : 'danger'">
-            {{ scope.row.stat }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="技术员" align="center" prop="tech" />
-      <el-table-column label="液氮罐ID" align="center" prop="tankId" />
-      <el-table-column label="提桶ID" align="center" prop="bucketId" />
-      <el-table-column label="冷冻架ID" align="center" prop="rackId" />
-      <el-table-column label="出库日期" align="center" prop="outDt" width="130px">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.outDt, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="废弃原因" align="center" prop="discardTxt" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="160px">
-        <template #default="scope">
-          {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
-        <template #default="scope">
-          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['sperm:sperm:edit']">修改</el-button> -->
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['frozen:sperm:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+    <div style="flex: 1; overflow: hidden;">
+      <el-table v-loading="loading" :data="spermList" @selection-change="handleSelectionChange" height="100%"
+        style="width: 100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="主键" align="center" prop="id" /> -->
+        <el-table-column label="冻精号" align="center" prop="code" width="130px" fixed="fixed" />
+        <el-table-column label="冻精日期" align="center" prop="freezeDt" width="130px">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.freezeDt, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="冻精品种" align="center" prop="breed" />
+        <el-table-column label="生产批次" align="center" prop="batch" width="130px" />
+        <el-table-column label="规格" align="center" prop="spec" />
+        <el-table-column label="数量" align="center" prop="qty" sortable />
+        <el-table-column label="是否性控" align="center">
+          <template #default="scope">
+            {{ scope.row.sexCtl === 1 ? '是' : '否' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" prop="stat">
+          <template #default="scope">
+            <el-tag :type="scope.row.stat === '正常' ? 'primary'
+              : scope.row.stat === '销售' ? 'success'
+                : scope.row.stat === '自用' ? 'warning'
+                  : 'danger'">
+              {{ scope.row.stat }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="技术员" align="center" prop="tech" />
+        <el-table-column label="液氮罐ID" align="center" prop="tankId" />
+        <el-table-column label="提桶ID" align="center" prop="bucketId" />
+        <el-table-column label="冷冻架ID" align="center" prop="rackId" />
+        <el-table-column label="出库日期" align="center" prop="outDt" width="130px">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.outDt, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="废弃原因" align="center" prop="discardTxt" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="160px">
+          <template #default="scope">
+            {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+          <template #default="scope">
+            <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['sperm:sperm:edit']">修改</el-button> -->
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['frozen:sperm:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <div style="flex-shrink: 0; padding: 10px 0;">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </div>
 
     <!-- 添加或修改冻精库存对话框 -->
     <el-dialog :title="title" v-model="open" width="700px" append-to-body>
@@ -501,10 +507,10 @@ function handleDelete(row) {
 /** 导出按钮操作 */
 function handleExport() {
   queryParams.value.ids = ids.value;
-  
+
   try {
-    proxy.download('sperm/sperm/export', { 
-      ...queryParams.value 
+    proxy.download('sperm/sperm/export', {
+      ...queryParams.value
     }, `冻精记录${Date.now()}.xlsx`);
   } finally {
     queryParams.value.ids = null;
diff --git a/src/views/produce/bodyManage/body_measure/index.vue b/src/views/produce/bodyManage/body_measure/index.vue
index 1480691..d4e3688 100644
--- a/src/views/produce/bodyManage/body_measure/index.vue
+++ b/src/views/produce/bodyManage/body_measure/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"
+    style="height: calc(100vh - 84px); display: flex; flex-direction: column; overflow: hidden;">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <!-- <el-form-item label="创建时间" style="width: 308px">
         <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
@@ -122,74 +123,77 @@
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
-    <el-table v-loading="loading" :data="body_measureList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="管理耳号" align="center" prop="manageTags" width="100" fixed />
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" width="100" />
-      <el-table-column label="品种" align="center" prop="varietyName" width="100" />
-      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
-      <el-table-column label="测量日期" align="center" prop="measureDate" width="120">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.measureDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="测量时羊只类别" align="center" prop="sheepTypeName" width="100" />
-      <el-table-column label="性别" align="center" prop="gender" width="100">
-        <template #default="scope">
-          <span>{{ genderMap[scope.row.gender] || '未知' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="月龄" align="center" prop="monthAge" width="80" sortable />
-      <el-table-column label="胎次" align="center" prop="parity" width="100" />
-      <el-table-column label="出生体重(kg)" align="center" prop="birthWeight" width="150" sortable />
-      <el-table-column label="断奶体重(kg)" align="center" prop="weaningWeight" width="150" sortable />
-      <el-table-column label="当前体重(kg)" align="center" prop="currentWeight" width="150" sortable />
-      <el-table-column label="体高" align="center" prop="height" width="100" sortable />
-      <el-table-column label="胸围" align="center" prop="bust" width="100" sortable />
-      <el-table-column label="体斜长" align="center" prop="bodyLength" width="150" sortable />
-      <el-table-column label="管围" align="center" prop="pipeLength" width="100" sortable />
-      <el-table-column label="胸深" align="center" prop="chestDepth" width="100" sortable />
-      <el-table-column label="臀高" align="center" prop="hipHeight" width="100" sortable />
-      <el-table-column label="尻宽" align="center" prop="rumpWidth" width="100" sortable />
-      <el-table-column label="尻高" align="center" prop="rumpHeignt" width="100" sortable />
-      <el-table-column label="腰角宽" align="center" prop="hipWidth" width="150" sortable />
-      <el-table-column label="十字部高" align="center" prop="hipCrossHeight" width="150" sortable />
-      <el-table-column label="乳房深度" align="center" prop="breastDepth" width="100" />
-      <el-table-column label="乳头位置" align="center" prop="breastPosition" width="100" />
-      <el-table-column label="乳头长度" align="center" prop="breastLength" width="100" />
-      <el-table-column label="乳房附着" align="center" prop="breastAdbere" width="100" />
-      <el-table-column label="乳房间隔度" align="center" prop="breastSpacing" width="100" />
-      <el-table-column label="乳房评分" align="center" prop="breastScore" width="100" sortable />
-      <el-table-column label="繁育状态" align="center" prop="breedStatusName" width="100">
-        <template #default="scope">
-          <span>{{ scope.row.breedStatusName || '未设置' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="泌乳天数" align="center" prop="lactationDay" width="150" sortable />
-      <el-table-column label="怀孕天数" align="center" prop="gestationDay" width="150" sortable />
-      <el-table-column label="配后天数" align="center" prop="postMatingDay" width="150" sortable />
-      <el-table-column label="体况评分" align="center" prop="bodyScore" width="100" sortable />
-      <el-table-column label="技术员" align="center" prop="technician" width="100" />
-      <el-table-column label="创建人" align="center" prop="createBy" width="100" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="comment" width="180" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="130">
-        <template #default="scope">
-          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+    <div style="flex: 1; overflow: hidden;">
+      <el-table v-loading="loading" :data="body_measureList" @selection-change="handleSelectionChange" height="100%"
+        style="width: 100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="管理耳号" align="center" prop="manageTags" width="100" fixed />
+        <el-table-column label="羊舍" align="center" prop="sheepfoldName" width="100" />
+        <el-table-column label="品种" align="center" prop="varietyName" width="100" />
+        <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
+        <el-table-column label="测量日期" align="center" prop="measureDate" width="120">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.measureDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="测量时羊只类别" align="center" prop="sheepTypeName" width="100" />
+        <el-table-column label="性别" align="center" prop="gender" width="100">
+          <template #default="scope">
+            <span>{{ genderMap[scope.row.gender] || '未知' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="月龄" align="center" prop="monthAge" width="80" sortable />
+        <el-table-column label="胎次" align="center" prop="parity" width="100" />
+        <el-table-column label="出生体重(kg)" align="center" prop="birthWeight" width="150" sortable />
+        <el-table-column label="断奶体重(kg)" align="center" prop="weaningWeight" width="150" sortable />
+        <el-table-column label="当前体重(kg)" align="center" prop="currentWeight" width="150" sortable />
+        <el-table-column label="体高" align="center" prop="height" width="100" sortable />
+        <el-table-column label="胸围" align="center" prop="bust" width="100" sortable />
+        <el-table-column label="体斜长" align="center" prop="bodyLength" width="150" sortable />
+        <el-table-column label="管围" align="center" prop="pipeLength" width="100" sortable />
+        <el-table-column label="胸深" align="center" prop="chestDepth" width="100" sortable />
+        <el-table-column label="臀高" align="center" prop="hipHeight" width="100" sortable />
+        <el-table-column label="尻宽" align="center" prop="rumpWidth" width="100" sortable />
+        <el-table-column label="尻高" align="center" prop="rumpHeignt" width="100" sortable />
+        <el-table-column label="腰角宽" align="center" prop="hipWidth" width="150" sortable />
+        <el-table-column label="十字部高" align="center" prop="hipCrossHeight" width="150" sortable />
+        <el-table-column label="乳房深度" align="center" prop="breastDepth" width="100" />
+        <el-table-column label="乳头位置" align="center" prop="breastPosition" width="100" />
+        <el-table-column label="乳头长度" align="center" prop="breastLength" width="100" />
+        <el-table-column label="乳房附着" align="center" prop="breastAdbere" width="100" />
+        <el-table-column label="乳房间隔度" align="center" prop="breastSpacing" width="100" />
+        <el-table-column label="乳房评分" align="center" prop="breastScore" width="100" sortable />
+        <el-table-column label="繁育状态" align="center" prop="breedStatusName" width="100">
+          <template #default="scope">
+            <span>{{ scope.row.breedStatusName || '未设置' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="泌乳天数" align="center" prop="lactationDay" width="150" sortable />
+        <el-table-column label="怀孕天数" align="center" prop="gestationDay" width="150" sortable />
+        <el-table-column label="配后天数" align="center" prop="postMatingDay" width="150" sortable />
+        <el-table-column label="体况评分" align="center" prop="bodyScore" width="100" sortable />
+        <el-table-column label="技术员" align="center" prop="technician" width="100" />
+        <el-table-column label="创建人" align="center" prop="createBy" width="100" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="comment" width="180" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="130">
+          <template #default="scope">
+            <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['body_measure:body_measure:edit']">修改</el-button> -->
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['body_measure:body_measure:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['body_measure:body_measure:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div style="flex-shrink: 0; padding: 10px 0;">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+    </div>
 
     <!-- 添加或修改体尺测量对话框 -->
     <el-dialog :title="title" v-model="open" width="700px" append-to-body>
diff --git a/src/views/produce/bodyManage/body_score/index.vue b/src/views/produce/bodyManage/body_score/index.vue
index a7dd0f7..8769afa 100644
--- a/src/views/produce/bodyManage/body_score/index.vue
+++ b/src/views/produce/bodyManage/body_score/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"
+    style="height: calc(100vh - 84px); display: flex; flex-direction: column; overflow: hidden;">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="事件日期" style="width: 308px">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
@@ -51,7 +52,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item label="体况评分" prop="score">
-        <el-input-number v-model="queryParams.score" :min="1" :max="5" :step="0.1" :precision="1" placeholder="请输入评分"
+        <el-input-number v-model="queryParams.score" :min="0" :max="5" :step="0.1" :precision="1" placeholder="请输入评分"
           style="width: 150px" clearable />
       </el-form-item>
       <el-form-item label="技术员" prop="technician">
@@ -91,39 +92,44 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="body_scoreList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" fixed />
-      <el-table-column label="品种" align="center" prop="varietyName" />
-      <el-table-column label="事件类型" align="center" prop="eventType" />
-      <el-table-column label="事件日期" align="center" prop="datetime" min-width="120px">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="体况评分" align="center" prop="score" min-width="100px" sortable />
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
-      <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" min-width="130px">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="comment" min-width="130px" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150px" fixed="right">
-        <template #default="scope">
-          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+    <div style="flex: 1; overflow: hidden;">
+      <el-table v-loading="loading" :data="body_scoreList" @selection-change="handleSelectionChange" height="100%"
+        style="width: 100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" fixed />
+        <el-table-column label="品种" align="center" prop="varietyName" />
+        <el-table-column label="事件类型" align="center" prop="eventType" />
+        <el-table-column label="事件日期" align="center" prop="datetime" min-width="120px">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="体况评分" align="center" prop="score" min-width="100px" sortable />
+        <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
+        <el-table-column label="技术员" align="center" prop="technician" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" min-width="130px">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="comment" min-width="130px" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150px"
+          fixed="right">
+          <template #default="scope">
+            <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['body_score:body_score:edit']">修改</el-button> -->
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['body_score:body_score:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
-
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['body_score:body_score:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    
+    <div style="flex-shrink: 0; padding: 10px 0;">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+    </div>
     <!-- 添加或修改体况评分对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="body_scoreRef" :model="form" :rules="rules" label-width="80px">
@@ -285,7 +291,7 @@ function getList() {
   if (queryParams.value.technician) {
     queryParams.value.params["technician"] = queryParams.value.technician
   }
-   if (queryParams.value.score !== null && queryParams.value.score !== undefined && queryParams.value.score !== '') {
+  if (queryParams.value.score !== null && queryParams.value.score !== undefined && queryParams.value.score !== '') {
     queryParams.value.params["score"] = queryParams.value.score
   }
   listBody_score(queryParams.value).then(response => {
@@ -386,8 +392,8 @@ function resetQuery() {
   daterangeCreateTime.value = []
   queryParams.value.varietyId = null
   queryParams.value.manageTagsList = []
-   queryParams.value.score = null 
-     queryParams.value.technician = null
+  queryParams.value.score = null
+  queryParams.value.technician = null
   queryParams.value.isDelete = null
   proxy.resetForm("queryRef")
   handleQuery()
@@ -501,7 +507,7 @@ function handleDelete(row) {
 
 /** 导出按钮操作 */
 function handleExport() {
- queryParams.value.ids = ids.value;
+  queryParams.value.ids = ids.value;
   try {
     proxy.download('body_score/body_score/export', { ...queryParams.value }, `体况评分记录${Date.now()}.xlsx`);
   } finally {
diff --git a/src/views/produce/bodyManage/breast_rating/index.vue b/src/views/produce/bodyManage/breast_rating/index.vue
index 1255989..5da79c5 100644
--- a/src/views/produce/bodyManage/breast_rating/index.vue
+++ b/src/views/produce/bodyManage/breast_rating/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"
+    style="height: calc(100vh - 84px); display: flex; flex-direction: column; overflow: hidden;">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <!-- <el-form-item label="创建时间" style="width: 308px">
         <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
@@ -95,44 +96,51 @@
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-table v-loading="loading" :data="breast_ratingList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" fixed />
-      <el-table-column label="品种" align="center" prop="varietyName" />
-      <el-table-column label="事件类型" align="center" prop="eventType" />
-      <el-table-column label="事件日期" align="center" prop="eventDate" min-width="120px">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="乳房深度" align="center" prop="depth" min-width="150px" sortable />
-      <el-table-column label="乳房位置" align="center" prop="position" />
-      <el-table-column label="乳房长度" align="center" prop="length" min-width="150px" sortable />
-      <el-table-column label="乳房附着" align="center" prop="adbere" />
-      <el-table-column label="乳房间隔度" align="center" prop="spacing" min-width="120px" />
-      <el-table-column label="乳房评分" align="center" prop="score" min-width="150px" sortable />
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="120px" />
-      <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="comment" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120px" fixed="right">
-        <template #default="scope">
-          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+
+    <div style="flex: 1; overflow: hidden;">
+      <el-table v-loading="loading" :data="breast_ratingList" @selection-change="handleSelectionChange" height="100%"
+        style="width: 100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" fixed />
+        <el-table-column label="品种" align="center" prop="varietyName" />
+        <el-table-column label="事件类型" align="center" prop="eventType" />
+        <el-table-column label="事件日期" align="center" prop="eventDate" min-width="120px">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="乳房深度" align="center" prop="depth" min-width="150px" sortable />
+        <el-table-column label="乳房位置" align="center" prop="position" />
+        <el-table-column label="乳房长度" align="center" prop="length" min-width="150px" sortable />
+        <el-table-column label="乳房附着" align="center" prop="adbere" />
+        <el-table-column label="乳房间隔度" align="center" prop="spacing" min-width="120px" />
+        <el-table-column label="乳房评分" align="center" prop="score" min-width="150px" sortable />
+        <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="120px" />
+        <el-table-column label="技术员" align="center" prop="technician" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="comment" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120px"
+          fixed="right">
+          <template #default="scope">
+            <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['breast_rating:breast_rating:edit']">修改</el-button> -->
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['breast_rating:breast_rating:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['breast_rating:breast_rating:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
 
+    <div style="flex-shrink: 0; padding: 10px 0;">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+    </div>
+    
     <!-- 添加或修改乳房评分对话框 -->
     <el-dialog :title="title" v-model="open" width="550px" append-to-body>
       <el-form ref="breast_ratingRef" :model="form" :rules="rules" label-width="115px">
@@ -510,7 +518,7 @@ function handleDelete(row) {
 
 /** 导出按钮操作 */
 function handleExport() {
- queryParams.value.ids = ids.value;
+  queryParams.value.ids = ids.value;
   try {
     proxy.download('breast_rating/breast_rating/export', { ...queryParams.value }, `乳况评分记录${Date.now()}.xlsx`);
   } finally {
diff --git a/src/views/produce/manage_sheep/changeComment/index.vue b/src/views/produce/manage_sheep/changeComment/index.vue
index c0ec08f..9d219c9 100644
--- a/src/views/produce/manage_sheep/changeComment/index.vue
+++ b/src/views/produce/manage_sheep/changeComment/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"
+    style="height: calc(100vh - 84px); display: flex; flex-direction: column; overflow: hidden;">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="事件日期" style="width: 308px">
         <el-date-picker v-model="daterangeEventDate" type="daterange" range-separator="-" start-placeholder="开始日期"
@@ -100,38 +101,41 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="changeCommentList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="管理耳号" align="center" prop="manageTags" />
-      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
-      <el-table-column label="事件日期" align="center" prop="eventDate">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="新备注" align="center" prop="newComment" />
-      <el-table-column label="原备注" align="center" prop="oldComment" />
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
-      <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+    <div style="flex: 1; overflow: hidden;">
+      <el-table v-loading="loading" :data="changeCommentList" @selection-change="handleSelectionChange" height="100%"
+        style="width: 100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="管理耳号" align="center" prop="manageTags" />
+        <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
+        <el-table-column label="事件日期" align="center" prop="eventDate">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="新备注" align="center" prop="newComment" />
+        <el-table-column label="原备注" align="center" prop="oldComment" />
+        <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+        <el-table-column label="技术员" align="center" prop="technician" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['changeComment:changeComment:edit']">修改</el-button> -->
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['changeComment:changeComment:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
-
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['changeComment:changeComment:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div style="flex-shrink: 0; padding: 10px 0;">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+    </div>
     <!-- 添加或修改改备注对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="changeCommentRef" :model="form" :rules="rules" label-width="80px">
diff --git a/src/views/produce/manage_sheep/changeEar/index.vue b/src/views/produce/manage_sheep/changeEar/index.vue
index 52d5a3b..4479d40 100644
--- a/src/views/produce/manage_sheep/changeEar/index.vue
+++ b/src/views/produce/manage_sheep/changeEar/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"
+    style="height: calc(100vh - 84px); display: flex; flex-direction: column; overflow: hidden;">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="事件日期" style="width: 300px">
         <el-date-picker v-model="daterangeEventDate" type="daterange" range-separator="-" start-placeholder="开始日期"
@@ -101,45 +102,50 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="changeEarList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="耳号" align="center" prop="manageTags" />
-      <el-table-column label="品种" align="center" prop="varietyName" />
-      <el-table-column label="事件类型" align="center" prop="eventType" />
-      <el-table-column label="事件日期" align="center" prop="eventDate">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="耳号类型" align="center" prop="earType">
-        <template #default="scope">
-          {{ scope.row.earType === 0 ? '电子耳号' : '管理耳号' }}
-        </template>
-      </el-table-column>
-      <el-table-column label="新耳号" align="center" prop="newTag" />
-      <el-table-column label="旧耳号" align="center" prop="oldTag" />
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
-      <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="comment" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+    <div style="flex: 1; overflow: hidden;">
+      <el-table v-loading="loading" :data="changeEarList" @selection-change="handleSelectionChange" height="100%"
+        style="width: 100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="耳号" align="center" prop="manageTags" />
+        <el-table-column label="品种" align="center" prop="varietyName" />
+        <el-table-column label="事件类型" align="center" prop="eventType" />
+        <el-table-column label="事件日期" align="center" prop="eventDate">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="耳号类型" align="center" prop="earType">
+          <template #default="scope">
+            {{ scope.row.earType === 0 ? '电子耳号' : '管理耳号' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="新耳号" align="center" prop="newTag" />
+        <el-table-column label="旧耳号" align="center" prop="oldTag" />
+        <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+        <el-table-column label="技术员" align="center" prop="technician" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="comment" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['changeEar:changeEar:edit']">修改</el-button> -->
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['changeEar:changeEar:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['changeEar:changeEar:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
 
+    <div style="flex-shrink: 0; padding: 10px 0;">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+    </div>
+    
     <!-- 添加或修改修改电子耳号记录对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="changeEarRef" :model="form" :rules="rules" label-width="80px">
@@ -476,7 +482,7 @@ function handleDelete(row) {
 
 /** 导出按钮操作 */
 function handleExport() {
- queryParams.value.ids = ids.value;
+  queryParams.value.ids = ids.value;
   try {
     proxy.download('changeEar/changeEar/export', { ...queryParams.value }, `改耳号记录${Date.now()}.xlsx`);
   } finally {
diff --git a/src/views/produce/manage_sheep/changeVariety/index.vue b/src/views/produce/manage_sheep/changeVariety/index.vue
index ef4cd05..ee4e5e2 100644
--- a/src/views/produce/manage_sheep/changeVariety/index.vue
+++ b/src/views/produce/manage_sheep/changeVariety/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"
+    style="height: calc(100vh - 84px); display: flex; flex-direction: column; overflow: hidden;">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="事件日期" style="width: 308px">
         <el-date-picker v-model="daterangeEventDate" type="daterange" range-separator="-" start-placeholder="开始日期"
@@ -103,39 +104,43 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="changeVarietyList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="管理耳号" align="center" prop="manageTags" />
-      <el-table-column label="品种" align="center" prop="varietyOld" />
-      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
-      <el-table-column label="事件日期" align="center" prop="eventDate">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="新品种" align="center" prop="varietyNew" />
-      <el-table-column label="旧品种" align="center" prop="varietyOld" />
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
-      <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建日期" align="center" prop="createTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="comment" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+    <div style="flex: 1; overflow: hidden;">
+      <el-table v-loading="loading" :data="changeVarietyList" @selection-change="handleSelectionChange" height="100%"
+        style="width: 100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="管理耳号" align="center" prop="manageTags" />
+        <el-table-column label="品种" align="center" prop="varietyOld" />
+        <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
+        <el-table-column label="事件日期" align="center" prop="eventDate">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="新品种" align="center" prop="varietyNew" />
+        <el-table-column label="旧品种" align="center" prop="varietyOld" />
+        <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+        <el-table-column label="技术员" align="center" prop="technician" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建日期" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="comment" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['changeVariety:changeVariety:edit']">修改</el-button> -->
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['changeVariety:changeVariety:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['changeVariety:changeVariety:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div style="flex-shrink: 0; padding: 10px 0;">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+    </div>
 
     <!-- 添加或修改改品种记录对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
@@ -444,10 +449,10 @@ function handleDelete(row) {
 /** 导出按钮操作 */
 function handleExport() {
   queryParams.value.ids = ids.value;
-  
+
   try {
-    proxy.download('changeVariety/changeVariety/export', 
-      { ...queryParams.value }, 
+    proxy.download('changeVariety/changeVariety/export',
+      { ...queryParams.value },
       `改品种记录_${Date.now()}.xlsx`
     );
   } finally {
@@ -615,7 +620,7 @@ onMounted(() => {
   flex-wrap: wrap;
   align-items: center;
   box-sizing: border-box;
-    width: 100%;
+  width: 100%;
 }
 
 .placeholder-text {
@@ -629,6 +634,6 @@ onMounted(() => {
   color: #c0c4cc;
   font-size: 14px;
   box-sizing: border-box;
-    width: 100%;
+  width: 100%;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/produce/manage_sheep/trans_group/index.vue b/src/views/produce/manage_sheep/trans_group/index.vue
index df76735..3c61176 100644
--- a/src/views/produce/manage_sheep/trans_group/index.vue
+++ b/src/views/produce/manage_sheep/trans_group/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"
+    style="height: calc(100vh - 84px); display: flex; flex-direction: column; overflow: hidden;">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="转群日期" style="width: 308px">
         <el-date-picker v-model="daterangeTransDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
@@ -109,37 +110,42 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="trans_groupList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" fixed />
-      <el-table-column label="品种" align="center" prop="varietyName" />
-      <el-table-column label="事件类型" align="center" prop="eventTypeText" />
-      <el-table-column label="转群日期" align="center" prop="transDate" min-width="120" />
-      <el-table-column label="转入羊舍" align="center" prop="foldToName" min-width="130" />
-      <el-table-column label="转出羊舍" align="center" prop="foldFromName" min-width="130" />
-      <!-- <el-table-column label="羊只类别" align="center" prop="sheepTypeName" /> -->
-      <el-table-column label="转群原因" align="center" prop="reasonText" min-width="120" />
-      <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" min-width="120">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="comment" min-width="120" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="160" fixed="right">
-        <template #default="scope">
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['produce:trans_group:remove']">
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+    <div style="flex: 1; overflow: hidden;">
+      <el-table v-loading="loading" :data="trans_groupList" @selection-change="handleSelectionChange" height="100%"
+        style="width: 100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" fixed />
+        <el-table-column label="品种" align="center" prop="varietyName" />
+        <el-table-column label="事件类型" align="center" prop="eventTypeText" />
+        <el-table-column label="转群日期" align="center" prop="transDate" min-width="120" />
+        <el-table-column label="转入羊舍" align="center" prop="foldToName" min-width="130" />
+        <el-table-column label="转出羊舍" align="center" prop="foldFromName" min-width="130" />
+        <!-- <el-table-column label="羊只类别" align="center" prop="sheepTypeName" /> -->
+        <el-table-column label="转群原因" align="center" prop="reasonText" min-width="120" />
+        <el-table-column label="技术员" align="center" prop="technician" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" min-width="120">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="comment" min-width="120" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="160" fixed="right">
+          <template #default="scope">
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['produce:trans_group:remove']">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
 
+    <div style="flex-shrink: 0; padding: 10px 0;">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+    </div>
+    
     <!-- 添加或修改转群记录对话框 -->
     <el-dialog :title="title" v-model="open" width="700px" append-to-body>
       <el-form ref="trans_groupRef" :model="form" :rules="rules" label-width="80px">
@@ -759,7 +765,7 @@ function handleDelete(row) {
 }
 //导出
 function handleExport() {
- queryParams.value.ids = ids.value;
+  queryParams.value.ids = ids.value;
   try {
     proxy.download('/produce/manage_sheep/trans_group/export', { ...queryParams.value }, `转群记录${Date.now()}.xlsx`);
   } finally {
diff --git a/src/views/produce/manage_sheep/transition_info/index.vue b/src/views/produce/manage_sheep/transition_info/index.vue
index 7f7739a..bedb059 100644
--- a/src/views/produce/manage_sheep/transition_info/index.vue
+++ b/src/views/produce/manage_sheep/transition_info/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"
+    style="height: calc(100vh - 84px); display: flex; flex-direction: column; overflow: hidden;">
     <!-- 查询表单 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="转场日期" style="width: 308px">
@@ -128,53 +129,58 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="transition_infoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" fixed />
-      <el-table-column label="品种" align="center" prop="varietyName" />
-      <el-table-column label="事件类型" align="center" prop="eventType" min-width="120" />
-      <el-table-column label="转场日期" align="center" prop="transitionDate" min-width="150">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.transitionDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="转场类型" align="center" prop="transTypeText" />
-      <el-table-column label="转入牧场" align="center" prop="transTo" min-width="120" />
-      <el-table-column label="转出牧场" align="center" prop="transFrom" />
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="120" />
-      <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" min-width="130">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="comment" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template #default="scope">
-          <dict-tag :options="status" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="当前状态" align="center" prop="status" min-width="120">
+    <div style="flex: 1; overflow: hidden;">
+      <el-table v-loading="loading" :data="transition_infoList" @selection-change="handleSelectionChange" height="100%"
+        style="width: 100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" fixed />
+        <el-table-column label="品种" align="center" prop="varietyName" />
+        <el-table-column label="事件类型" align="center" prop="eventType" min-width="120" />
+        <el-table-column label="转场日期" align="center" prop="transitionDate" min-width="150">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.transitionDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="转场类型" align="center" prop="transTypeText" />
+        <el-table-column label="转入牧场" align="center" prop="transTo" min-width="120" />
+        <el-table-column label="转出牧场" align="center" prop="transFrom" />
+        <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="120" />
+        <el-table-column label="技术员" align="center" prop="technician" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" min-width="130">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="comment" />
+        <el-table-column label="状态" align="center" prop="status">
+          <template #default="scope">
+            <dict-tag :options="status" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="当前状态" align="center" prop="status" min-width="120">
         <template #default="scope">
           <span v-if="scope.row.status === 0">待审批</span>
           <span v-else-if="scope.row.status === 1 || scope.row.status === 2">审批完成</span>
           <span v-else>未知状态</span>
         </template>
       </el-table-column> -->
-      <el-table-column label="操作" align="center" min-width="180" fixed="right">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
-            v-hasPermi="['produce:transition_info:approve']" :disabled="scope.row.status !== 0">审批</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['produce:transition_info:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+        <el-table-column label="操作" align="center" min-width="180" fixed="right">
+          <template #default="scope">
+            <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
+              v-hasPermi="['produce:transition_info:approve']" :disabled="scope.row.status !== 0">审批</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['produce:transition_info:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
 
+    <div style="flex-shrink: 0; padding: 10px 0;">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+    </div>
+    
     <!-- 新增/修改 -->
     <el-dialog :title="title" v-model="open" width="700px" append-to-body>
       <el-form ref="transition_infoRef" :model="form" :rules="rules" label-width="80px">
@@ -574,7 +580,7 @@ async function loadSheepInfo() {
 
 // 导出
 function handleExport() {
- queryParams.value.ids = ids.value;
+  queryParams.value.ids = ids.value;
   try {
     proxy.download('/produce/manage_sheep/transition_info/export', { ...queryParams.value }, `转场记录${Date.now()}.xlsx`);
   } finally {
@@ -694,7 +700,7 @@ async function handleUpdate(row) {
     form.value = {
       ...response.data,
       manageTags: [response.data.manageTags],
-       comment: response.data.comment || ''
+      comment: response.data.comment || ''
     };
     open.value = true;
     title.value = "修改转场";
@@ -795,10 +801,10 @@ async function handleRanchChange(ranchName) {
   batchTags.value = sheepList.map(s => s.manageTags);
   batchSheep.value = sheepList;
   form.value.manageTags = batchTags.value.join(' ');
-  
+
   // 自动填充转出牧场（当前选中的牧场）
   form.value.transFrom = ranchName;
-  
+
   sheepOptions.value = sheepList;
 }
 /* 粘贴事件 */
diff --git a/src/views/produce/other/castrate/index.vue b/src/views/produce/other/castrate/index.vue
index 6b5a38d..5f42173 100644
--- a/src/views/produce/other/castrate/index.vue
+++ b/src/views/produce/other/castrate/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"
+    style="height: calc(100vh - 84px); display: flex; flex-direction: column; overflow: hidden;">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="事件日期" style="width: 308px">
@@ -91,37 +92,43 @@
     </el-row>
 
     <!-- 列表表格 -->
-    <el-table v-loading="loading" :data="castrateList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="耳号" align="center" prop="manageTags" />
-      <el-table-column label="品种" align="center" prop="varietyName" />
-      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
-      <el-table-column label="去势日期" align="center" prop="eventDate" width="130">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
-      <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="comment" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <!-- 按需添加 是否需要修改功能 -->
-          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+    <div style="flex: 1; overflow: hidden;">
+      <el-table v-loading="loading" :data="castrateList" @selection-change="handleSelectionChange" height="100%"
+        style="width: 100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="耳号" align="center" prop="manageTags" />
+        <el-table-column label="品种" align="center" prop="varietyName" />
+        <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
+        <el-table-column label="去势日期" align="center" prop="eventDate" width="130">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+        <el-table-column label="技术员" align="center" prop="technician" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="comment" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <!-- 按需添加 是否需要修改功能 -->
+            <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['produce:castrate:edit']">修改</el-button> -->
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['produce:castrate:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['produce:castrate:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div style="flex-shrink: 0; padding: 10px 0;">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+    </div>
 
     <!-- 新增/修改弹窗 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
diff --git a/src/views/produce/other/fixHoof/index.vue b/src/views/produce/other/fixHoof/index.vue
index d4d2ab3..02733a8 100644
--- a/src/views/produce/other/fixHoof/index.vue
+++ b/src/views/produce/other/fixHoof/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"
+    style="height: calc(100vh - 84px); display: flex; flex-direction: column; overflow: hidden;">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="事件日期" style="width: 308px">
         <el-date-picker v-model="daterangeEventDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
@@ -90,39 +91,44 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="fixHoofList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="耳号" align="center" prop="manageTags" />
-      <el-table-column label="品种" align="center" prop="varietyName" />
-      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
-      <el-table-column label="修蹄日期" align="center" prop="eventDate" width="130">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
-      <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="comment" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <!-- 按需添加 是否需要修改功能 -->
-          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+    <div style="flex: 1; overflow: hidden;">
+      <el-table v-loading="loading" :data="fixHoofList" @selection-change="handleSelectionChange" height="100%"
+        style="width: 100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="耳号" align="center" prop="manageTags" />
+        <el-table-column label="品种" align="center" prop="varietyName" />
+        <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
+        <el-table-column label="修蹄日期" align="center" prop="eventDate" width="130">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+        <el-table-column label="技术员" align="center" prop="technician" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="comment" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <!-- 按需添加 是否需要修改功能 -->
+            <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['produce:fixHoof:edit']">修改</el-button> -->
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['produce:fixHoof:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['produce:fixHoof:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
 
+    <div style="flex-shrink: 0; padding: 10px 0;">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
+    </div>
+    
     <!-- 弹窗 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="fixHoofRef" :model="form" :rules="rules" label-width="80px">