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

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

@@ -6,15 +6,50 @@
           end-placeholder="结束日期" value-format="YYYY-MM-DD" />
       </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;">
+          <!-- 主选择器：不展示已选标签 -->
+          <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="varietyOld">
         <el-select v-model="queryParams.varietyOld" placeholder="请选择原品种" clearable filterable>
@@ -26,23 +61,27 @@
           <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="羊舍" prop="sheepfoldId">
+      <!-- <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 label="技术员" prop="technician">
+        <el-input v-model="queryParams.technician" placeholder="请输入技术员" clearable style="max-width: 160px"
+          @keyup.enter="handleQuery" />
+      </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">
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
@@ -66,23 +105,24 @@
     <el-table v-loading="loading" :data="changeVarietyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="管理耳号" align="center" prop="manageTags" />
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+      <el-table-column label="品种" align="center" prop="varietyOld" />
       <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
-      <el-table-column label="原品种" align="center" prop="varietyOld" />
-      <el-table-column label="新品种" align="center" prop="varietyNew" />
       <el-table-column label="事件日期" align="center" prop="eventDate">
         <template #default="scope">
           <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="新品种" align="center" prop="varietyNew" />
+      <el-table-column label="旧品种" align="center" prop="varietyOld" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
       <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="备注" align="center" prop="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} {h}:{i}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -100,8 +140,21 @@
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="changeVarietyRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="管理耳号" prop="manageTags">
-          <el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="onManageTagsBlur" :disabled="!isAdd" />
+          <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="varietyOld">
           <el-input v-model="form.varietyOld" placeholder="请输入原品种" disabled />
         </el-form-item>
@@ -132,10 +185,12 @@
 </template>
 
 <script setup name="ChangeVariety">
-import { listChangeVariety, getChangeVariety, delChangeVariety, addChangeVariety, updateChangeVariety, getSheepByManageTags,searchEarNumbers } from "@/api/produce/manage_sheep/changeVariety"
+import { listChangeVariety, getChangeVariety, delChangeVariety, addChangeVariety, updateChangeVariety, getSheepByManageTags, searchEarNumbers } from "@/api/produce/manage_sheep/changeVariety"
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { listVariety } from '@/api/fileManagement/variety'
-
+import dayjs from 'dayjs'
+import { nextTick } from 'vue'
+import { Plus, Delete, ArrowUp, ArrowDown } from '@element-plus/icons-vue'
 const { proxy } = getCurrentInstance()
 
 const changeVarietyList = ref([])
