diff --git a/src/api/produce/manage_sheep/trans_group/trans_group.js b/src/api/produce/manage_sheep/trans_group/trans_group.js
index e8e3eba..95ad242 100644
--- a/src/api/produce/manage_sheep/trans_group/trans_group.js
+++ b/src/api/produce/manage_sheep/trans_group/trans_group.js
@@ -50,3 +50,4 @@ export function listSheepfold() {
     method: 'get',
   });
 }
+
diff --git a/src/api/produce/other/fixHoof/fixHoof.js b/src/api/produce/other/fixHoof/fixHoof.js
index a189a91..56f9438 100644
--- a/src/api/produce/other/fixHoof/fixHoof.js
+++ b/src/api/produce/other/fixHoof/fixHoof.js
@@ -67,4 +67,13 @@ export function getVarietyOptions(query){
   })
 }
 
+//通过羊舍获取羊只
+export function getSheepBySheepfoldId(id) {
+  return request({
+    url: `/sheepfold_management/sheepfold_management/getSheepById`, // 使用你已有的接口路径
+    method: 'get',
+    params:{ id: String(id) } 
+  })
+}
+
 
diff --git a/src/views/produce/manage_sheep/add_sheep/index.vue b/src/views/produce/manage_sheep/add_sheep/index.vue
index 3a8846d..85431b9 100644
--- a/src/views/produce/manage_sheep/add_sheep/index.vue
+++ b/src/views/produce/manage_sheep/add_sheep/index.vue
@@ -52,10 +52,10 @@
         <el-col :span="10">
           <el-form-item label="性别" prop="gender">
             <el-select v-model="form.gender" placeholder="请选择性别">
-              <el-option label="公" :value="1" />
-              <el-option label="母" :value="0" />
-              <el-option label="阉羊" :value="2" />
-              <el-option label="兼性" :value="3" />
+              <el-option label="公" :value="2" />
+              <el-option label="母" :value="1" />
+              <el-option label="阉羊" :value="3" />
+              <!-- <el-option label="兼性" :value="3" /> -->
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/produce/manage_sheep/trans_group/index.vue b/src/views/produce/manage_sheep/trans_group/index.vue
index 1a6f411..d184226 100644
--- a/src/views/produce/manage_sheep/trans_group/index.vue
+++ b/src/views/produce/manage_sheep/trans_group/index.vue
@@ -1,8 +1,11 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="羊只id" prop="sheepId">
+      <!-- <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="耳号" prop="manageTags">
+        <el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="转出羊舍" prop="foldFrom">
         <el-select v-model="queryParams.foldFrom" placeholder="请选择转出羊舍" style="min-width:150px" clearable>
@@ -57,7 +60,8 @@
     <el-table v-loading="loading" :data="trans_groupList" @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="羊只id" align="center" prop="sheepId" /> -->
+      <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="varietyName" />
@@ -91,11 +95,18 @@
     <!-- 添加或修改转群记录对话框 -->
     <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="羊只id" prop="sheepId">
+        <!-- <el-form-item label="羊只id" prop="sheepId">
           <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+        </el-form-item> -->
+        <el-form-item label="耳号" prop="manageTags">
+          <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable collapse-tags 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>
         </el-form-item>
         <el-form-item label="转出羊舍" prop="foldFrom">
-          <el-select v-model="form.foldFrom" placeholder="请选择转出羊舍" clearable>
+          <el-select v-model="form.foldFrom" placeholder="请选择转出羊舍" clearable @change="handleSheepFilter">
             <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
           </el-select>
         </el-form-item>
@@ -104,9 +115,9 @@
             <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="品种" prop="varietyId">
-          <el-select v-model="form.varietyId" placeholder="请选择品种" clearable>
-            <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="Number(item.id)" />
+        <el-form-item label="羊只类型" prop="sheepTypeId">
+          <el-select v-model="form.sheepTypeId" placeholder="请选择羊只类型" clearable @change="handleSheepFilter">
+            <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="reason">
@@ -118,9 +129,6 @@
         <el-form-item label="技术员" prop="technician">
           <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
-        <el-form-item label="备注" prop="comment">
-          <el-input v-model="form.comment" placeholder="请输入备注" />
-        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -134,8 +142,11 @@
   <!-- 审批对话框 -->
   <el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
     <el-form ref="approveFormRef" :model="approveForm" label-width="120px">
