转场，转群，改耳号，改备注，改品种部分bug修复，字段顺序调整

src/views/produce/manage_sheep/transition_info/index.vue

@@ -7,21 +7,61 @@
           start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item label="管理耳号" prop="manageTagsList">
-        <el-select v-model="queryParams.manageTagsList" multiple filterable remote reserve-keyword
-          placeholder="请输入耳号，支持多选" :remote-method="searchEarNumber" :loading="earLoading" allow-create
-          default-first-option style="width: 260px">
-          <el-option v-for="item in earOptions" :key="item" :label="item" :value="item" />
-        </el-select>
-        <el-button type="text" @click="clearEarNumbers"
-          v-if="queryParams.manageTagsList && queryParams.manageTagsList.length > 0" style="margin-left: 8px">
-          清空
-        </el-button>
+        <div style="display:flex;align-items:center;gap:8px;flex-wrap:wrap;">
+          <!-- 主选择器：使用 collapse-tags 显示 +n -->
+          <el-select v-model="queryParams.manageTagsList" multiple filterable remote reserve-keyword
+            placeholder="输入耳号搜索" :remote-method="searchEarNumber" :loading="earLoading" allow-create
+            default-first-option collapse-tags :max-collapse-tags="0" style="width:300px" @change="handleEarChange">
+            <el-option v-for="item in earOptions" :key="item" :label="item" :value="item" />
+          </el-select>
+
+          <!-- 批量粘贴框 -->
+          <el-input v-model="pasteText" placeholder="或粘贴多个耳号(空格/换行/逗号分隔)" style="width:300px" @paste="handlePaste"
+            @keyup.enter="handlePasteSubmit" clearable>
+            <template #append>
+              <el-button @click="handlePasteSubmit" :icon="Plus">添加</el-button>
+            </template>
+          </el-input>
+
+          <!-- 计数标签 -->
+          <el-tag v-if="queryParams.manageTagsList && queryParams.manageTagsList.length" type="info" effect="plain"
+            size="large">
+            已选: {{ queryParams.manageTagsList.length }} 个
+          </el-tag>
+
+          <!-- 一键清空 -->
+          <el-button type="danger" plain :icon="Delete" @click="clearEarNumbers"
+            v-if="queryParams.manageTagsList && queryParams.manageTagsList.length">
+            清空全部
+          </el-button>
+        </div>
+
+        <!-- 已选耳号展示区（可折叠） -->
+        <div v-if="queryParams.manageTagsList && queryParams.manageTagsList.length" class="selected-ear-numbers">
+          <el-tag v-for="tag in displayedEarTags" :key="tag" closable @close="removeEarNumber(tag)" style="margin:4px"
+            type="success">
+            {{ tag }}
+          </el-tag>
+
+          <el-button v-if="queryParams.manageTagsList.length > defaultShowCount" type="primary" link
+            @click="toggleExpand">
+            {{ isExpanded ? '收起' : `展开剩余 ${queryParams.manageTagsList.length - defaultShowCount} 个` }}
+            <el-icon class="el-icon--right">
+              <component :is="isExpanded ? ArrowUp : ArrowDown" />
+            </el-icon>
+          </el-button>
+        </div>
       </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="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="转场类型" prop="transType" style="width: 308px">
         <el-select v-model="queryParams.transType" placeholder="请选择转场类型" clearable style="min-width:150px">
           <el-option label="内部调拨" :value="0" />
@@ -34,28 +74,40 @@
           <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="queryParams.transFrom" placeholder="请选择当前牧场" clearable style="min-width:150px">
+      <!--  <el-form-item label="转出牧场" prop="transFrom">
+        <el-select v-model="queryParams.transFrom" placeholder="请选择转出牧场" clearable style="min-width:150px">
           <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="currentRanchId">