@@ -152,6 +207,19 @@ const isAdd = ref(false);
 
 const varietyOptions = ref([])
 const daterangeEventDate = 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: {
     manageTags: null,
@@ -166,6 +234,7 @@ const data = reactive({
     varietyOld: null,
     varietyNew: null,
     createTime: null,
+    isDelete: null,
   },
   rules: {
     manageTags: [
@@ -211,28 +280,6 @@ function getList() {
   })
 }
 
-function onManageTagsBlur() {
-  const tag = form.value.manageTags?.trim();
-  if (!tag) return;
-
-  getSheepByManageTags(tag).then(res => {
-    const sheep = res.data;
-    if (sheep) {
-      form.value.varietyOld = sheep.varietyName || "";
-      form.value.sheepId = sheep.id;
-      form.value.comment = sheep.comment || "";
-    } else {
-      proxy.$modal.msgWarning("未找到该管理耳号对应的羊只");
-      form.value.varietyOld = "";
-      form.value.sheepId = null;
-      form.value.comment = "";
-    }
-  }).catch(err => {
-    console.error("查询羊只失败:", err);
-    proxy.$modal.msgError("查询失败，请重试");
-  });
-}
-
 function loadVarietyOptions() {
   listVariety().then(res => {
     varietyOptions.value = res.rows.map(item => ({
@@ -257,8 +304,11 @@ function reset() {
     varietyNew: null,
     comment: null,
     createBy: null,
-    createTime: null
+    createTime: null,
+    manageTags: ''
   }
+  batchTags.value = []      // 清空
+  batchSheep.value = []     // 清空
   proxy.resetForm("changeVarietyRef")
 }
 
@@ -281,6 +331,7 @@ function resetQuery() {
   daterangeCreateTime.value = []
   queryParams.value.sheepfoldId = null
   daterangeEventDate.value = []
+  queryParams.value.isDelete = null
   queryParams.value.manageTagsList = []
   proxy.resetForm("queryRef")
   handleQuery()
@@ -300,6 +351,7 @@ function handleAdd() {
   loadVarietyOptions()
   open.value = true
   title.value = "添加改品种记录"
+  form.value.eventDate = dayjs().format('YYYY-MM-DD')
 }
 
 /** 修改按钮操作 */
@@ -317,30 +369,35 @@ function handleUpdate(row) {
 
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["changeVarietyRef"].validate(valid => {
-    if (valid) {
-      if (!form.value.id) {
-        if (!form.value.sheepId) {
-          proxy.$modal.msgError('未找到对应的羊只，请检查耳号');
-          return;
-        }
-      }
+  if (batchTags.value.length === 0) {
+    proxy.$modal.msgError('请输入至少一个有效耳号')
+    return
+  }
 
-      if (form.value.id != null) {
-        updateChangeVariety(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addChangeVariety(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
-      }
+  // 批量构建提交数据
+  const requests = batchTags.value.map((tag, idx) => {
+    const sheep = batchSheep.value[idx]
+    const submitData = {
+      sheepId: sheep.id,
+      manageTags: tag,
+      varietyOld: sheep.varietyName || "",
+      varietyNew: form.value.varietyNew,
+      eventDate: form.value.eventDate,
+      technician: form.value.technician,
+      comment: sheep.comment || ""
     }
+    return addChangeVariety(submitData)
   })
+
+  Promise.all(requests)
+    .then(() => {
+      proxy.$modal.msgSuccess(`成功新增 ${batchTags.value.length} 条改品种记录`)
+      open.value = false
+      getList()
+    })
+    .catch(() => {
+      proxy.$modal.msgError('新增失败')
+    })
 }
 
 /** 删除按钮操作 */
@@ -376,13 +433,121 @@ function searchEarNumber(query) {
     earOptions.value = res.data || []
   }).finally(() => earLoading.value = false)
 }
+/* 粘贴事件 */
+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. 批量校验（包括单条的情况）
+  batchTags.value = []
+  batchSheep.value = []
+
+  for (const tag of tags) {
+    try {
+      const { data: sheep } = await getSheepByManageTags(tag.trim())
+      if (sheep) {
+        batchTags.value.push(tag)
+        batchSheep.value.push(sheep)
+      } else {
+        proxy.$modal.msgWarning(`耳号 ${tag} 未找到对应羊只，已跳过`)
+      }
+    } catch (err) {
+      proxy.$modal.msgWarning(`耳号 ${tag} 查询失败`)
+    }
+  }
+
+  if (!batchTags.value.length) {   // 全部无效
+    form.value.varietyOld = ""
+    form.value.sheepId = null
+    form.value.comment = ""
+    return
+  }
+
+  // 把合法耳号重新拼回输入框，用半角空格分隔
+  form.value.manageTags = batchTags.value.join(' ')
+
+  // 原品种、sheepId、comment 取第一条的
+  const firstSheep = batchSheep.value[0]
+  form.value.varietyOld = firstSheep.varietyName || ""
+  form.value.sheepId = firstSheep.id
+  form.value.comment = firstSheep.comment || ""
+}
+
+// 删除单个批量耳号
+function removeBatchTag(idx) {
+  batchTags.value.splice(idx, 1)
+  batchSheep.value.splice(idx, 1)
+  // 实时回写输入框
+  form.value.manageTags = batchTags.value.join(' ')
+  // 更新原品种显示
+  if (batchSheep.value.length > 0) {
+    form.value.varietyOld = batchSheep.value[0].varietyName || ""
+  } else {
+    form.value.varietyOld = ""
+  }
+}
+
+// 一键清空批量耳号
+function clearBatchTags() {
+  batchTags.value = []
+  batchSheep.value = []
+  form.value.manageTags = ''
+  form.value.varietyOld = ''
+}
 onMounted(() => {
   loadVarietyOptions();
   getSheepfoldOptions();
@@ -391,9 +556,14 @@ onMounted(() => {
 </script>
 <style scoped>
 .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;
 }
 </style>