-      <el-form-item label="羊只id">
+      <!-- <el-form-item label="羊只id">
         <el-input v-model="approveForm.sheepId" disabled />
+      </el-form-item> -->
+      <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 />
@@ -171,46 +182,52 @@
 <script setup name="Trans_group">
 import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group } from '@/api/produce/manage_sheep/trans_group/trans_group'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
+import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof/fixHoof'
 import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance()
 const { trans_group_reason, status } = proxy.useDict('trans_group_reason', 'status')
 
-/* -------------------- 响应式变量 -------------------- */
 const trans_groupList = ref([])
 const open = ref(false)
 const loading = ref(true)
 const showSearch = ref(true)
 const ids = ref([])
 const single = ref(true)
-const multiple = ref(true)
+const multiple = ref(false)
 const total = ref(0)
 const title = ref('')
 const daterangeCreateTime = ref([])
 
 const approveDialog = ref(false)
 const approveForm = ref({})
-
+const displayManageTags = ref('')
+const sheepOptions = ref([])
 const sheepfoldOptions = ref([])
 const sheepfoldNameMap = ref({})
 const varietyOptions = ref([])
+const sheepTypeOptions = ref([]);
 
-/* -------------------- 表单 & 查询 -------------------- */
 const data = reactive({
-  form: {},
+  form: {
+    manageTags: [],
+    tagDetails: {},
+  },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     sheepId: null,
+    manageTags: null,
     foldTo: null,
     foldFrom: null,
-    varietyId: null,      // 新增
+    varietyId: null,
     status: null,
     createTime: null
   },
   rules: {
-    sheepId: [{ required: true, message: '羊只id不能为空', trigger: 'blur' }],
-    foldFrom: [{ required: true, message: '转出羊舍不能为空', trigger: 'change' }],
+    // sheepId: [{ required: true, message: '羊只id不能为空', trigger: 'blur' }],
+    manageTags: [{ required: true, message: '耳号不能为空', trigger: 'blue' }],
+    // foldFrom: [{ required: true, message: '转出羊舍不能为空', trigger: 'change' }],
     foldTo: [{ required: true, message: '转入羊舍不能为空', trigger: 'change' }],
     varietyId: [{ required: true, message: '品种不能为空', trigger: 'change' }],
     reason: [{ required: true, message: '转群原因不能为空', trigger: 'change' }],
@@ -219,7 +236,7 @@ const data = reactive({
 })
 const { queryParams, form, rules } = toRefs(data)
 
-/* -------------------- 业务函数 -------------------- */
+
 function getList() {
   loading.value = true
   queryParams.value.params = {}
@@ -240,7 +257,7 @@ function reset() {
     sheepId: null,
     foldFrom: null,
     foldTo: null,
-    varietyId: null,      // 新增
+    varietyId: null,
     reason: null,
     technician: null,
     status: null,
@@ -251,6 +268,154 @@ function reset() {
   proxy.resetForm('trans_groupRef')
 }
 
+async function handleSheepFilter() {
+  const { foldFrom, sheepTypeId } = form.value;
+  sheepOptions.value = [];
+  let loadedSheep = [];
+
+  if (!foldFrom && !sheepTypeId) return;
+  if (foldFrom && sheepTypeId) {
+    loadedSheep = await loadSheepBySheepfoldAndType(foldFrom, sheepTypeId);
+    if (loadedSheep.length > 0) {
+      form.value.manageTags = loadedSheep.map(sheep => sheep.manageTags);
+      loadSheepInfo();
+    }
+  } else if (foldFrom) {
+    loadedSheep = await loadSheepBySheepfoldOnly(foldFrom);
+    form.value.manageTags = [];
+  } else if (sheepTypeId) {
+    loadedSheep = await loadSheepByTypeOnly(sheepTypeId);
+    if (loadedSheep.length > 0) {
+      form.value.manageTags = loadedSheep.map(sheep => sheep.manageTags);
+      loadSheepInfo();
+    }
+  }
+}
+function getSheepTypeList() {
+  request({
+    url: '/base/base/list',
+    method: 'get',
+    params: { pageNum: 1, pageSize: 9999 }
+  }).then(res => {
+    sheepTypeOptions.value = res.rows || [];
+  }).catch(error => {
+    console.error('获取羊只类型失败', error);
+    proxy.$modal.msgError('加载羊只类型失败，请重试');
+  });
+}
+async function loadSheepBySheepfoldAndType(sheepfoldId, typeId) {
+  try {
+    const res = await request({
+      url: '/sheep/sheep/listBySheepfoldAndType',
+      method: 'get',
+      params: { sheepfoldId, typeId, _t: Date.now() }
+    });
+    const sheepList = res.rows || [];
+    const formattedSheep = sheepList.map(sheep => ({
+      id: sheep.id,
+      manageTags: sheep.manageTags,
+      sheepfoldId: sheepfoldId
+    }));
+    sheepOptions.value = formattedSheep;
+    if (sheepOptions.value.length === 0) {
+      proxy.$message.error(`该羊舍没有该类型羊只`);
+    }
+    return formattedSheep;
+  } catch (error) {
+    console.error('根据羊舍+类型加载耳号失败', error);
+    proxy.$modal.msgError("加载耳号失败，请重试");
+    return [];
+  }
+}
+async function loadSheepBySheepfoldOnly(sheepfoldId) {
+  try {
+    const res = await getSheepBySheepfoldId(String(sheepfoldId));
+    const sheepList = res.data || [];
+    const formattedSheep = sheepList.map(sheep => ({
+      id: sheep.id,
+      manageTags: sheep.manageTags,
+      sheepfoldId: sheepfoldId
+    }));
+    sheepOptions.value = formattedSheep;
+    if (sheepOptions.value.length === 0) {
+      proxy.$message.error(`该羊舍下没有羊只数据`);
+    } else {
+      proxy.$message.success(`成功加载 ${sheepOptions.value.length} 个耳号`);
+    }
+    return formattedSheep;
+  } catch (error) {
+    console.error('根据羊舍加载耳号失败', error);
+    proxy.$modal.msgError("加载羊舍耳号失败，请重试");
+    return [];
+  }
+}
+async function loadSheepByTypeOnly(typeId) {
+  try {
+    const res = await request({
+      url: '/sheep/sheep/listByTypeId',
+      method: 'get',
+      params: { typeId }
+    });
+    const sheepList = res.rows || [];
+    const formattedSheep = sheepList.map(sheep => ({
+      id: sheep.id,
+      manageTags: sheep.manageTags,
+      sheepfoldId: sheep.sheepfoldId
+    }));
+    sheepOptions.value = formattedSheep;
+    if (sheepOptions.value.length === 0) {
+      proxy.$message.error(`未查询到“${getSheepTypeName(typeId)}”类型的羊只`);
+    }
+    return formattedSheep;
+  } catch (error) {
+    console.error('根据类型加载耳号失败', error);
+    proxy.$modal.msgError("加载耳号失败，请重试");
+    return [];
+  }
+}
+
+function getSheepTypeName(typeId) {
+  if (!typeId) return '未知类型';
+  const type = sheepTypeOptions.value.find(item => item.id === typeId);
+  return type ? type.name : '未知类型';
+}
+
+async function loadSheepInfo() {
+  const tags = form.value.manageTags;
+  if (!tags || tags.length === 0) return;
+
+  const tagDetails = {};
+  const validResults = [];
+
+  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
+        };
+      }
+    } 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;
+}
+
 function cancel() {
   open.value = false
   reset()
@@ -274,38 +439,72 @@ function handleSelectionChange(selection) {
 }
 
 function handleAdd() {
-  reset()
-  open.value = true
-  title.value = '添加转群记录'
+  reset();
+  open.value = true;
+  title.value = '添加转群记录';
+
+  sheepOptions.value = [];
+  form.value.manageTags = [];
 }
 
 function handleUpdate(row) {
-  reset()
-  const _id = row.id || ids.value
+  reset();
+  const _id = row.id || ids.value;
+
   getTrans_group(_id).then(res => {
-    const d = res.data
-    // 统一转成 Number，避免 undefined
-    d.foldFrom = Number(d.foldFrom ?? 0)
-    d.foldTo = Number(d.foldTo ?? 0)
-    d.reason = Number(d.reason ?? 0)
-    d.status = Number(d.status ?? 0)
-    d.varietyId = Number(d.varietyId ?? 0)
-    form.value = d
-    open.value = true
-    title.value = '修改转群记录'
-  })
+    const d = res.data;
+    d.foldFrom = Number(d.foldFrom ?? 0);
+    d.foldTo = Number(d.foldTo ?? 0);
+    d.reason = Number(d.reason ?? 0);
+    d.status = Number(d.status ?? 0);
+    d.varietyId = Number(d.varietyId ?? 0);
+
+    form.value = { ...d, manageTags: d.manageTags, isEdit: true };
+
+    handleSheepFilter();
+
+    open.value = true;
+    title.value = '修改转群记录';
+  });
 }
 
 function submitForm() {
   proxy.$refs.trans_groupRef.validate(valid => {
-    if (!valid) return
-    const api = form.value.id ? updateTrans_group : addTrans_group
-    api(form.value).then(() => {
-      proxy.$modal.msgSuccess(form.value.id ? '修改成功' : '新增成功')
-      open.value = false
-      getList()
-    })
-  })
+    if (!valid) return;
+
+    const allTags = form.value.manageTags;
+    const tagDetails = form.value.tagDetails || {};
+    if (!allTags || allTags.length === 0) {
+      proxy.$modal.msgError('请选择或输入至少一个耳号');
+      return;
+    }
+
+    const requests = allTags.map(async (tag) => {
+      const formData = { ...form.value };
+      const details = tagDetails[tag] || {};
+      formData.manageTags = tag;
+      formData.sheepId = details.sheepId;
+      formData.foldFrom = details.sheepfoldId;
+      formData.comment = details.comment || '';
+      formData.varietyId = details.varietyId || formData.varietyId;
+
+      if (formData.id) {
+        return updateTrans_group(formData);
+      } else {
+        return addTrans_group(formData);
+      }
+    });
+
+    Promise.all(requests)
+      .then(() => {
+        proxy.$modal.msgSuccess('操作成功');
+        open.value = false;
+        getList();
+      })
+      .catch(error => {
+        proxy.$modal.msgError(`处理失败：${error.message}`);
+      });
+  });
 }
 
 function handleDelete(row) {
@@ -326,10 +525,12 @@ function handleExport() {
   )
 }
 
