From c44b2da61967e1676f66a03063e0816b50ca4ad9 Mon Sep 17 00:00:00 2001
From: zyh <2066096076@qq.com>
Date: Tue, 19 Aug 2025 17:09:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E5=88=86bug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=88=9B=E5=BB=BA=E6=97=A5=E6=9C=9F=E7=B2=BE=E7=A1=AE?=
 =?UTF-8?q?=E5=88=B0=E5=87=A0=E7=82=B9=E5=87=A0=E5=88=86=EF=BC=8C=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=94=BE=E6=9C=80=E5=89=8D=E9=9D=A2=EF=BC=8C=E8=BD=AC?=
 =?UTF-8?q?=E5=9C=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../produce/bodyManage/body_measure/index.vue |  44 +--
 .../produce/bodyManage/body_score/index.vue   |  41 +--
 .../bodyManage/breast_rating/index.vue        |  37 +-
 .../produce/manage_sheep/add_sheep/index.vue  |  70 ++--
 .../manage_sheep/changeComment/index.vue      |  44 ++-
 .../produce/manage_sheep/changeEar/index.vue  |  44 ++-
 .../manage_sheep/changeVariety/index.vue      |  43 ++-
 .../manage_sheep/trans_group/index.vue        | 328 +++++++++++-------
 .../manage_sheep/transition_info/index.vue    | 245 ++++++++++---
 src/views/produce/other/castrate/index.vue    |  54 +--
 src/views/produce/other/fixHoof/index.vue     |  57 +--
 11 files changed, 655 insertions(+), 352 deletions(-)

diff --git a/src/views/produce/bodyManage/body_measure/index.vue b/src/views/produce/bodyManage/body_measure/index.vue
index bca09c7..70e7936 100644
--- a/src/views/produce/bodyManage/body_measure/index.vue
+++ b/src/views/produce/bodyManage/body_measure/index.vue
@@ -4,6 +4,14 @@
       <!-- <el-form-item label="羊只id" prop="sheepId">
         <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
       </el-form-item> -->
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="测量日期" style="width: 308px">
+        <el-date-picker v-model="daterangeMeasureDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
@@ -13,24 +21,16 @@
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="品种" prop="varietyId">
+      <el-form-item label="品种" prop="varietyId" style="width: 308px">
         <el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="测量日期" style="width: 308px">
-        <el-date-picker v-model="daterangeMeasureDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
       <el-form-item label="羊只类别" prop="sheepTypeId">
         <el-select v-model="queryParams.sheepTypeId" placeholder="请选择羊只类别" clearable style="min-width:150px">
           <el-option v-for="type in sheepTypeList" :key="type.id" :label="type.name" :value="type.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -59,17 +59,20 @@
 
     <el-table v-loading="loading" :data="body_measureList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
-      <!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
-      <el-table-column label="管理耳号" align="center" prop="manageTags" fixed min-width="100px" />
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
-      <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="createTime" width="180" fixed>
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <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="manageTags" min-width="100px" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
+      <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="sheepTypeName" />
       <el-table-column label="性别" align="center">
         <template #default="scope">
@@ -90,25 +93,21 @@
       <el-table-column label="尻高" align="center" prop="rumpHeignt" />
       <el-table-column label="腰角宽" align="center" prop="hipWidth" />
       <el-table-column label="十字部高" align="center" prop="hipCrossHeight" />
-
       <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="100">
         <template #default="scope">
           <span>{{ scope.row.lactationDay || '-' }}</span>
         </template>
       </el-table-column>
-
       <el-table-column label="怀孕天数" align="center" prop="gestationDay" width="100">
         <template #default="scope">
           <span>{{ scope.row.gestationDay || '-' }}</span>
         </template>
       </el-table-column>
-
       <el-table-column label="配后天数" align="center" prop="postMatingDay" width="100">
         <template #default="scope">
           <span>{{ scope.row.postMatingDay || '-' }}</span>
@@ -117,11 +116,6 @@
       <el-table-column label="备注" align="center" prop="comment" 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" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="130px">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -411,7 +405,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除体尺测量编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delBody_measure(_ids)
   }).then(() => {
     getList()
diff --git a/src/views/produce/bodyManage/body_score/index.vue b/src/views/produce/bodyManage/body_score/index.vue
index 3798777..4c99430 100644
--- a/src/views/produce/bodyManage/body_score/index.vue
+++ b/src/views/produce/bodyManage/body_score/index.vue
@@ -4,6 +4,14 @@
       <!-- <el-form-item label="羊只id" prop="sheepId">
         <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
       </el-form-item> -->
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="事件日期" style="width: 308px">
+        <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
@@ -13,26 +21,15 @@
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="事件日期" style="width: 308px">
-        <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
-      <el-form-item label="体况评分" prop="score">
+      <!-- <el-form-item label="体况评分" prop="score">
         <el-input v-model="queryParams.score" placeholder="请输入体况评分" clearable @keyup.enter="handleQuery"
           style="max-width: 150px;" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="羊舍" prop="sheepfold">
         <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="羊舍id" prop="sheepfold">
-        <el-input v-model="queryParams.sheepfold" placeholder="请输入羊舍id" clearable @keyup.enter="handleQuery" />
-      </el-form-item> -->
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -63,25 +60,25 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
       <!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
-      <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="createTime" min-width="130px" fixed>
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <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="manageTags" min-width="100px" />
+      <el-table-column label="品种" align="center" prop="varietyName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" />
       <el-table-column label="体况评分" align="center" prop="score" />
       <!-- <el-table-column label="羊舍id" align="center" prop="sheepfold" /> -->
       <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
       <el-table-column label="备注" align="center" prop="comment" min-width="130px" />
       <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}') }}</span>
-        </template>
-      </el-table-column>
       <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)"
@@ -343,7 +340,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除体况评分编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delBody_score(_ids)
   }).then(() => {
     getList()
diff --git a/src/views/produce/bodyManage/breast_rating/index.vue b/src/views/produce/bodyManage/breast_rating/index.vue
index f10e00d..6a51052 100644
--- a/src/views/produce/bodyManage/breast_rating/index.vue
+++ b/src/views/produce/bodyManage/breast_rating/index.vue
@@ -4,6 +4,14 @@
       <!-- <el-form-item label="羊只id" prop="sheepId">
         <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
       </el-form-item> -->
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+       <el-form-item label="事件日期" style="width: 308px">
+        <el-date-picker v-model="daterangeEventDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入耳号搜索" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
@@ -13,25 +21,16 @@
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="事件日期" style="width: 308px">
-        <el-date-picker v-model="daterangeEventDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
       <el-form-item label="羊舍" prop="sheepfoldId">
         <el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
@@ -54,16 +53,19 @@
 
     <el-table v-loading="loading" :data="breast_ratingList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
-      <!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
-      <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="createTime" min-width="150" fixed>
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <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="manageTags" min-width="100px" />
+      <el-table-column label="品种" align="center" prop="varietyName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" />
       <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="120px" />
       <el-table-column label="乳房深度" align="center" prop="depth" />
       <el-table-column label="乳房长度" align="center" prop="length" />
@@ -74,11 +76,6 @@
       <el-table-column label="备注" align="center" prop="comment" />
       <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}') }}</span>
-        </template>
-      </el-table-column>
       <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)"