+        <el-select v-model="queryParams.currentRanchId" placeholder="请选择当前场区" clearable style="min-width:150px">
+          <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName" :value="ranch.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="技术员" prop="technician">
+        <el-select v-model="queryParams.technician" filterable allow-create clearable placeholder="请输入或选择技术员"
+          style="min-width:150px">
+          <!-- 如果有字典可以放开下面这行，没有就纯输入 -->
+          <!-- <el-option v-for="item in technicianOptions" :key="item" :label="item" :value="item" /> -->
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否在群" prop="isDelete">
+        <el-select v-model="queryParams.isDelete" placeholder="全部" clearable style="min-width:120px">
+          <el-option label="全部" value="" />
+          <el-option label="在群" :value="0" />
+          <el-option label="离群" :value="1" />
+        </el-select>
+      </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-button icon="Refresh" @click="resetQuery">重置</el-button> -->
       </el-form-item>
     </el-form>
-    <div v-if="queryParams.manageTagsList && queryParams.manageTagsList.length > 0" class="selected-ear-numbers">
-      <span style="margin-right: 10px; color: #606266;">已选耳号：</span>
-      <el-tag v-for="tag in queryParams.manageTagsList" :key="tag" closable @close="removeEarNumber(tag)"
-        style="margin-right: 8px;">
-        {{ tag }}
-      </el-tag>
-    </div>
     <!-- 按钮行 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -81,36 +133,37 @@
     <el-table v-loading="loading" :data="transition_infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" fixed />
+      <el-table-column label="品种" align="center" prop="varietyName" />
       <el-table-column label="事件类型" align="center" prop="eventType" min-width="120" />
-      <el-table-column label="转场类型" align="center" prop="transTypeText" />
       <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="varietyName" />
+      <el-table-column label="转场类型" align="center" prop="transTypeText" />
       <el-table-column label="转入牧场" align="center" prop="transTo" min-width="120" />
-      <el-table-column label="当前牧场" align="center" prop="transFrom" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template #default="scope">
-          <dict-tag :options="status" :value="scope.row.status" />
-        </template>
-      </el-table-column>
+      <el-table-column label="转出牧场" align="center" prop="transFrom" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="120" />
       <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="当前状态" align="center" prop="status" min-width="120">
-        <template #default="scope">
-          <span v-if="scope.row.status === 0">待审批</span>
-          <span v-else-if="scope.row.status === 1 || scope.row.status === 2">审批完成</span>
-          <span v-else>未知状态</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="130">
         <template #default="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="status" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="当前状态" align="center" prop="status" min-width="120">
+        <template #default="scope">
+          <span v-if="scope.row.status === 0">待审批</span>
+          <span v-else-if="scope.row.status === 1 || scope.row.status === 2">审批完成</span>
+          <span v-else>未知状态</span>
+        </template>
+      </el-table-column> -->
       <el-table-column label="操作" align="center" min-width="180" fixed="right">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
@@ -125,21 +178,25 @@
       v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
 
     <!-- 新增/修改 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="700px" append-to-body>
       <el-form ref="transition_infoRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="管理耳号" prop="manageTags">
-          <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-input v-model="form.manageTags" placeholder="请输入管理耳号，支持批量输入（空格/换行/逗号分隔）" @blur="onManageTagsBlur"
+            :disabled="!isAdd" />
         </el-form-item>
 
+        <!-- 新增弹窗已选耳号展示区（和改备注、转群完全一致） -->
+        <div v-if="batchTags.length" class="selected-ear-numbers" style="margin-left: 80px; margin-bottom: 18px;">
+          <el-tag v-for="(tag, idx) in batchTags" :key="tag" closable @close="removeBatchTag(idx)" style="margin:4px"
+            type="success">
+            {{ tag }}
+          </el-tag>
+
+          <el-button type="primary" link @click="clearBatchTags">
+            一键清空 ({{ batchTags.length }})
+          </el-button>
+        </div>
+
         <el-form-item label="转入牧场" prop="transTo">
           <el-select v-model="form.transTo" placeholder="请选择转入牧场" clearable :disabled="!isAdd">
             <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName"