-/* -------------------- 审批 -------------------- */
+//审核
 function handleApprove(row) {
   approveForm.value = { ...row }
   approveDialog.value = true
+  displayManageTags.value = row.manageTags;
+
 }
 function handleApproveAgree() {
   approveForm.value.status = 1
@@ -348,7 +549,6 @@ function handleApproveReject() {
   })
 }
 
-/* -------------------- 下拉数据 -------------------- */
 function loadSheepfold() {
   listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
     sheepfoldOptions.value = res.rows
@@ -364,14 +564,15 @@ function getVarietyOptions() {
     method: 'get',
     params: { pageNum: 1, pageSize: 9999 }
   }).then(res => {
-    varietyOptions.value = res.rows || []
-  })
+    varietyOptions.value = res.rows || [];
+  });
 }
 
-/* -------------------- 初始化 -------------------- */
+
 onMounted(() => {
-  loadSheepfold()
-  getVarietyOptions()
-  getList()
+  loadSheepfold();
+  getVarietyOptions();
+  getSheepTypeList();
+  getList();
 })
 </script>
\ 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 f4f9f8f..4f2abb9 100644
--- a/src/views/produce/other/castrate/index.vue
+++ b/src/views/produce/other/castrate/index.vue
@@ -2,8 +2,8 @@
   <div class="app-container">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="羊只id" prop="sheepId">