@@ -335,7 +332,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除乳房评分编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delBreast_rating(_ids)
   }).then(() => {
     getList()
diff --git a/src/views/produce/manage_sheep/add_sheep/index.vue b/src/views/produce/manage_sheep/add_sheep/index.vue
index 1380d22..807811c 100644
--- a/src/views/produce/manage_sheep/add_sheep/index.vue
+++ b/src/views/produce/manage_sheep/add_sheep/index.vue
@@ -61,7 +61,7 @@
         </el-col>
         <el-col :span="10">
           <el-form-item label="胎次" prop="parity">
-            <el-input v-model="form.parity" placeholder="请输入胎次" />
+            <el-input-number v-model="form.parity" :min="0" label="胎次" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -75,13 +75,20 @@
           </el-form-item>
         </el-col>
         <el-col :span="10">
-          <el-form-item label="入群日期" prop="joinDate">
-            <el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
+          <el-form-item label="羊只类别" prop="typeId">
+            <el-select v-model="form.typeId" placeholder="请选择羊只类别" clearable>
+              <el-option v-for="type in sheepTypeList" :key="type.id" :label="type.name" :value="Number(type.id)" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
 
       <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="入群日期" prop="joinDate">
+            <el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
+          </el-form-item>
+        </el-col>
         <el-col :span="10">
           <el-form-item label="技术员" prop="technician">
             <el-input v-model="form.technician" placeholder="请输入技术员" />
@@ -102,26 +109,27 @@
         <el-button @click="resetForm">重置</el-button>
       </el-form-item>
     </el-form>
-  </div>
 
-  <!-- 导入弹窗 -->
-  <el-dialog title="导入羊只信息" v-model="importOpen" width="400px" append-to-body>
-    <el-upload ref="uploadRef" :limit="1" accept=".xlsx,.xls" :action="importUrl" :headers="headers"
-      :auto-upload="false" :on-success="handleImportSuccess" :on-error="handleImportError" drag>
-      <i class="el-icon-upload" />
-      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-    </el-upload>
-    <template #footer>
-      <el-button type="info" @click="downloadTemplate">下载模板</el-button>
-      <el-button type="primary" @click="submitUpload">确 定</el-button>
-    </template>
-  </el-dialog>
+    <!-- 导入弹窗 -->
+    <el-dialog title="导入羊只信息" v-model="importOpen" width="400px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx,.xls" :action="importUrl" :headers="headers"
+        :auto-upload="false" :on-success="handleImportSuccess" :on-error="handleImportError" drag>
+        <i class="el-icon-upload" />
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      </el-upload>
+      <template #footer>
+        <el-button type="info" @click="downloadTemplate">下载模板</el-button>
+        <el-button type="primary" @click="submitUpload">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup>
-import { ref, onMounted, getCurrentInstance } from 'vue'
+import { ref, getCurrentInstance } from 'vue'
 import request from '@/utils/request'
 import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep'
+import { getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { getToken } from '@/utils/auth'
 
@@ -137,6 +145,7 @@ const form = ref({
   gender: '',
   parity: '',
   varietyId: '',
+  typeId: null,
   joinDate: '',
   comment: '',
   technician: ''
@@ -153,8 +162,9 @@ const rules = {
   birthday: [{ required: true, message: '请选择出生日期', trigger: 'change' }],
   gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
   varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }],
-  joinDate:[{ required: true, message: '请选择入群日期', trigger: 'change' }],
-  technician:[{ required: true, message: '请输入技术员', trigger: 'change' }],
+  typeId: [{ required: true, message: '请选择羊只类别', trigger: 'change' }],
+  joinDate: [{ required: true, message: '请选择入群日期', trigger: 'change' }],
+  technician: [{ required: true, message: '请输入技术员', trigger: 'change' }],
 }
 
 // 校验耳号是否存在
@@ -211,6 +221,16 @@ function getVarietyOptions() {
   })
 }
 
+// 加载羊只类别数据
+const sheepTypeList = ref([]);
+function loadSheepTypeList() {
+  getSheepTypeList().then(response => {
+    sheepTypeList.value = response.rows || [];
+  }).catch(error => {
+    console.error('加载羊只类别失败', error);
+  });
+}
+
 //确保日期格式一致
 function formatDate(date) {
   if (!date) return null;
@@ -254,8 +274,9 @@ function resetForm() {
     bornWeight: '',
     birthday: '',
     gender: '',
-    parity: '',
+    parity: 0,
     varietyId: '',
+    typeId: null,
     joinDate: '',
     comment: '',
     technician: ''
@@ -312,10 +333,11 @@ function handleImportError(err) {
   proxy.$modal.msgError('导入失败：' + msg)
 }
 
-
-getSheepfoldOptions()
-getVarietyOptions()
-
+onMounted(() => {
+  getSheepfoldOptions()
+  loadSheepTypeList()
+  getVarietyOptions()
+})
 </script>
 
 <style scoped>
diff --git a/src/views/produce/manage_sheep/changeComment/index.vue b/src/views/produce/manage_sheep/changeComment/index.vue
index b689ebe..2328cf1 100644
--- a/src/views/produce/manage_sheep/changeComment/index.vue
+++ b/src/views/produce/manage_sheep/changeComment/index.vue
@@ -9,6 +9,10 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item> -->
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
@@ -21,9 +25,10 @@
         <el-input v-model="queryParams.oldComment" placeholder="请输入原备注" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      <el-form-item label="羊舍" prop="sheepfoldId">
+        <el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
+          <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -55,15 +60,17 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
       <!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
+      <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="manageTags" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
       <el-table-column label="新备注" align="center" prop="newComment" />
       <el-table-column label="原备注" align="center" prop="oldComment" />
       <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}') }}</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)"
@@ -106,6 +113,7 @@
 <script setup name="ChangeComment">
 import { listChangeComment, getChangeComment, delChangeComment, addChangeComment, updateChangeComment } from "@/api/produce/manage_sheep/changeComment"
 import { getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 
 const { proxy } = getCurrentInstance()
 
@@ -127,6 +135,7 @@ const data = reactive({
     pageSize: 10,
     sheepId: null,
     manageTags: null,
+    sheepfoldId: null,
     newComment: null,
     oldComment: null,
     createTime: null
@@ -151,6 +160,9 @@ function getList() {
     queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
     queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
   }
+  if (queryParams.value.sheepfoldId) {
+    queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
+  }
   listChangeComment(queryParams.value).then(response => {
     changeCommentList.value = response.rows
     total.value = response.total
@@ -208,6 +220,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
+  queryParams.value.sheepfoldId = null
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -270,7 +283,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除改备注编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delChangeComment(_ids)
   }).then(() => {
     getList()
@@ -285,5 +298,16 @@ function handleExport() {
   }, `changeComment_${new Date().getTime()}.xlsx`)
 }
 
-getList()
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
+}
+
+onMounted(() => {
+  getSheepfoldOptions();
+  getList();
+});
 </script>
diff --git a/src/views/produce/manage_sheep/changeEar/index.vue b/src/views/produce/manage_sheep/changeEar/index.vue
index b2b6f83..6ac38a4 100644
--- a/src/views/produce/manage_sheep/changeEar/index.vue
+++ b/src/views/produce/manage_sheep/changeEar/index.vue
@@ -4,6 +4,10 @@
       <!-- <el-form-item label="羊只id" prop="sheepId">
         <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
       </el-form-item> -->
+      <el-form-item label="创建时间" style="width: 300px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="耳号" prop="manageTag">
         <el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
@@ -16,9 +20,10 @@
         <el-input v-model="queryParams.oldTag" placeholder="请输入旧耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      <el-form-item label="羊舍" prop="sheepfoldId">
+        <el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
+          <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -50,7 +55,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
+      <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="manageTags" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" />
       <el-table-column label="耳号类型" align="center" prop="earType">
         <template #default="scope">
           {{ scope.row.earType === 0 ? '电子耳号' : '管理耳号' }}
@@ -60,11 +72,6 @@
       <el-table-column label="旧耳号" align="center" prop="oldTag" />
       <el-table-column label="备注" align="center" prop="comment" />
       <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}') }}</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)"
@@ -87,7 +94,6 @@
         <el-form-item label="耳号" prop="earNumber">
           <el-input v-model="form.earNumber" placeholder="请输入管理耳号或电子耳号" @change="fetchOldTag" :disabled="!isAddMode" />
         </el-form-item>
-
         <el-form-item label="耳号类型" prop="earType">
           <el-select v-model="form.earType" placeholder="请选择耳号类型" @change="fetchOldTag" :disabled="!isAddMode">
             <el-option label="电子耳号" :value="0"></el-option>
@@ -98,7 +104,7 @@
           <el-input v-model="form.newTag" placeholder="请输入新耳号/电子耳号" @blur="checkNewTagExists" :disabled="!isAddMode" />
         </el-form-item>
         <el-form-item label="旧耳号" prop="oldTag">
-          <el-input v-model="form.oldTag" placeholder="请输入旧耳号/电子耳号" disabled/>
+          <el-input v-model="form.oldTag" placeholder="请输入旧耳号/电子耳号" disabled />
         </el-form-item>
         <el-form-item label="备注" prop="comment" v-if="!isAddMode">
           <el-input v-model="form.comment" type="textarea" placeholder="请输入内容" :disabled="!isAddMode" />
@@ -116,7 +122,7 @@
 
 <script setup name="ChangeEar">
 import { listChangeEar, getChangeEar, delChangeEar, addChangeEar, updateChangeEar, getSheepByEarNumber, checkTagExists } from "@/api/produce/manage_sheep/changeEar"
-
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 const { proxy } = getCurrentInstance()
 
 const changeEarList = ref([])
@@ -138,6 +144,7 @@ const data = reactive({
     pageSize: 10,
     manageTags: null,
     // sheepId: null,
+    sheepfoldId: null,
     earType: null,
     newTag: null,
     oldTag: null,
@@ -168,6 +175,9 @@ async function getList() {
   if (queryParams.value.manageTags) {
     queryParams.value.params["manageTags"] = queryParams.value.manageTags;
   }
+  if (queryParams.value.sheepfoldId) {
+    queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
+  }
   if (daterangeCreateTime.value && daterangeCreateTime.value.length > 0) {
     queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0];
     queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1];
@@ -214,7 +224,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
-
+  queryParams.value.sheepfoldName = null
   queryParams.value.manageTags = null
   queryParams.value.newTag = null
   queryParams.value.oldTag = null
@@ -347,7 +357,7 @@ function fetchOldTag() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除修改电子耳号记录编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delChangeEar(_ids)
   }).then(() => {
     getList()
@@ -362,8 +372,16 @@ function handleExport() {
   }, `changeEar_${new Date().getTime()}.xlsx`)
 }
 
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
+}
 
 onMounted(() => {
+  getSheepfoldOptions();
   getList();
 });
 </script>
diff --git a/src/views/produce/manage_sheep/changeVariety/index.vue b/src/views/produce/manage_sheep/changeVariety/index.vue
index 5f00446..70beb33 100644
--- a/src/views/produce/manage_sheep/changeVariety/index.vue
+++ b/src/views/produce/manage_sheep/changeVariety/index.vue
@@ -9,6 +9,10 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item> -->
+      <el-form-item label="创建日期" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="width: 150px;" />
@@ -23,9 +27,10 @@
           <el-option v-for="item in varietyOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建日期" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      <el-form-item label="羊舍" prop="sheepfoldId">
+        <el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
+          <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -57,16 +62,18 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="${comment}" align="center" prop="id" />
       <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
+      <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="manageTags" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
       <el-table-column label="原品种" align="center" prop="varietyOld" />
       <el-table-column label="新品种" align="center" prop="varietyNew" />
       <el-table-column label="备注" align="center" prop="comment" />
       <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}') }}</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)"
@@ -90,7 +97,7 @@
           <el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="onManageTagsBlur" :disabled="!isAdd" />
         </el-form-item>
         <el-form-item label="原品种" prop="varietyOld">
-          <el-input v-model="form.varietyOld" placeholder="请输入原品种" disabled/>
+          <el-input v-model="form.varietyOld" placeholder="请输入原品种" disabled />
         </el-form-item>
         <el-form-item label="新品种" prop="varietyNew">
           <el-select v-model="form.varietyNew" placeholder="请选择新品种" clearable filterable :disabled="!isAdd">
@@ -113,6 +120,7 @@
 
 <script setup name="ChangeVariety">
 import { listChangeVariety, getChangeVariety, delChangeVariety, addChangeVariety, updateChangeVariety, getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { listVariety } from '@/api/variety/variety'
 
 const { proxy } = getCurrentInstance()
@@ -139,6 +147,7 @@ const data = reactive({
     pageSize: 10,
     // sheepId: null,
     manageTags: null,
+    sheepfoldId: null,
     varietyOld: null,
     varietyNew: null,
     createTime: null
@@ -166,6 +175,9 @@ function getList() {
     queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
     queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
   }
+  if (queryParams.value.sheepfoldId) {
+    queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
+  }
   listChangeVariety(queryParams.value).then(response => {
     changeVarietyList.value = response.rows
     total.value = response.total
@@ -234,6 +246,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
+  queryParams.value.sheepfoldId = null;
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -298,7 +311,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除改品种记录编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delChangeVariety(_ids)
   }).then(() => {
     getList()
@@ -313,8 +326,18 @@ function handleExport() {
   }, `changeVariety_${new Date().getTime()}.xlsx`)
 }
 
+
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
+}
+
 onMounted(() => {
   loadVarietyOptions();
+  getSheepfoldOptions();
   getList();
 });
 </script>
diff --git a/src/views/produce/manage_sheep/trans_group/index.vue b/src/views/produce/manage_sheep/trans_group/index.vue
index 682e9a7..0589400 100644
--- a/src/views/produce/manage_sheep/trans_group/index.vue
+++ b/src/views/produce/manage_sheep/trans_group/index.vue
@@ -1,16 +1,29 @@
 <template>
   <div class="app-container">
     <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="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="转群日期" style="width: 308px">
+        <el-date-picker v-model="daterangeTransDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery"
           style="width: 150px;" />
       </el-form-item>
-      <el-form-item label="转出羊舍" prop="foldFrom">
+      <el-form-item label="事件类型" prop="eventType">
+        <el-select v-model="queryParams.eventType" placeholder="请选择事件类型" style="min-width:150px" clearable required>
+          <el-option v-for="dict in eventTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="转出羊舍" prop="foldFrom" style="width: 308px">
         <el-select v-model="queryParams.foldFrom" placeholder="请选择转出羊舍" style="min-width:150px" clearable>
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="转入羊舍" prop="foldTo">
+      <el-form-item label="转入羊舍" prop="foldTo" style="width: 308px">
         <el-select v-model="queryParams.foldTo" placeholder="请选择转入羊舍" style="min-width:150px" clearable>
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
@@ -20,15 +33,16 @@
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
+      <el-form-item label="羊只类型" prop="sheepTypeId">
+        <el-select v-model="queryParams.sheepTypeId" placeholder="请选择羊只类型" clearable style="min-width:150px">
+          <el-option v-for="type in sheepTypeOptions" :key="type.id" :label="type.name" :value="type.id" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" style="width: 150px;" placeholder="请选择状态" clearable>
           <el-option v-for="dict in status" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -40,10 +54,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['trans_group:trans_group:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
           v-hasPermi="['trans_group:trans_group:edit']">修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['trans_group:trans_group:remove']">删除</el-button>
@@ -57,25 +71,29 @@
 
     <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" />
-      <el-table-column label="转出羊舍" align="center" prop="foldFromName" />
-      <el-table-column label="转入羊舍" align="center" prop="foldToName" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="120" fixed>
+        <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="transDate" min-width="120" />
+      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" />
+      <el-table-column label="事件类型" align="center" prop="eventTypeText" />
+      <el-table-column label="转出羊舍" align="center" prop="foldFromName" min-width="130" />
+      <el-table-column label="转入羊舍" align="center" prop="foldToName" min-width="130" />
       <el-table-column label="品种" align="center" prop="varietyName" />
-      <el-table-column label="转群原因" align="center" prop="reasonText" />
+      <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="status">
         <template #default="scope">
           <dict-tag :options="status" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="备注" align="center" prop="comment" min-width="120" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="160">
+
+      <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="Edit" @click="handleApprove(scope.row)"
             v-hasPermi="['trans_group:trans_group:approve']">
@@ -96,10 +114,20 @@
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="trans_groupRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="管理耳号" prop="manageTags">
-          <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
-            style="width: 100%" @change="loadSheepInfo" :disabled="!isAdd">
-            <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
-              :value="sheep.manageTags" />
+          <div style="display: flex; align-items: center; gap: 8px;">
+            <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
+              style="width: 100%; flex:1;" @change="loadSheepInfo" :disabled="!isAdd">
+              <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
+                :value="sheep.manageTags" />
+            </el-select>
+            <span v-if="form.manageTags?.length > 0" class="tag-count">
+              已选 {{ form.manageTags.length }} 个
+            </span>
+          </div>
+        </el-form-item>
+        <el-form-item label="事件类型" prop="eventType">
+          <el-select v-model="form.eventType" placeholder="请选择事件类型" clearable required>
+            <el-option v-for="dict in eventTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="牧场" prop="ranchId">
@@ -133,6 +161,10 @@
               :value="Number(dict.value)" />
           </el-select>
         </el-form-item>
+        <el-form-item label="转群日期" prop="transDate">
+          <el-date-picker v-model="form.transDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择转群日期"
+            style="width: 100%" required />
+        </el-form-item>
         <el-form-item label="技术员" prop="technician">
           <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
@@ -144,53 +176,57 @@
         </div>
       </template>
     </el-dialog>
-  </div>
 
-  <!-- 审批对话框 -->
-  <el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
-    <el-form ref="approveFormRef" :model="approveForm" label-width="120px">
-      <el-form-item label="耳号">
-        <el-input v-model="displayManageTags" disabled />
-      </el-form-item>
-      <el-form-item label="转出羊舍">
-        <el-input :value="sheepfoldNameMap[approveForm.foldFrom] || approveForm.foldFrom" disabled />
-      </el-form-item>
-      <el-form-item label="转入羊舍">
-        <el-input :value="sheepfoldNameMap[approveForm.foldTo] || approveForm.foldTo" disabled />
-      </el-form-item>
-      <el-form-item label="品种">
-        <el-input :value="approveForm.varietyName" disabled />
-      </el-form-item>
-      <el-form-item label="转群原因">
-        <el-input :value="approveForm.reasonText" disabled />
-      </el-form-item>
-      <el-form-item label="状态">
-        <el-input :value="approveForm.statusText" disabled />
-      </el-form-item>
-      <el-form-item label="技术员">
-        <el-input v-model="approveForm.technician" disabled />
-      </el-form-item>
-      <el-form-item label="备注">
-        <el-input v-model="approveForm.comment" disabled />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="handleApproveAgree">同意</el-button>
-        <el-button type="danger" @click="handleApproveReject">驳回</el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- 审批对话框 -->
+    <el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
+      <el-form ref="approveFormRef" :model="approveForm" label-width="120px">
+        <el-form-item label="耳号">
+          <el-input v-model="displayManageTags" disabled />
+        </el-form-item>
+        <el-form-item label="事件类型">
+          <el-input :value="approveForm.eventTypeText || '未知'" disabled />
+        </el-form-item>
+        <el-form-item label="转出羊舍">
+          <el-input :value="sheepfoldNameMap[approveForm.foldFrom] || approveForm.foldFrom" disabled />
+        </el-form-item>
+        <el-form-item label="转入羊舍">
+          <el-input :value="sheepfoldNameMap[approveForm.foldTo] || approveForm.foldTo" disabled />
+        </el-form-item>
+        <el-form-item label="品种">
+          <el-input :value="approveForm.varietyName" disabled />
+        </el-form-item>
+        <el-form-item label="转群原因">
+          <el-input :value="approveForm.reasonText" disabled />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-input :value="approveForm.statusText" disabled />
+        </el-form-item>
+        <el-form-item label="技术员">
+          <el-input v-model="approveForm.technician" disabled />
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="approveForm.comment" disabled />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="handleApproveAgree">同意</el-button>
+          <el-button type="danger" @click="handleApproveReject">驳回</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup name="Trans_group">
 import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group, approveScTransGroup, listRanch } from '@/api/produce/manage_sheep/trans_group'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
+import { getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
 import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance();
-const { trans_group_reason, status } = proxy.useDict('trans_group_reason', 'status');
+const { trans_group_reason, status, trans_group_event_type } = proxy.useDict('trans_group_reason', 'status', 'trans_group_event_type');
 
 const trans_groupList = ref([]);
 const open = ref(false);
@@ -201,8 +237,9 @@ const single = ref(true);
 const multiple = ref(false);
 const total = ref(0);
 const title = ref('');
+const daterangeTransDate = ref([]);
 const daterangeCreateTime = ref([]);
-
+const eventTypeOptions = trans_group_event_type || [];
 const approveDialog = ref(false);
 const approveForm = ref({});
 const displayManageTags = ref('');
@@ -219,25 +256,31 @@ const data = reactive({
   form: {
     manageTags: [],
     tagDetails: {},
+    eventType: null,
+    transDate: null,
   },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     sheepId: null,
     manageTags: null,
+    eventType: null,
     ranchId: null,
     foldTo: null,
     foldFrom: null,
     varietyId: null,
+    sheepTypeId: null,
     status: null,
     createTime: null,
   },
   rules: {
     manageTags: [{ required: true, message: '请输入耳号', trigger: 'blur' }],
+    eventType: [{ required: true, message: '请选择事件类型', trigger: 'change' }],
     ranchId: [{ required: true, message: '请选择牧场', trigger: 'change' }],
     foldTo: [{ required: true, message: '请选择转入羊舍', trigger: 'change' }],
     varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }],
     reason: [{ required: true, message: '请选择转群原因', trigger: 'change' }],
+    transDate: [{ required: true, message: '请选择转群日期', trigger: 'change' }],
     technician: [{ required: true, message: '请输入技术员', trigger: 'blur' }],
   },
 });
@@ -251,6 +294,13 @@ function getList() {
     queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0];
     queryParams.value.params.endCreateTime = daterangeCreateTime.value[1];
   }