@@ -147,8 +204,8 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="当前牧场" prop="transFrom">
-          <el-select v-model="form.transFrom" placeholder="请选择当前牧场" clearable @change="handleRanchChange"
+        <el-form-item label="转出牧场" prop="transFrom">
+          <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" />
@@ -201,7 +258,7 @@
         <el-form-item label="转入牧场">
           <el-input :value="approveForm.transTo" disabled />
         </el-form-item>
-        <el-form-item label="当前牧场">
+        <el-form-item label="转出牧场">
           <el-input :value="approveForm.transFrom" disabled />
         </el-form-item>
         <el-form-item label="转场类型">
@@ -216,10 +273,10 @@
         <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-form-item label="转入羊舍" prop="sheepfoldId">
+          <el-select v-model="approveForm.sheepfoldId" placeholder="请输入或选择转入羊舍" filterable clearable allow-create
+            default-first-option @change="handleSheepfoldInputChange" style="width: 100%;">
+            <el-option v-for="sf in acceptSheepfold" :key="sf.id" :label="sf.sheepfoldName" :value="sf.id" />
           </el-select>
         </el-form-item>
       </el-form>
@@ -235,10 +292,10 @@
 </template>
 
 <script setup name="Transition_info">
-import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, getSheepByRanchId, updateTransition_info, listRanch, approveTransitionInfo,searchEarNumbers } from "@/api/produce/manage_sheep/transition_info"
+import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, getSheepByRanchId, updateTransition_info, listRanch, approveTransitionInfo, searchEarNumbers } from "@/api/produce/manage_sheep/transition_info"
 import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
 import request from '@/utils/request'
-
+import dayjs from 'dayjs'
 
 const { proxy } = getCurrentInstance()
 const { status, trans_type } = proxy.useDict('status', 'trans_type')
@@ -262,7 +319,18 @@ const sheepOptions = ref([])
 const isAdd = ref(true)
 const isEdit = ref(false)
 const acceptSheepfold = ref([])