-        <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="耳号" prop="manageTags">
+        <el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery" />
       </el-form-item>
 
       <el-form-item label="羊舍" prop="sheepfold">
@@ -35,10 +35,11 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['produce:castrate: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="['produce:castrate: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="['produce:castrate:remove']">删除</el-button>
@@ -53,7 +54,8 @@
     <!-- 列表表格 -->
     <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="羊只id" align="center" prop="sheepId" /> -->
+      <el-table-column label="耳号" align="center" prop="manageTags" />
       <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
       <el-table-column label="品种" align="center" prop="varietyName" />
       <el-table-column label="备注" align="center" prop="comment" />
@@ -65,8 +67,9 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['produce:castrate:edit']">修改</el-button>
+          <!-- 按需添加 是否需要修改功能 -->
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['produce:castrate:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['produce:castrate:remove']">删除</el-button>
         </template>
@@ -79,25 +82,21 @@
     <!-- 新增/修改弹窗 -->
     <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="羊只id" prop="sheepId">
-          <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
-        </el-form-item>
-        <el-form-item label="羊舍" prop="sheepfold">
-          <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
-            <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
+        <el-form-item label="耳号" prop="manageTags">
+          <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable collapse-tags 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>
         </el-form-item>
-        <el-form-item label="品种" prop="varietyId">
-          <el-select v-model="form.varietyId" placeholder="请选择品种" clearable>
-            <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
+        <el-form-item label="羊舍" prop="sheepfold">
+          <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable @change="loadSheepBySheepfold">
+            <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="技术员" prop="technician">
           <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
-        <el-form-item label="备注" prop="comment">
-          <el-input v-model="form.comment" placeholder="请输入备注" />
-        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -111,8 +110,8 @@
 
 <script setup name="castrate">
 import { listCastrate, getCastrate, delCastrate, addCastrate, updateCastrate } from '@/api/produce/other/castrate/castrate'
+import { checkSheepByManageTags, getVarietyOptions, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof/fixHoof'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
-import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance()
 
@@ -126,28 +125,37 @@ const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
 const daterangeCreateTime = ref([])
+const sheepOptions = ref([])
+const varietyOptions = ref([])
+
 
 const data = reactive({
-  form: {},
+  form: {
+    manageTags: [],
+    sheepfold: null,
+    technician: null,
+    tagDetails: {} 
+  },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    sheepId: null,
+    manageTags: null,
+    // sheepId: null,
     sheepfold: null,
     varietyId: null,
     technician: null,
     createTime: null
   },
   rules: {
-    sheepId: [
-      { required: true, message: '羊只id不能为空', trigger: 'blur' }
+    // sheepId: [
+    //   { required: true, message: '羊只id不能为空', trigger: 'blur' }
+    // ],
+    manageTags: [
+      { required: true, message: '耳号不能为空', trigger: 'blur' }
     ],
     sheepfold: [
       { required: true, message: '羊舍不能为空', trigger: 'change' }
     ],
-    varietyId: [
-      { required: true, message: '品种不能为空', trigger: 'change' }
-    ],
     technician: [
       { required: true, message: '技术员不能为空', trigger: 'blur' }
     ]
@@ -155,20 +163,97 @@ const data = reactive({
 })
 
 const { queryParams, form, rules } = toRefs(data)
+function loadSheepBySheepfold() {
+  const sheepfoldId = form.value.sheepfold;
+  if (!sheepfoldId) {
+    sheepOptions.value = [];
+    return;
+  }
+
+  // 加载选择的羊舍的耳号
+  getSheepBySheepfoldId(sheepfoldId)
+    .then(res => {
+      const sheepList = res.data || [];
+      if (sheepList.length === 0) {
+        proxy.$modal.msgInfo('该羊舍暂无可用耳号');
+      }
+
+      sheepOptions.value = sheepList.map(sheep => ({
+        id: sheep.id,
+        manageTags: sheep.manageTags,
+        sheepfoldId: sheepfoldId
+      }));
+    })
+    .catch(error => {
+      console.error('加载羊舍耳号失败', error);
+      proxy.$modal.msgError(`加载耳号失败: ${error.message}`);
+      sheepOptions.value = [];
+    });
+}
+
+// 输入耳号后校验并获取品种/羊舍等信息
+async function loadSheepInfo() {
+  const tags = form.value.manageTags;
+  if (!tags || tags.length === 0) return;
+
+  const tagDetails = {}; // 存储每个耳号的信息
+  const validResults = [];
+
+  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,
+          sheepfoldId: sheepData.sheepfoldId,
+          sheepId: sheepData.id
+        };
+        // 自动填充第一个耳号的羊舍（不影响备注，仅优化用户体验）
+        if (validResults.length === 1) {
+          form.value.sheepfold = sheepData.sheepfoldId;
+        }
+      }
+    } 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;
+}
 
 /** 查询列表 */
 function getList() {
-  loading.value = true
-  queryParams.value.params = {}
-  if (daterangeCreateTime.value && daterangeCreateTime.value.length === 2) {
-    queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
-    queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
+  loading.value = true;
+  const q = { ...queryParams.value };
+
+  if (q.manageTags === '') q.manageTags = null;
+
+  q.params = {};
+  if (daterangeCreateTime.value?.length) {
+    q.params.beginCreateTime = daterangeCreateTime.value[0];
+    q.params.endCreateTime = daterangeCreateTime.value[1];
   }
-  listCastrate(queryParams.value).then(res => {
-    castrateList.value = res.rows
-    total.value = res.total
-    loading.value = false
-  })
+
+  listCastrate(q).then(res => {
+    castrateList.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
+  });
 }
 
 function cancel() {
@@ -179,20 +264,17 @@ function cancel() {
 function reset() {
   form.value = {
     id: null,
-    sheepId: null,
+    manageTags: [],
     sheepfold: null,
-    varietyId: null,
-    comment: null,
     technician: null,
-    createBy: null,
-    createTime: null
-  }
-  proxy.resetForm('castrateRef')
+  };
+  sheepOptions.value = [];
+  proxy.resetForm('castrateRef');
 }
 
 function handleQuery() {
-  queryParams.value.pageNum = 1
-  getList()
+  queryParams.value.pageNum = 1;
+  getList();
 }
 
 function resetQuery() {
@@ -214,34 +296,90 @@ function handleAdd() {
 }
 
 function handleUpdate(row) {
-  reset()
-  const _id = row.id || ids.value
+  reset();
+  const _id = row.id || ids.value;
   getCastrate(_id).then(res => {
-    form.value = res.data
-    open.value = true
-    title.value = '修改去势'
-  })
+    const data = res.data;
+    const manageTags = Array.isArray(data.manageTags)
+      ? data.manageTags
+      : [data.manageTags || ''];
+
+    form.value = {
+      ...data,
+      manageTags: manageTags.filter(tag => tag),
+    };
+
+    if (form.value.sheepfold) {
+      loadSheepBySheepfold();
+    }
+
+    validateAllTags();
+
+    open.value = true;
+    title.value = '修改去势';
+  });
+}
+
+// 新增：校验所有回显的耳号是否存在
+async function validateAllTags() {
+  const tags = form.value.manageTags || [];
+  if (tags.length === 0) return;
+
+  for (const tag of tags) {
+    try {
+      const { data } = await checkSheepByManageTags(tag.trim());
+      if (!data) {
+        proxy.$modal.msgWarning(`耳号 ${tag} 不存在，已移除`);
+        form.value.manageTags = form.value.manageTags.filter(t => t !== tag);
+      }
+    } catch (error) {
+      console.error(`校验耳号 ${tag} 失败`, error);
+      form.value.manageTags = form.value.manageTags.filter(t => t !== tag);
+    }
+  }
 }
 
 function submitForm() {
   proxy.$refs.castrateRef.validate(valid => {
-    if (!valid) return
-    if (form.value.id) {
-      updateCastrate(form.value).then(() => {
-        proxy.$modal.msgSuccess('修改成功')
-        open.value = false
-        getList()
-      })
-    } else {
-      addCastrate(form.value).then(() => {
-        proxy.$modal.msgSuccess('新增成功')
-        open.value = false
-        getList()
-      })
+    if (!valid) return;
+
+    const allTags = form.value.manageTags;
+    const tagDetails = form.value.tagDetails || {};
+    if (!allTags || allTags.length === 0) {
+      proxy.$modal.msgError('请选择耳号');
+      return;
     }
-  })
+
+    // 循环处理每个耳号，逐个提交
+    const requests = allTags.map(async (tag) => {
+      const details = tagDetails[tag] || {};
+      const formData = {
+        ...form.value,
+        manageTags: tag,
+        comment: details.comment || '', // 关键：每个耳号的备注
+        sheepId: details.sheepId,
+        varietyId: details.varietyId,
+        sheepfold: details.sheepfoldId || form.value.sheepfold
+      };
+
+      // 提交单个去势记录（与后端接口匹配）
+      return addCastrate(formData);
+    });
+
+    // 并行处理所有请求
+    Promise.all(requests)
+      .then(() => {
+        proxy.$modal.msgSuccess('操作成功');
+        open.value = false;
+        getList();
+      })
+      .catch(error => {
+        proxy.$modal.msgError(`处理失败：${error.message}`);
+      });
+  });
 }
 
+
 function handleDelete(row) {
   const _ids = row.id || ids.value
   proxy.$modal.confirm(`是否确认删除去势编号为"${_ids}"的数据项？`).then(() => {
@@ -263,19 +401,6 @@ function getSheepfoldOptions() {
   })
 }
 
-const varietyOptions = ref([])
-function getVarietyOptions() {
-  request({
-    url: '/base/variety/list',
-    method: 'get',
-    params: { pageNum: 1, pageSize: 9999 }
-  }).then(res => {
-    varietyOptions.value = res.rows || []
-    console.log(varietyOptions.value);
-    
-  })
-}
-
 onMounted(() => {
   getList()
   getSheepfoldOptions()
diff --git a/src/views/produce/other/fixHoof/index.vue b/src/views/produce/other/fixHoof/index.vue
index 78729f5..ef7cd2b 100644
--- a/src/views/produce/other/fixHoof/index.vue
+++ b/src/views/produce/other/fixHoof/index.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-    <!-- 搜索 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery" />
@@ -11,7 +10,6 @@
           <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" />
@@ -35,10 +33,11 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['fixHoof:fixHoof: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="['fixHoof:fixHoof: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="['fixHoof:fixHoof:remove']">删除</el-button>
@@ -66,8 +65,9 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button>
+          <!-- 按需添加 是否需要修改功能 -->
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
         </template>
@@ -81,21 +81,17 @@
     <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-input v-model="form.manageTags" placeholder="请输入耳号" @blur="validateSheep" />
+          <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable collapse-tags 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>
         </el-form-item>
-        <el-form-item label="羊舍" prop="sheepfold">
-          <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
+        <el-form-item label="羊舍" prop="sheepfolds">
+          <el-select v-model="form.sheepfold" filterable style="width: 100%" @change="loadSheepBySheepfold">
             <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="品种" prop="varietyId">
-          <el-select v-model="form.varietyId" placeholder="请选择品种" 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="comment">
-          <el-input v-model="form.comment" placeholder="请输入备注" />
-        </el-form-item>
         <el-form-item label="技术员" prop="technician">
           <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
@@ -111,9 +107,8 @@
 </template>
 
 <script setup name="FixHoof">
-import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof, checkSheepByManageTags, getVarietyOptions } from '@/api/produce/other/fixHoof/fixHoof'
+import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof, checkSheepByManageTags, getVarietyOptions, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof/fixHoof'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
-// import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance()
 
@@ -128,9 +123,14 @@ const total = ref(0)
 const title = ref('')
 const daterangeCreateTime = ref([])
 const varietyOptions = ref([])
+const sheepOptions = ref([])
 
 const data = reactive({
-  form: {},
+  form: {
+    sheepfold: null,
+    manageTags: [],
+     tagDetails: {}
+  },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -141,17 +141,11 @@ const data = reactive({
     createTime: null
   },
   rules: {
-    // sheepId: [
-    //   { required: true, message: '耳号不能为空', trigger: 'blur' }
-    // ],
     manageTags: [
       { required: true, message: '耳号不能为空', trigger: 'blur' }
     ],
     sheepfold: [
-      { required: true, message: '羊舍id不能为空', trigger: 'change' }
-    ],
-    varietyId: [
-      { required: true, message: '品种不能为空', trigger: 'change' }
+      { required: true, message: '请选择羊舍', trigger: 'change' }
     ],
     technician: [
       { required: true, message: '技术员不能为空', trigger: 'blur' }
@@ -161,12 +155,76 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data)
 
-/* 列表 */
+function loadSheepBySheepfold() {
+  const currentSheepfoldId = form.value.sheepfold;
+
+  if (!currentSheepfoldId) {
+    sheepOptions.value = [];
+    return;
+  }
+
+  // 加载选择的羊舍的耳号
+  getSheepBySheepfoldId(currentSheepfoldId)
+    .then(res => {
+      const newSheepList = res.data || [];
+      sheepOptions.value = newSheepList.map(sheep => ({
+        id: sheep.id,
+        manageTags: sheep.manageTags,
+        sheepfoldId: currentSheepfoldId
+      }));
+    })
+    .catch(error => {
+      console.error('加载新羊舍耳号失败', error);
+      proxy.$modal.msgError('切换羊舍失败，请重试');
+      sheepOptions.value = [];
+    });
+}
+
+async function loadSheepInfo() {
+  const tags = form.value.manageTags;
+  if (!tags || tags.length === 0) return;
+
+  const tagDetails = {}; // 存储每个耳号的信息
+  const validResults = [];
+
+  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,
+          sheepfoldId: sheepData.sheepfoldId,
+          sheepId: sheepData.id
+        };
+      }
+    } 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;
+}
 function getList() {
   loading.value = true
   const q = { ...queryParams.value }
   if (q.sheepId === '') q.sheepId = null
   if (q.sheepfold === '') q.sheepfold = null
+  if (q.varietyId === '') q.varietyId = null
   q.params = {}
   if (daterangeCreateTime.value?.length) {
     q.params.beginCreateTime = daterangeCreateTime.value[0]
@@ -177,7 +235,7 @@ function getList() {
     total.value = res.total
     loading.value = false
   })
-   getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
+  getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
     varietyOptions.value = res.rows || []
   })
 }
@@ -190,14 +248,12 @@ function cancel() {
 function reset() {
   form.value = {
     id: null,
-    sheepId: null,
     sheepfold: null,
+    manageTags: [],
     varietyId: null,
-    comment: null,
-    technician: null,
-    createBy: null,
-    createTime: null
+    varietyName: null
   }
+  sheepOptions.value = [];
   proxy.resetForm('fixHoofRef')
 }
 
@@ -208,6 +264,7 @@ function handleQuery() {
 
 function resetQuery() {
   daterangeCreateTime.value = []
+  queryParams.value.varietyId = null
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -228,7 +285,9 @@ function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
   getFixHoof(_id).then(res => {
-    form.value = res.data
+    const fixHoofData = res.data;
+    fixHoofData.manageTags = fixHoofData.manageTags ? [fixHoofData.manageTags] : [];
+    form.value = fixHoofData;
     open.value = true
     title.value = '修改修蹄'
   })
@@ -236,21 +295,39 @@ function handleUpdate(row) {
 
 function submitForm() {
   proxy.$refs.fixHoofRef.validate(valid => {
-    if (!valid) return
-    if (form.value.id) {
-      updateFixHoof(form.value).then(() => {
-        proxy.$modal.msgSuccess('修改成功')
-        open.value = false
-        getList()
-      })
-    } else {
-      addFixHoof(form.value).then(() => {
-        proxy.$modal.msgSuccess('新增成功')
-        open.value = false
-        getList()
-      })
+    if (!valid) return;
+
+    const allTags = form.value.manageTags;
+    const tagDetails = form.value.tagDetails || {};
+    if (!allTags || allTags.length === 0) {
+      proxy.$modal.msgError('请选择至少一个耳号');
+      return;
     }
-  })
+
+    // 构建ScFixHoof对象列表
+    const fixHoofList = allTags.map(tag => {
+      const details = tagDetails[tag] || {};
+      return {
+        ...form.value,
+        manageTags: tag,
+        comment: details.comment || '',
+        sheepId: details.sheepId,
+        varietyId: details.varietyId,
+        sheepfold: details.sheepfoldId || form.value.sheepfold
+      };
+    });
+
+    // 一次性提交所有修蹄记录
+    addFixHoof(fixHoofList)
+      .then(() => {
+        proxy.$modal.msgSuccess('操作成功');
+        open.value = false;
+        getList();
+      })
+      .catch(error => {
+        proxy.$modal.msgError(`处理失败：${error.message}`);
+      });
+  });
 }
 
 function handleDelete(row) {
@@ -267,7 +344,6 @@ function handleExport() {
   proxy.download('/produce/other/fixHoof/export', { ...queryParams.value }, `fixHoof_${new Date().getTime()}.xlsx`)
 }
 
-/* 羊舍 */
 const sheepfoldOptions = ref([])
 function getSheepfoldOptions() {
   listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
@@ -275,30 +351,6 @@ function getSheepfoldOptions() {
   })
 }
 
-//校验羊只是否存在 失焦时校验
-async function validateSheep() {
-  if (!form.value.manageTags) return;
-  try {
-    const { data } = await checkSheepByManageTags(form.value.manageTags.trim())
-    if (!data) {
-      proxy.$modal.msgError('该管理耳号不存在');
-      // 清空
-      form.value.manageTags = null;
-      form.value.sheepId = null;
-      form.value.sheepfold = null;
-      form.value.varietyId = null;
-    } else {
-      // 隐藏字段：真正保存用
-      form.value.sheepId = data.id;
-      // 自动带出下拉框
-      form.value.sheepfold = data.sheepfoldId;
-      form.value.varietyId = data.varietyId;
-    }
-  } catch {
-    proxy.$modal.msgError('校验失败');
-  }
-}
-
 onMounted(() => {
   getSheepfoldOptions()
   getVarietyOptions()