+  if (daterangeTransDate.value?.length) {
+    queryParams.value.params.beginTransDate = daterangeTransDate.value[0];
+    queryParams.value.params.endTransDate = daterangeTransDate.value[1];
+  }
+  if (queryParams.value.sheepTypeId !== null && queryParams.value.sheepTypeId !== undefined) {
+    queryParams.value.params.sheepTypeId = queryParams.value.sheepTypeId;
+  }
   listTrans_group(queryParams.value).then((res) => {
     trans_groupList.value = res.rows;
     total.value = res.total;
@@ -312,9 +362,9 @@ async function handleSheepFilter() {
     let loadedSheep = [];
 
     if (foldFrom && sheepTypeId) {
-      loadedSheep = await loadSheepBySheepfoldAndType(foldFrom, sheepTypeId, ranchId); 
+      loadedSheep = await loadSheepBySheepfoldAndType(foldFrom, sheepTypeId, ranchId);
     } else if (sheepTypeId) {
-      loadedSheep = await loadSheepByTypeOnly(sheepTypeId, ranchId); 
+      loadedSheep = await loadSheepByTypeOnly(sheepTypeId, ranchId);
     }
 
     if (loadedSheep.length > 0) {
@@ -326,33 +376,13 @@ async function handleSheepFilter() {
   }
 }
 
-//转群类型列表
-function getSheepTypeList() {
-  return new Promise((resolve, reject) => {
-    request({
-      url: '/base/base/list',
-      method: 'get',
-      params: { pageNum: 1, pageSize: 9999 },
-    }).then((res) => {
-      sheepTypeOptions.value = res.rows.map(item => ({
-        id: Number(item.id),
-        name: item.name || item.typeName
-      })) || [];
-      resolve();
-    }).catch((error) => {
-      console.error('获取羊只类型失败', error);
-      proxy.$modal.msgError('加载羊只类型失败，请重试');
-      reject(error);
-    });
-  });
-}
 
 //加载所有牧场列表
 function loadRanchList() {
   listRanch().then(res => {
     ranchOptions.value = res.rows.map(ranch => ({
       id: ranch.id,
-      ranchName: ranch.ranch  
+      ranchName: ranch.ranch
     }));
   }).catch(error => {
     console.error('加载牧场列表失败', error);
@@ -387,10 +417,10 @@ function handleRanchChange(ranchId) {
 }
 
 //只通过羊舍
-async function loadSheepBySheepfoldOnly(sheepfoldId, ranchId) { 
+async function loadSheepBySheepfoldOnly(sheepfoldId, ranchId) {
   if (!sheepfoldId || isNaN(Number(sheepfoldId))) {
     proxy.$message.error('请选择有效的羊舍');
-    sheepOptions.value = []; 
+    sheepOptions.value = [];
     return [];
   }
   if (!ranchId) {
@@ -399,10 +429,10 @@ async function loadSheepBySheepfoldOnly(sheepfoldId, ranchId) {
     return [];
   }
   try {
-    const res = await getSheepBySheepfoldId(Number(sheepfoldId)); 
+    const res = await getSheepBySheepfoldId(Number(sheepfoldId));
     const newSheepList = (res.data || []).map((sheep) => ({
       id: sheep.id,
-      manageTags: sheep.manageTags || '未知耳号', 
+      manageTags: sheep.manageTags || '未知耳号',
       sheepfoldId: Number(sheepfoldId),
     })).filter(item => item.manageTags);
 
@@ -411,13 +441,13 @@ async function loadSheepBySheepfoldOnly(sheepfoldId, ranchId) {
       sheepOptions.value = [];
       return [];
     }
-    sheepOptions.value = newSheepList;  
+    sheepOptions.value = newSheepList;
     return newSheepList;
   } catch (error) {
     console.error('根据羊舍加载耳号失败:', error);
     const errorMsg = error.response?.data?.msg || '加载羊舍耳号失败，请重试';
     proxy.$modal.msgError(errorMsg);
-    sheepOptions.value = []; 
+    sheepOptions.value = [];
     return [];
   }
 }
@@ -472,54 +502,54 @@ async function loadSheepByTypeOnly(typeId) {
 
 //加载羊只信息
 async function loadSheepInfo() {
-    const tags = form.value.manageTags;
-    if (!tags || tags.length === 0) return;
+  const tags = form.value.manageTags;
+  if (!tags || tags.length === 0) return;
 
-    const tagDetails = {};
-    const validResults = [];
-    let firstSheepfoldId = null;
-    let firstRanchId = null; 
+  const tagDetails = {};
+  const validResults = [];
+  let firstSheepfoldId = null;
+  let firstRanchId = null;
 
-    for (const tag of tags) {
-        try {
-            const { data: sheepData } = await checkSheepByManageTags(tag.trim());
-            if (!sheepData) {
-                validResults.push(false);
-                proxy.$modal.msgError(`耳号 ${tag} 不存在或信息异常`);
-            } else {
-                validResults.push(true);
-                tagDetails[tag] = {
-                    comment: sheepData.comment || '',
-                    varietyId: sheepData.varietyId,
-                    sheepId: sheepData.id,
-                    sheepfoldId: sheepData.sheepfoldId,
-                };
-                if (!firstSheepfoldId) {
-                    firstSheepfoldId = sheepData.sheepfoldId;
-                    firstRanchId = sheepData.ranchId; 
-                }
-            }
-        } catch (error) {
-            console.error('获取耳号信息失败:', error);
-            proxy.$modal.msgError(`耳号 ${tag} 验证失败，请重试`);
-            validResults.push(false);
+  for (const tag of tags) {
+    try {
+      const { data: sheepData } = await checkSheepByManageTags(tag.trim());
+      if (!sheepData) {
+        validResults.push(false);
+        proxy.$modal.msgError(`耳号 ${tag} 不存在或信息异常`);
+      } else {
+        validResults.push(true);
+        tagDetails[tag] = {
+          comment: sheepData.comment || '',
+          varietyId: sheepData.varietyId,
+          sheepId: sheepData.id,
+          sheepfoldId: sheepData.sheepfoldId,
+        };
+        if (!firstSheepfoldId) {
+          firstSheepfoldId = sheepData.sheepfoldId;
+          firstRanchId = sheepData.ranchId;
         }
+      }
+    } catch (error) {
+      console.error('获取耳号信息失败:', error);
+      proxy.$modal.msgError(`耳号 ${tag} 验证失败，请重试`);
+      validResults.push(false);
     }
+  }
 
-    if (validResults.includes(false)) {
-        form.value.manageTags = tags.filter((_, index) => validResults[index]);
-        proxy.$message.warning('部分耳号不合法，已自动过滤');
-    }
-    form.value.tagDetails = tagDetails;
+  if (validResults.includes(false)) {
+    form.value.manageTags = tags.filter((_, index) => validResults[index]);
+    proxy.$message.warning('部分耳号不合法，已自动过滤');
+  }
+  form.value.tagDetails = tagDetails;
 
-    if (firstRanchId && isAdd.value) {
-        form.value.ranchId = firstRanchId;
-        handleRanchChange(firstRanchId);
-    }
+  if (firstRanchId && isAdd.value) {
+    form.value.ranchId = firstRanchId;
+    handleRanchChange(firstRanchId);
+  }
 
-    if (firstSheepfoldId && isAdd.value) {
-        form.value.foldFrom = Number(firstSheepfoldId);
-    }
+  if (firstSheepfoldId && isAdd.value) {
+    form.value.foldFrom = Number(firstSheepfoldId);
+  }
 }
 
 //取消按钮
@@ -537,6 +567,8 @@ function handleQuery() {
 //重置搜索框
 function resetQuery() {
   daterangeCreateTime.value = [];
+  daterangeTransDate.value = [];
+  queryParams.value.eventType = null;
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -580,6 +612,8 @@ async function handleUpdate(row) {
     const formData = {
       ...d,
       manageTags: manageTags,
+      eventType: d.eventType || null,
+      transDate: d.transDate || null,
       foldFrom: Number(d.foldFrom || 0),
       foldTo: Number(d.foldTo || 0),
       sheepTypeId: Number(d.sheepTypeId || 0),
@@ -648,7 +682,7 @@ function submitForm() {
 //删除
 function handleDelete(row) {
   const _ids = row.id || ids.value;
-  proxy.$modal.confirm(`是否确认删除转群记录编号为“${_ids}”的数据项？`)
+  proxy.$modal.confirm(`是否确认删除这条记录数据`)
     .then(() => delTrans_group(_ids))
     .then(() => {
       getList();
@@ -720,11 +754,37 @@ function getVarietyOptions() {
   });
 }
 
+// 加载羊只类别数据
+const sheepTypeList = ref([]);
+function loadSheepTypeList() {
+  getSheepTypeList().then(response => {
+    sheepTypeList.value = response.rows || [];
+    sheepTypeOptions.value = (response.rows || []).map(item => ({
+      id: Number(item.id),
+      name: item.name || item.typeName
+    }));
+  }).catch(error => {
+    console.error('加载羊只类别失败', error);
+    sheepTypeList.value = [];
+    sheepTypeOptions.value = [];
+  });
+}
+
 onMounted(() => {
   loadSheepfold();
   loadRanchList();
   getVarietyOptions();
-  getSheepTypeList();
+  loadSheepTypeList();
   getList();
 });
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.tag-count {
+  color: #606266;
+  background-color: #f5f7fa;
+  padding: 2px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/produce/manage_sheep/transition_info/index.vue b/src/views/produce/manage_sheep/transition_info/index.vue
index 51c4fd2..1ced6d2 100644
--- a/src/views/produce/manage_sheep/transition_info/index.vue
+++ b/src/views/produce/manage_sheep/transition_info/index.vue
@@ -2,14 +2,36 @@
   <div class="app-container">
     <!-- 查询表单 -->
     <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="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
+      <el-form-item label="转场日期" style="width: 308px">
+        <el-date-picker v-model="transitionDateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
-        <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery" style="width: 150px;"/>
+        <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
+          style="width: 150px;" />
       </el-form-item>
       <el-form-item label="品种" prop="varietyId">
         <el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
+      <el-form-item label="事件类型" prop="eventType" style="width: 308px">
+        <el-select v-model="queryParams.eventType" placeholder="请选择事件类型" clearable style="min-width:150px">
+          <el-option label="转场转入" value="转场转入" />
+          <el-option label="转场转出" value="转场转出" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="转场类型" prop="transType" style="width: 308px">
+        <el-select v-model="queryParams.transType" placeholder="请选择转场类型" clearable style="min-width:150px">
+          <el-option label="内部调拨" :value="0" />
+          <el-option label="内部销售" :value="1" />
+          <el-option label="育肥调拨" :value="2" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="转入牧场" prop="transTo">
         <el-select v-model="queryParams.transTo" placeholder="请选择转入牧场" clearable style="min-width:150px">
           <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName" :value="ranch.ranchName" />
@@ -25,10 +47,6 @@
           <el-option v-for="dict in status" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -41,10 +59,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['transition_info:transition_info:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
           v-hasPermi="['transition_info:transition_info:edit']">修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['transition_info:transition_info:remove']">删除</el-button>
@@ -59,9 +77,21 @@
     <!-- 列表 -->
     <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" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="130" fixed>
+        <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="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="manageTags" min-width="100" />
+      <el-table-column label="事件类型" align="center" prop="eventType" min-width="120" />
+      <el-table-column label="转场类型" align="center" prop="transTypeText" />
       <el-table-column label="品种" align="center" prop="varietyName" />
-      <el-table-column label="转入牧场" align="center" prop="transTo" />
+      <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="status">
         <template #default="scope">
@@ -69,18 +99,19 @@
         </template>
       </el-table-column>
       <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="状态" align="center" prop="statusText" />
-      <el-table-column label="备注" align="center" prop="comment" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="当前状态" align="center" prop="status" min-width="120">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <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">
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <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="['transition_info:transition_info:approve']">审批</el-button>
+            v-hasPermi="['transition_info:transition_info:approve']" :disabled="scope.row.status !== 0">审批</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['transition_info:transition_info:remove']">删除</el-button>
         </template>
@@ -94,33 +125,51 @@
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="transition_infoRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="管理耳号" prop="manageTags">
-          <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" filterable multiple allow-create
-            @change="loadSheepInfo" :disabled="!isAdd" >
-            <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
-              :value="sheep.manageTags" />
-          </el-select>
+          <div style="display: flex; align-items: center; gap: 8px;">
+            <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" filterable multiple allow-create
+              @change="loadSheepInfo" :disabled="!isAdd" style="flex:1;">
+              <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
+                :value="sheep.manageTags" />
+            </el-select>
+            <span v-if="form.manageTags?.length > 0" class="tag-count">
+              已选 {{ form.manageTags.length }} 个
+            </span>
+          </div>
         </el-form-item>
 
         <el-form-item label="转入牧场" prop="transTo">
-          <el-select v-model="form.transTo" placeholder="请选择转入牧场" clearable :disabled="!isAdd" >
+          <el-select v-model="form.transTo" placeholder="请选择转入牧场" clearable :disabled="!isAdd">
             <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName"
               :value="ranch.ranchName" />
           </el-select>
         </el-form-item>
 
         <el-form-item label="当前牧场" prop="transFrom">
-          <el-select v-model="form.transFrom" placeholder="请选择当前牧场" clearable @change="handleRanchChange" :disabled="!isAdd" >
+          <el-select v-model="form.transFrom" placeholder="请选择当前牧场" clearable @change="handleRanchChange"
+            :disabled="!isAdd">
             <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName"
               :value="ranch.ranchName" />
           </el-select>
         </el-form-item>
 
+        <el-form-item label="事件类型" prop="eventType">
+          <el-select v-model="form.eventType" placeholder="请选择事件类型">
+            <el-option label="转场转入" value="转场转入" />
+            <el-option label="转场转出" value="转场转出" />
+          </el-select>
+        </el-form-item>
+
         <el-form-item label="转场类型" prop="transType">
           <el-select v-model="form.transType" placeholder="请选择转场类型">
             <el-option v-for="dict in trans_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
 
+        <el-form-item label="转场日期" prop="transitionDate">
+          <el-date-picker v-model="form.transitionDate" value-format="YYYY-MM-DD" type="date" placeholder="请选择转场日期"
+            :disabled="!isAdd"></el-date-picker>
+        </el-form-item>
+
         <el-form-item label="技术员" prop="technician">
           <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
@@ -143,6 +192,9 @@
         <el-form-item label="品种">
           <el-input :value="approveForm.varietyName" disabled />
         </el-form-item>
+        <el-form-item label="事件类型">
+          <el-input :value="approveForm.eventType" disabled />
+        </el-form-item>
         <el-form-item label="转入牧场">
           <el-input :value="approveForm.transTo" disabled />
         </el-form-item>
@@ -161,6 +213,12 @@
         <el-form-item label="状态">
           <el-input :value="getStatusLabel(approveForm.status)" disabled />
         </el-form-item>
+        <el-form-item label="接收羊舍" v-if="approveForm.eventType === '转场转入'">
+          <el-select v-model="approveForm.sheepfoldId" placeholder="请选择接收羊舍" clearable>
+            <el-option v-for="sheepfold in acceptSheepfold" :key="sheepfold.id" :label="sheepfold.sheepfoldName"
+              :value="sheepfold.id" />
+          </el-select>
+        </el-form-item>
       </el-form>
 
       <template #footer>
@@ -174,7 +232,7 @@
 </template>
 
 <script setup name="Transition_info">
-import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, getSheepByRanchId, updateTransition_info, listRanch,approveTransitionInfo } from "@/api/produce/manage_sheep/transition_info"
+import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, getSheepByRanchId, updateTransition_info, listRanch, approveTransitionInfo } from "@/api/produce/manage_sheep/transition_info"
 import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
 import request from '@/utils/request'
 
@@ -191,15 +249,17 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
+const transitionDateRange = ref([])
 const daterangeCreateTime = ref([])
 const approveDialog = ref(false)
 const approveForm = ref({})
 const displayManageTags = ref('')
 const varietyOptions = ref([])
-const ranchOptions = ref([]);
-const sheepOptions = ref([]); 
-const isAdd = ref(true); 
-const isEdit = ref(false); 
+const ranchOptions = ref([])
+const sheepOptions = ref([])
+const isAdd = ref(true)
+const isEdit = ref(false)
+const acceptSheepfold = ref([])
 
 const data = reactive({
   form: {
@@ -207,22 +267,27 @@ const data = reactive({
     manageTags: [],
     transTo: null,
     transFrom: null,
+    eventType: null,
     transType: null,
+    transitionDate: null,
     technician: null,
-    tagDetails: {} 
+    tagDetails: {}
   },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     manageTags: [],
     varietyId: null,
+    eventType: null,
+    transType: null,
     transTo: null,
     transFrom: null,
     status: null,
-    createTime: null
+    createTime: null,
+    transitionDate: null
   },
   rules: {
-    manageTags:[
+    manageTags: [
       { required: true, message: "请输入管理耳号", trigger: "blur" }
     ],
     transTo: [
@@ -231,9 +296,15 @@ const data = reactive({
     transFrom: [
       { required: false, message: "请选择当前牧场", trigger: "blur" }
     ],
+    eventType: [
+      { required: true, message: '请选择事件类型', trigger: 'change' }
+    ],
     transType: [
       { required: true, message: "请选择转场类型", trigger: "change" }
     ],
+    transitionDate: [
+      { required: true, message: "请选择转场日期", trigger: "change" }
+    ],
     technician: [
       { required: true, message: "请输入技术员", trigger: "blur" }
     ]
@@ -249,6 +320,13 @@ function getList() {
     queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
     queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
   }
+  if (queryParams.value.transType !== null) {
+    queryParams.value.params.transType = queryParams.value.transType;
+  }
+  if (transitionDateRange.value && transitionDateRange.value.length > 0) {
+    queryParams.value.params["beginTransitionDate"] = transitionDateRange.value[0];
+    queryParams.value.params["endTransitionDate"] = transitionDateRange.value[1];
+  }
   listTransition_info(queryParams.value).then(res => {
     transition_infoList.value = res.rows
     total.value = res.total
@@ -264,12 +342,12 @@ function reset() {
     transFrom: null,
     transType: null,
     technician: null,
-    createBy:null,
+    createBy: null,
     tagDetails: {}
   };
   sheepOptions.value = [];
   proxy.resetForm("transition_infoRef");
-  isAdd.value = true; 
+  isAdd.value = true;
   isEdit.value = false;
 }
 
@@ -280,7 +358,7 @@ function loadRanchOptions() {
       if (res.rows && Array.isArray(res.rows)) {
         const mapped = res.rows.map((ranch) => ({
           id: Number(ranch.id),
-          ranchName: ranch.ranch || '未知牧场', 
+          ranchName: ranch.ranch || '未知牧场',
         }));
         ranchOptions.value = mapped;
       } else {
@@ -302,6 +380,40 @@ function loadSheepOptions() {
   });
 }
 
+// 加载牧场下的羊舍
+// 修改：加载转入牧场下的接收羊舍（使用牧场ID而非名称）
+function loadSheepfoldsByRanch(ranchName) {
+  // 1. 根据转入牧场名称匹配牧场ID
+  const matchedRanch = ranchOptions.value.find(
+    ranch => ranch.ranchName === ranchName
+  );
+  if (!matchedRanch) {
+    proxy.$modal.msgWarning(`未找到牧场“${ranchName}”的信息`);
+    acceptSheepfold.value = [];
+    return;
+  }
+  const ranchId = matchedRanch.id; // 获取匹配的牧场ID
+
+  // 2. 使用牧场ID调用接口加载羊舍（修正参数）
+  request({
+    url: '/sheepfold_management/sheepfold_management/list',
+    method: 'get',
+    params: {
+      ranchId: ranchId, // 关键：使用牧场ID而非名称
+      pageNum: 1,
+      pageSize: 999
+    }
+  }).then(res => {
+    acceptSheepfold.value = res.rows || [];
+    if (acceptSheepfold.value.length === 0) {
+      proxy.$modal.msgWarning(`转入牧场“${ranchName}”没有可用的接收羊舍`);
+    }
+  }).catch(error => {
+    console.error('加载接收羊舍失败:', error);
+    proxy.$modal.msgError('获取接收羊舍数据失败');
+  });
+}
+
 // 通过牧场 ID 查询牧场名称
 async function getRanchNameByRanchId(ranchId) {
   if (!ranchId) return '';
@@ -312,7 +424,7 @@ async function getRanchNameByRanchId(ranchId) {
     const matchedRanch = ranchOptions.value.find(
       (item) => item.id === Number(ranchId)
     );
-    return matchedRanch ? matchedRanch.ranchName : ''; 
+    return matchedRanch ? matchedRanch.ranchName : '';
   } catch (error) {
     console.error('通过 ranchId 查询牧场名称失败:', error);
     return '';
@@ -337,7 +449,7 @@ function handleRanchChange(ranchName) {
 
   getSheepByRanchId(ranchIdNum)
     .then((res) => {
-      if (res.code === 200) { 
+      if (res.code === 200) {
         if (res.data && res.data.length > 0) {
           sheepOptions.value = res.data.map((sheep) => ({
             id: sheep.id,
@@ -410,7 +522,7 @@ async function loadSheepInfo() {
 // 导出
 function handleExport() {
   proxy.download(
-    '/produce/manage_sheep/transition_info/export', 
+    '/produce/manage_sheep/transition_info/export',
     { ...queryParams.value },
     `transition_info_${Date.now()}.xlsx`
   );
@@ -418,11 +530,22 @@ function handleExport() {
 
 // 审批
 function handleApprove(row) {
-  approveForm.value = { ...row }; 
+  if (row.status !== 0) {
+    proxy.$modal.msgWarning("该记录已完成审批，无法重复操作");
+    return;
+  }
+  approveForm.value = { ...row };
   approveDialog.value = true;
   displayManageTags.value = Array.isArray(row.manageTags)
     ? row.manageTags.join(',')
     : row.manageTags || '';
+
+  if (row.eventType === '转场转入') {
+    loadSheepfoldsByRanch(row.transTo);
+  } else {
+    acceptSheepfold.value = [];
+  }
+  approveDialog.value = true;
 }
 
 // 审批同意
@@ -431,12 +554,15 @@ function handleApproveAgree() {
     proxy.$modal.msgError('转入牧场不能为空');
     return;
   }
-  
-  approveForm.value.status = 1; 
-  
+
+  approveForm.value.status = 1;
+  if (approveForm.value.eventType === '转场转入' && !approveForm.value.sheepfoldId) {
+    proxy.$modal.msgError('请选择接收羊舍');
+    return;
+  }
   approveTransitionInfo(approveForm.value).then(() => {
     approveDialog.value = false;
-    proxy.$modal.msgSuccess('审批通过，已更新羊只所在牧场');
+    proxy.$modal.msgSuccess('通过请求，已更新羊只信息');
     getList();
   }).catch(error => {
     proxy.$modal.msgError(`审批失败：${error.message}`);
@@ -448,8 +574,10 @@ function handleApproveReject() {
   approveForm.value.status = 2;
   updateTransition_info(approveForm.value).then(() => {
     approveDialog.value = false;
-    proxy.$modal.msgSuccess('审批成功，状态已更新为驳回');
+    proxy.$modal.msgSuccess('驳回请求');
     getList();
+  }).catch(error => {
+    proxy.$modal.msgError(`审批失败：${error.message}`);
   });
 }
 
@@ -488,6 +616,8 @@ function handleQuery() {
 //重置
 function resetQuery() {
   daterangeCreateTime.value = []
+  queryParams.value.transType = null;
+  transitionDateRange.value = [];
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -503,7 +633,7 @@ function handleAdd() {
   reset();
   open.value = true;
   title.value = "添加转场";
-  isAdd.value = true; 
+  isAdd.value = true;
   isEdit.value = false;
   sheepOptions.value = [];
   form.value.manageTags = [];
@@ -516,11 +646,11 @@ async function handleUpdate(row) {
   getTransition_info(_id).then(response => {
     form.value = {
       ...response.data,
-      manageTags: [response.data.manageTags] 
+      manageTags: [response.data.manageTags]
     };
     open.value = true;
     title.value = "修改转场";
-    isAdd.value = false; 
+    isAdd.value = false;
     isEdit.value = true;
   }).catch(error => {
     console.error('获取转场详情失败:', error);
@@ -536,7 +666,7 @@ async function submitForm() {
     const allTags = form.value.manageTags;
     let validTags = [];
 
-    if (isAdd.value) { 
+    if (isAdd.value) {
       if (!allTags || allTags.length === 0) {
         proxy.$modal.msgError('请选择至少一个耳号');
         return;
@@ -549,7 +679,7 @@ async function submitForm() {
         proxy.$modal.msgError('所有耳号均无效，请重新输入');
         return;
       }
-    } else { 
+    } else {
       validTags = allTags;
     }
 
@@ -559,10 +689,12 @@ async function submitForm() {
         sheepId: form.value.tagDetails[tag].sheepId,
         varietyId: form.value.tagDetails[tag].varietyId,
         varietyName: form.value.tagDetails[tag].varietyName,
-        manageTags: tag, 
+        manageTags: tag,
         transTo: form.value.transTo,
         transFrom: form.value.tagDetails[tag].ranchName,
         transType: form.value.transType,
+        eventType: form.value.eventType,
+        transitionDate: form.value.transitionDate,
         technician: form.value.technician,
         comment: form.value.tagDetails[tag].comment,
         status: 0,
@@ -571,6 +703,7 @@ async function submitForm() {
       submitData = {
         ...form.value,
         manageTags: validTags.join(','),
+        eventType: form.value.eventType,
       };
     }
 
@@ -602,7 +735,7 @@ function getVarietyOptions() {
 //删除
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除转场编号为"' + _ids + '"的数据项？')
+  proxy.$modal.confirm('是否确认删除这条记录数据')
     .then(() => delTransition_info(_ids))
     .then(() => {
       getList()
@@ -617,4 +750,14 @@ onMounted(() => {
   loadSheepOptions();
   getList();
 });
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.tag-count {
+  color: #606266;
+  background-color: #f5f7fa;
+  padding: 2px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/produce/other/castrate/index.vue b/src/views/produce/other/castrate/index.vue
index 8d48ff4..873e55b 100644
--- a/src/views/produce/other/castrate/index.vue
+++ b/src/views/produce/other/castrate/index.vue
@@ -2,28 +2,24 @@
   <div class="app-container">
     <!-- 搜索区域 -->
     <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="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="width: 150px;" />
       </el-form-item>
-
       <el-form-item label="羊舍" prop="sheepfold">
         <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
       </el-form-item>
-
       <el-form-item label="品种" prop="varietyId">
         <el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
-
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -56,17 +52,18 @@
     <el-table v-loading="loading" :data="castrateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
+      <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="manageTags" />
-      <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
       <el-table-column label="品种" align="center" prop="varietyName" />
       <el-table-column label="备注" align="center" prop="comment" />
       <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}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <!-- 按需添加 是否需要修改功能 -->
@@ -85,11 +82,16 @@
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="castrateRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="管理耳号" prop="manageTags">
-          <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
-            style="width: 100%" @change="loadSheepInfo" @blur="loadSheepInfo">
-            <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
-              :value="sheep.manageTags" />
-          </el-select>
+          <div style="display: flex; align-items: center; gap: 8px;">
+            <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
+              style="width: 100%; flex:1;" @change="loadSheepInfo" @blur="loadSheepInfo">
+              <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
+                :value="sheep.manageTags" />
+            </el-select>
+            <span v-if="form.manageTags?.length > 0" class="tag-count">
+              已选 {{ form.manageTags.length }} 个
+            </span>
+          </div>
         </el-form-item>
         <el-form-item label="羊舍" prop="sheepfold">
           <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable @change="loadSheepBySheepfold">
@@ -405,7 +407,7 @@ function submitForm() {
 //删除
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm(`是否确认删除去势编号为"${_ids}"的数据项？`).then(() => {
+  proxy.$modal.confirm(`是否确认删除这条记录数据`).then(() => {
     return delCastrate(_ids)
   }).then(() => {
     getList()
@@ -431,4 +433,14 @@ onMounted(() => {
   getVarietyOptions()
   getList()
 })
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.tag-count {
+  color: #606266;
+  background-color: #f5f7fa;
+  padding: 2px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/produce/other/fixHoof/index.vue b/src/views/produce/other/fixHoof/index.vue
index 40da417..bc4c586 100644
--- a/src/views/produce/other/fixHoof/index.vue
+++ b/src/views/produce/other/fixHoof/index.vue
@@ -1,11 +1,14 @@
 <template>
   <div class="app-container">
     <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="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="width: 150px;" />
       </el-form-item>
-
       <el-form-item label="羊舍" prop="sheepfold">
         <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
@@ -16,12 +19,6 @@
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
-
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -53,17 +50,18 @@
     <!-- 列表 -->
     <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="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="manageTags" />
-      <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
       <el-table-column label="品种" align="center" prop="varietyName" />
       <el-table-column label="备注" align="center" prop="comment" />
       <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}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <!-- 按需添加 是否需要修改功能 -->
@@ -82,11 +80,16 @@
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="fixHoofRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="耳号" prop="manageTags">
-          <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
-            style="width: 100%" @change="loadSheepInfo">
-            <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
-              :value="sheep.manageTags" />
-          </el-select>
+          <div style="display: flex; align-items: center; gap: 8px;">
+            <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
+              style="width: 100%; flex:1;" @change="loadSheepInfo">
+              <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
+                :value="sheep.manageTags" />
+            </el-select>
+            <span v-if="form.manageTags?.length > 0" class="tag-count">
+              已选 {{ form.manageTags.length }} 个
+            </span>
+          </div>
         </el-form-item>
         <el-form-item label="羊舍" prop="sheepfolds">
           <el-select v-model="form.sheepfold" filterable style="width: 100%" @change="loadSheepBySheepfold">
@@ -219,9 +222,9 @@ async function loadSheepInfo() {
   form.value.tagDetails = tagDetails;
 
   if (validTags.length > 0) {
-    const firstValidTag = validTags[0]; 
+    const firstValidTag = validTags[0];
     const firstSheepfoldId = tagDetails[firstValidTag].sheepfoldId;
-    form.value.sheepfold = firstSheepfoldId; 
+    form.value.sheepfold = firstSheepfoldId;
   }
 }
 
@@ -345,7 +348,7 @@ function submitForm() {
 //删除
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm(`是否确认删除修蹄编号为"${_ids}"的数据项？`).then(() => {
+  proxy.$modal.confirm(`是否确认删除这条记录数据`).then(() => {
     return delFixHoof(_ids)
   }).then(() => {
     getList()
@@ -371,4 +374,14 @@ onMounted(() => {
   getVarietyOptions()
   getList()
 })
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.tag-count {
+  color: #606266;
+  background-color: #f5f7fa;
+  padding: 2px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+</style>
\ No newline at end of file

From 1fd3521d3492c9cfa6c953efde0232d4ea1995d2 Mon Sep 17 00:00:00 2001
From: zyh <2066096076@qq.com>
Date: Tue, 19 Aug 2025 18:00:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=AC=E7=BE=A4=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage_sheep/trans_group/index.vue        | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/views/produce/manage_sheep/trans_group/index.vue b/src/views/produce/manage_sheep/trans_group/index.vue
index 0589400..d6e517d 100644
--- a/src/views/produce/manage_sheep/trans_group/index.vue
+++ b/src/views/produce/manage_sheep/trans_group/index.vue
@@ -38,11 +38,11 @@
           <el-option v-for="type in sheepTypeOptions" :key="type.id" :label="type.name" :value="type.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <!-- <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" style="width: 150px;" placeholder="请选择状态" clearable>
           <el-option v-for="dict in status" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -85,20 +85,20 @@
       <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="status">
+      <!-- <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> -->
       <el-table-column label="备注" align="center" prop="comment" min-width="120" />
       <el-table-column label="创建人" align="center" prop="createBy" />
 
       <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="Edit" @click="handleApprove(scope.row)"
+          <!-- <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
             v-hasPermi="['trans_group:trans_group:approve']">
             审批
-          </el-button>
+          </el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['trans_group:trans_group:remove']">
             删除
@@ -178,7 +178,7 @@
     </el-dialog>
 
     <!-- 审批对话框 -->
-    <el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
+    <!-- <el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
       <el-form ref="approveFormRef" :model="approveForm" label-width="120px">
         <el-form-item label="耳号">
           <el-input v-model="displayManageTags" disabled />
@@ -214,7 +214,7 @@
           <el-button type="danger" @click="handleApproveReject">驳回</el-button>
         </div>
       </template>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 
@@ -240,9 +240,9 @@ const title = ref('');
 const daterangeTransDate = ref([]);
 const daterangeCreateTime = ref([]);
 const eventTypeOptions = trans_group_event_type || [];
-const approveDialog = ref(false);
-const approveForm = ref({});
-const displayManageTags = ref('');
+// const approveDialog = ref(false);
+// const approveForm = ref({});
+// const displayManageTags = ref('');
 const sheepOptions = ref([]);
 const sheepfoldOptions = ref([]);
 const sheepfoldNameMap = ref({});
@@ -699,38 +699,38 @@ function handleExport() {
 }
 
 // 审核
-function handleApprove(row) {
-  approveForm.value = { ...row };
-  approveDialog.value = true;
-  displayManageTags.value = row.manageTags;
-}
+//function handleApprove(row) {
+//   approveForm.value = { ...row };
+//   approveDialog.value = true;
+//   displayManageTags.value = row.manageTags;
+// }
 
 // 审批同意
-function handleApproveAgree() {
-  if (typeof approveForm.value.foldTo !== 'number') {
-    approveForm.value.foldTo = Number(approveForm.value.foldTo);
-  }
+// function handleApproveAgree() {
+//   if (typeof approveForm.value.foldTo !== 'number') {
+//     approveForm.value.foldTo = Number(approveForm.value.foldTo);
+//   }
 
-  approveForm.value.status = 1;
-  approveScTransGroup(approveForm.value).then(() => {
-    approveDialog.value = false;
-    proxy.$modal.msgSuccess('审批通过，羊只所在羊舍已更新');
-    getList();
-  }).catch(error => {
-    proxy.$modal.msgError(`审批失败：${error.message}`);
-  });
-}
+//   approveForm.value.status = 1;
+//   approveScTransGroup(approveForm.value).then(() => {
+//     approveDialog.value = false;
+//     proxy.$modal.msgSuccess('审批通过，羊只所在羊舍已更新');
+//     getList();
+//   }).catch(error => {
+//     proxy.$modal.msgError(`审批失败：${error.message}`);
+//   });
+// }
 
-function handleApproveReject() {
-  approveForm.value.status = 2;
-  approveScTransGroup(approveForm.value).then(() => {
-    approveDialog.value = false;
-    proxy.$modal.msgSuccess('审批已驳回');
-    getList();
-  }).catch(error => {
-    proxy.$modal.msgError(`审批失败：${error.message}`);
-  });
-}
+// function handleApproveReject() {
+//   approveForm.value.status = 2;
+//   approveScTransGroup(approveForm.value).then(() => {
+//     approveDialog.value = false;
+//     proxy.$modal.msgSuccess('审批已驳回');
+//     getList();
+//   }).catch(error => {
+//     proxy.$modal.msgError(`审批失败：${error.message}`);
+//   });
+// }
 
 //加载羊舍数据
 function loadSheepfold() {