-
+const sheepTypeList = ref([])
+const pasteText = ref('')               // 批量粘贴输入框
+const isExpanded = ref(false)           // 折叠状态
+const defaultShowCount = 2              // 默认展示条数
+const batchTags = ref([])      // 本次要新增的多条耳号
+const batchSheep = ref([])     // 对应的羊只对象
+// 计算属性：控制实际展示的耳号列表
+const displayedEarTags = computed(() => {
+  const list = queryParams.value.manageTagsList || []
+  if (isExpanded.value || list.length <= defaultShowCount) return list
+  return list.slice(0, defaultShowCount)
+})
 const data = reactive({
   form: {
     id: null,
@@ -284,7 +352,11 @@ const data = reactive({
     transTo: null,
     transFrom: null,
     status: null,
-    transitionDate: null
+    transitionDate: null,
+    technician: null,
+    isDelete: null,
+    sheepTypeId: null,
+    currentRanchId: null
   },
   rules: {
     manageTags: [
@@ -294,7 +366,7 @@ const data = reactive({
       { required: true, message: "请输入转入牧场", trigger: "blur" }
     ],
     transFrom: [
-      { required: false, message: "请选择当前牧场", trigger: "blur" }
+      { required: false, message: "请选择转出牧场", trigger: "blur" }
     ],
     eventType: [
       { required: true, message: '请选择事件类型', trigger: 'change' }
@@ -320,6 +392,9 @@ function getList() {
   if (queryParams.value.transType !== null) {
     queryParams.value.params.transType = queryParams.value.transType;
   }
+  if (queryParams.value.currentRanchId !== null) {
+    queryParams.value.params.currentRanchId = queryParams.value.currentRanchId
+  }
   if (transitionDateRange.value && transitionDateRange.value.length > 0) {
     queryParams.value.params["beginTransitionDate"] = transitionDateRange.value[0];
     queryParams.value.params["endTransitionDate"] = transitionDateRange.value[1];
@@ -334,7 +409,7 @@ function getList() {
 function reset() {
   form.value = {
     id: null,
-    manageTags: [],
+    manageTags: '',
     transTo: null,
     transFrom: null,
     transType: null,
@@ -342,6 +417,8 @@ function reset() {
     createBy: null,
     tagDetails: {}
   };
+  batchTags.value = [];
+  batchSheep.value = [];
   sheepOptions.value = [];
   proxy.resetForm("transition_infoRef");
   isAdd.value = true;
@@ -361,7 +438,7 @@ function loadRanchOptions() {
       } else {
       }
     })
-    .catch((error) => {
+    .catch(() => {
       proxy.$modal.msgError('获取牧场数据失败');
     });
 }
@@ -372,8 +449,8 @@ function loadSheepOptions() {
       id: sheep.id,
       manageTags: sheep.manageTags
     })) || [];
-  }).catch(error => {
-    console.error('加载耳号选项失败', error);
+  }).catch(() => {
+    proxy.$modal.msgError('加载耳号选项失败，请重试');
   });
 }
 
@@ -400,11 +477,10 @@ function loadSheepfoldsByRanch(ranchName) {
   }).then(res => {
     acceptSheepfold.value = res.rows || [];
     if (acceptSheepfold.value.length === 0) {
-      proxy.$modal.msgWarning(`转入牧场“${ranchName}”没有可用的接收羊舍`);
+      proxy.$modal.msgWarning(`转入牧场“${ranchName}”没有可用的羊舍`);
     }
-  }).catch(error => {
-    console.error('加载接收羊舍失败:', error);
-    proxy.$modal.msgError('获取接收羊舍数据失败');
+  }).catch(() => {
+    proxy.$modal.msgError('获取转入羊舍数据失败');
   });
 }
 
@@ -419,50 +495,10 @@ async function getRanchNameByRanchId(ranchId) {
     );
     return matchedRanch ? matchedRanch.ranchName : '';
   } catch (error) {
-    console.error('通过 ranchId 查询牧场名称失败:', error);
     return '';
   }
 }
-function handleRanchChange(ranchName) {
-  if (!ranchName) {
-    sheepOptions.value = [];
-    form.value.manageTags = [];
-    return;
-  }
 
-  const matchedRanch = ranchOptions.value.find(
-    (ranch) => ranch.ranchName === ranchName
-  );
-  if (!matchedRanch) {
-    proxy.$modal.msgError('未找到该牧场信息，请重新选择');
-    return;
-  }
-
-  const ranchIdNum = matchedRanch.id;
-
-  getSheepByRanchId(ranchIdNum)
-    .then((res) => {
-      if (res.code === 200) {
-        if (res.data && res.data.length > 0) {
-          sheepOptions.value = res.data.map((sheep) => ({
-            id: sheep.id,
-            manageTags: sheep.manageTags,
-          }));
-        } else {
-          sheepOptions.value = [];
-          proxy.$message.error('该牧场暂无羊只数据');
-        }
-      } else {
-        sheepOptions.value = [];
-        proxy.$modal.msgError('获取羊只数据失败，请重试');
-      }
-    })
-    .catch((error) => {
-      console.error('羊只列表加载失败:', error);
-      sheepOptions.value = [];
-      proxy.$modal.msgError('获取羊只信息失败，请重试');
-    });
-}
 async function loadSheepInfo() {
   if (isEdit.value) {
     return;
@@ -498,7 +534,6 @@ async function loadSheepInfo() {
         form.value.transFrom = ranchName;
       }
     } catch (error) {
-      console.error('获取耳号信息失败:', error);
       validResults.push(false);
       proxy.$modal.msgError(`耳号 ${tag} 验证失败`);
     }
@@ -532,48 +567,38 @@ function handleApprove(row) {
   displayManageTags.value = Array.isArray(row.manageTags)
     ? row.manageTags.join(',')
     : row.manageTags || '';
-
-  if (row.eventType === '转场转入') {
-    loadSheepfoldsByRanch(row.transTo);
-  } else {
-    acceptSheepfold.value = [];
-  }
-  approveDialog.value = true;
+  loadSheepfoldsByRanch(row.transTo);
 }
 
-// 审批同意
 function handleApproveAgree() {
-  if (!approveForm.value.transTo) {
-    proxy.$modal.msgError('转入牧场不能为空');
+  // ① 先置状态为“通过”
+  approveForm.value.status = 1;
+
+  // ② 再校验接收羊舍（仅同意时）
+  if (approveForm.value.eventType === "转场转入" && !approveForm.value.sheepfoldId) {
+    proxy.$modal.msgError('转场转入时，转入羊舍不能为空');
     return;
   }
 
-  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}`);
   });
 }
 
-// 驳回审批
 function handleApproveReject() {
   approveForm.value.status = 2;
-  updateTransition_info(approveForm.value).then(() => {
+  approveForm.value.sheepfoldId = null;
+  approveTransitionInfo(approveForm.value).then(() => {
     approveDialog.value = false;
-    proxy.$modal.msgSuccess('驳回请求');
+    proxy.$modal.msgSuccess('已驳回');
     getList();
-  }).catch(error => {
-    proxy.$modal.msgError(`审批失败：${error.message}`);
   });
 }
-
 // 获取转场类型文本
 function getTransTypeLabel(value) {
   const transTypeArray = trans_type.value;
@@ -610,9 +635,13 @@ function handleQuery() {
 function resetQuery() {
   queryParams.value.transType = null;
   transitionDateRange.value = [];
-  queryParams.value.manageTagsList = []
-  proxy.resetForm("queryRef")
-  handleQuery()
+  queryParams.value.manageTagsList = [];
+  queryParams.value.sheepTypeId = null;
+  queryParams.value.currentRanchId = null;
+  queryParams.value.isDelete = null;
+  queryParams.value.technician = null;
+  proxy.resetForm("queryRef");
+  handleQuery();
 }
 
 function handleSelectionChange(selection) {
@@ -625,11 +654,10 @@ function handleSelectionChange(selection) {
 function handleAdd() {
   reset();
   open.value = true;
-  title.value = "添加转场";
+  title.value = '添加转场';
   isAdd.value = true;
   isEdit.value = false;
-  sheepOptions.value = [];
-  form.value.manageTags = [];
+  form.value.transitionDate = dayjs().format('YYYY-MM-DD');
 }
 
 //修改
@@ -646,7 +674,6 @@ async function handleUpdate(row) {
     isAdd.value = false;
     isEdit.value = true;
   }).catch(error => {
-    console.error('获取转场详情失败:', error);
     proxy.$modal.msgError('加载数据失败，请重试');
   });
 }
@@ -654,65 +681,38 @@ async function handleUpdate(row) {
 //提交
 async function submitForm() {
   proxy.$refs.transition_infoRef.validate(async (valid) => {
-    if (!valid) return;
+    if (!valid) return
 
-    const allTags = form.value.manageTags;
-    let validTags = [];
-
-    if (isAdd.value) {
-      if (!allTags || allTags.length === 0) {
-        proxy.$modal.msgError('请选择至少一个耳号');
-        return;
-      }
-
-      const tagDetails = form.value.tagDetails || {};
-      validTags = allTags.filter(tag => tagDetails[tag]);
-
-      if (validTags.length === 0) {
-        proxy.$modal.msgError('所有耳号均无效，请重新输入');
-        return;
-      }
-    } else {
-      validTags = allTags;
+    if (batchTags.value.length === 0) {
+      proxy.$modal.msgError('请输入至少一个有效耳号')
+      return
     }
 
-    let submitData = {};
-    if (isAdd.value) {
-      submitData = validTags.map(tag => ({
-        sheepId: form.value.tagDetails[tag].sheepId,
-        varietyId: form.value.tagDetails[tag].varietyId,
-        varietyName: form.value.tagDetails[tag].varietyName,
-        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,
-      }));
-    } else {
-      submitData = {
-        ...form.value,
-        manageTags: validTags.join(','),
-        eventType: form.value.eventType,
-      };
-    }
+    // 批量构建提交数据
+    const submitData = batchTags.value.map((tag, idx) => ({
+      sheepId: batchSheep.value[idx].id,
+      varietyId: batchSheep.value[idx].varietyId,
+      varietyName: batchSheep.value[idx].varietyName || '',
+      manageTags: tag,
+      transTo: form.value.transTo,
+      transFrom: form.value.transFrom,
+      transType: form.value.transType,
+      eventType: form.value.eventType,
+      transitionDate: form.value.transitionDate,
+      technician: form.value.technician,
+      comment: batchSheep.value[idx].comment || '',
+      status: 0,
+    }))
 
     try {
-      if (isAdd.value) {
-        await addTransition_info(submitData);
-      } else {
-        await updateTransition_info(submitData);
-      }
-      proxy.$modal.msgSuccess(isAdd.value ? '提交成功' : '修改成功');
-      open.value = false;
-      getList();
+      await addTransition_info(submitData)
+      proxy.$modal.msgSuccess(`成功新增 ${batchTags.value.length} 条转场记录`)
+      open.value = false
+      getList()
     } catch (error) {
-      proxy.$modal.msgError(isAdd.value ? '提交失败，请重试' : '修改失败，请重试');
+      proxy.$modal.msgError('提交失败，请重试')
     }
-  });
+  })
 }
 //加载品种信息
 function getVarietyOptions() {
@@ -743,17 +743,151 @@ function searchEarNumber(query) {
     earOptions.value = res.data || []
   }).finally(() => earLoading.value = false)
 }
+async function handleRanchChange(ranchName) {
+  if (!ranchName) {
+    sheepOptions.value = [];
+    form.value.manageTags = [];
+    return;
+  }
+
+  const matched = ranchOptions.value.find(r => r.ranchName === ranchName);
+  if (!matched) return;
+
+  const res = await getSheepByRanchId(matched.id);
+  sheepOptions.value = (res.data || []).map(s => ({ id: s.id, manageTags: s.manageTags }));
+  form.value.manageTags = (res.data || []).map(s => s.manageTags);
+  await loadSheepInfo();
+}
+/* 粘贴事件 */
+function handlePaste() {
+  nextTick(() => handlePasteSubmit())
+}
+
+/* 批量提交：拆词 → 去重 → 回填 */
+function handlePasteSubmit() {
+  if (!pasteText.value || !pasteText.value.trim()) return
+  const separators = /[\p{White_Space},，\n\r\t]+/u
+  const raw = pasteText.value.trim().split(separators).filter(v => v)
+  const exist = new Set(queryParams.value.manageTagsList || [])
+  const adds = []
+  const dups = []
+  raw.forEach(v => {
+    if (!exist.has(v)) { adds.push(v); exist.add(v) }
+    else dups.push(v)
+  })
+  if (adds.length) {
+    queryParams.value.manageTagsList = [...(queryParams.value.manageTagsList || []), ...adds]
+    proxy.$modal.msgSuccess(`成功添加 ${adds.length} 个耳号，当前共 ${queryParams.value.manageTagsList.length} 个` +
+      (dups.length > 0 ? `，已忽略 ${dups.length} 个重复耳号` : ''))
+  } else if (dups.length > 0) {
+    proxy.$modal.msgWarning('所有耳号均已存在')
+  }
+  pasteText.value = ''
+}
+
+/* 切换展开/收起 */
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+/* 选择器变化时去重 */
+function handleEarChange(val) {
+  queryParams.value.manageTagsList = [...new Set(val)]
+}
+
+/* 一键清空 */
 function clearEarNumbers() {
   queryParams.value.manageTagsList = []
+  pasteText.value = ''
+  isExpanded.value = false
 }
+
+/* 删除单个耳号 */
 function removeEarNumber(tag) {
   const idx = queryParams.value.manageTagsList.indexOf(tag)
   if (idx > -1) queryParams.value.manageTagsList.splice(idx, 1)
 }
+
+// 校验和回显（和改备注、转群完全一致）
+async function onManageTagsBlur() {
+  const raw = form.value.manageTags?.trim()
+  if (!raw) return
+
+  // 1. 先按分隔符拆
+  const separators = /[\p{White_Space},，]+/u
+  const tags = [...new Set(raw.split(separators).filter(v => v))]
+
+  // 2. 只有一条 → 走老逻辑
+  if (tags.length === 1) {
+    const { data: sheep } = await checkSheepByManageTags(tags[0].trim()).catch(() => ({ data: null }))
+    if (sheep) {
+      batchTags.value = [tags[0]]
+      batchSheep.value = [sheep]
+      // 自动填充转出牧场
+      const ranchName = await getRanchNameByRanchId(sheep.ranchId)
+      form.value.transFrom = ranchName
+    } else {
+      proxy.$modal.msgWarning('未找到该耳号对应羊只')
+      batchTags.value = []
+      batchSheep.value = []
+    }
+    return
+  }
+
+  // 3. 多条 → 批量校验
+  batchTags.value = []
+  batchSheep.value = []
+  for (const tag of tags) {
+    const { data: sheep } = await checkSheepByManageTags(tag.trim()).catch(() => ({ data: null }))
+    if (sheep) {
+      batchTags.value.push(tag)
+      batchSheep.value.push(sheep)
+    } else {
+      proxy.$modal.msgWarning(`耳号 ${tag} 未找到对应羊只，已跳过`)
+    }
+  }
+
+  if (!batchTags.value.length) return   // 全部无效
+
+  // 把合法耳号重新拼回输入框，用半角空格分隔
+  form.value.manageTags = batchTags.value.join(' ')
+
+  // 自动填充第一条的转出牧场
+  const firstSheep = batchSheep.value[0]
+  const ranchName = await getRanchNameByRanchId(firstSheep.ranchId)
+  form.value.transFrom = ranchName
+}
+
+// 删除单个批量耳号
+function removeBatchTag(idx) {
+  batchTags.value.splice(idx, 1)
+  batchSheep.value.splice(idx, 1)
+  // 实时回写输入框
+  form.value.manageTags = batchTags.value.join(' ')
+}
+
+// 一键清空批量耳号
+function clearBatchTags() {
+  batchTags.value = []
+  batchSheep.value = []
+  form.value.manageTags = ''
+  form.value.transFrom = ''
+}
+// 加载羊只类型数据
+function loadSheepTypeList() {
+  request({
+    url: '/base/base/list',
+    method: 'get',
+    params: { pageNum: 1, pageSize: 9999 }
+  }).then(res => {
+    sheepTypeList.value = res.rows || []
+  })
+}
 onMounted(() => {
   loadRanchOptions();
   getVarietyOptions();
   loadSheepOptions();
+  loadSheepTypeList();
   getList();
 });
 </script>
@@ -768,9 +902,24 @@ onMounted(() => {
 }
 
 .selected-ear-numbers {
-  margin-bottom: 16px;
-  padding: 10px;
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 8px;
   background: #f5f7fa;
   border-radius: 4px;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  margin-top: 8px;
+}
+
+.selected-ear-numbers::-webkit-scrollbar {
+  width: 6px;
+}
+
+.selected-ear-numbers::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6;
+  border-radius: 3px;
 }
 </style>