Merge branch 'main' of http://118.182.97.76:3000/admin/zhyc-sheep-ui

src/api/Pregnancy_Test/Pregnancy_Test.js

@@ -63,4 +63,13 @@ export function getBreedInfoByManageTags(manageTags) {
       manageTags: manageTags
     }
   })
+}
+
+// 模糊查询母羊耳号列表
+export function searchEarNumbers(query) {
+  return request({
+    url: '/Pregnancy_Test/Pregnancy_Test/search_ear_numbers', // 根据实际路径修改
+    method: 'get',
+    params: { query }
+  })
 }

src/api/Weaning/weaning_record.js

@@ -51,10 +51,17 @@ export function getSheepIdByEarNumber(earNumber) {
   })
 }
 
+<<<<<<< HEAD
 // 新增：模糊查询耳号列表 (用于远程搜索)
 export function searchEarNumbers(query) {
   return request({
     url: '/Weaning/weaning_record/search_ear_numbers',
+=======
+// 模糊查询母羊耳号列表
+export function searchEarNumbers(query) {
+  return request({
+    url: '/Weaning/weaning_record/search_ear_numbers', // 根据实际路径修改
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
     method: 'get',
     params: { query }
   })

src/api/breed/lambing_records.js

@@ -8,6 +8,16 @@ export function listLambing_records(query) {
     params: query
   })
 }
+// lambing_records.js 添加方法
+
+// 模糊查询母羊耳号列表
+export function searchEarNumbers(query) {
+  return request({
+    url: '/breed/lambing_records/search_ear_numbers',
+    method: 'get',
+    params: { query }
+  })
+}
 
 // 查询产羔记录详细
 export function getLambing_records(id) {

src/api/common/sheep.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 模糊查询母羊耳号列表
+export function searchEarNumbers(query) {
+    return request({
+        url: '/sheep/sheep/earNumbers',
+        method: 'get',
+        params: { query }
+    })
+}

src/api/common/user.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 根据岗位查询用户信息
+export function getUserByPost(query) {
+    return request({
+        url: '/userPost/getUser',
+        method: 'get',
+        params: query 
+    })
+}

src/api/drymilk/drymilk.js

@@ -51,6 +51,7 @@ export function delDrymilk(id) {
   })
 }
 
+<<<<<<< HEAD
 // 查询羊舍列表下拉框
 export function listSheepfoldOptions() {
   return request({
@@ -65,4 +66,31 @@ export function listTechnicianOptions() {
     url: '/drymilk/drymilk/technicianList',
     method: 'get'
   })
-}
+}
+=======
+export function searchEarNumbers(query) {
+  return request({
+    url: '/drymilk/drymilk/search_ear_numbers',
+    method: 'get',
+    params: { query }
+  })
+}
+// 搜索耳号（新增）
+export function searchEarTags(manageTags) {
+  return request({
+    url: '/drymilk/drymilk/searchEarTags',
+    method: 'get',
+    params: { manageTags }
+  })
+}
+
+// 验证耳号（新增）
+export function validateEarTag(manageTags) {
+  return request({
+    url: '/drymilk/drymilk/validateEarTag',
+    method: 'get',
+    params: { manageTags }
+  })
+}
+
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4

src/api/mating_plan/generate.js

@@ -109,4 +109,14 @@ export function delBreedPlanGenerate(id) {
         url: '/mating_plan/generate/' + id,
         method: 'delete'
     })
-}
+}
+
+// 模糊查询母羊耳号列表
+export function searchEarNumbers(query) {
+    return request({
+        url: '/mating_plan/generate/search_ear_numbers', // 根据实际路径修改
+        method: 'get',
+        params: { query }
+    })
+}
+

src/api/miscarriage/miscarriage.js

@@ -57,4 +57,13 @@ export function delMiscarriage(id) {
     url: '/miscarriage/miscarriage/' + id,
     method: 'delete'
   })
+}
+
+// 模糊查询母羊耳号列表
+export function searchEarNumbers(query) {
+  return request({
+    url: '/breed/lambing_records/search_ear_numbers', // 根据实际路径修改
+    method: 'get',
+    params: { query }
+  })
 }

src/api/sheep_death/death.js

@@ -59,6 +59,7 @@ export function getDiseaseTree() {
   })
 }
 
+<<<<<<< HEAD
 // --- 远程搜索 API ---
 
 // 搜索耳号
@@ -83,6 +84,12 @@ export function searchTechnician(query) {
 export function searchHandler(query) {
   return request({
     url: '/sheep_death/death/search/handler',
+=======
+// 模糊查询母羊耳号列表
+export function searchEarNumbers(query) {
+  return request({
+    url: '/sheep_death/death/search_ear_numbers', // 根据实际路径修改
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
     method: 'get',
     params: { query }
   })

src/views/Breeding_records/Breeding_records/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="母羊耳号" prop="eweManageTags">
+      <el-form-item label="供体母羊耳号" prop="eweManageTags">
         <el-input
             v-model="queryParams.eweManageTags"
-            placeholder="请输入母羊耳号"
+            placeholder="请输入供体母羊耳号"
             clearable
             @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="公羊耳号" prop="ramManageTags">
+      <el-form-item label="供体公羊耳号" prop="ramManageTags">
         <el-input
             v-model="queryParams.ramManageTags"
             placeholder="请输入公羊耳号"
@@ -17,7 +17,7 @@
             @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="母羊品种" prop="eweVariety">
+      <el-form-item label="供体母羊品种" prop="eweVariety">
         <el-input
             v-model="queryParams.eweVariety"
             placeholder="请输入母羊品种"
@@ -25,7 +25,7 @@
             @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="公羊品种" prop="ramVariety">
+      <el-form-item label="供体公羊品种" prop="ramVariety">
         <el-input
             v-model="queryParams.ramVariety"
             placeholder="请输入公羊品种"
@@ -35,11 +35,12 @@
       </el-form-item>
       <el-form-item label="配种方式" prop="breedType">
         <el-select v-model="queryParams.breedType" placeholder="请选择配种方式" clearable>
-          <el-option label="同期发情" value="1"></el-option>
+          <el-option label="供体母羊配种" value="1"></el-option>
-          <el-option label="本交" value="2"></el-option>
+          <el-option label="同期发情人工授精" value="2"></el-option>
-          <el-option label="冲胚" value="3"></el-option>
+          <el-option label="本交" value="3"></el-option>
-          <el-option label="自然发情人工授精" value="4"></el-option>
+          <el-option label="胚胎移植" value="4"></el-option>
-        </el-select>
+          <el-option label="自然法请人工授精" value="5"></el-option>
+                                               </el-select>
       </el-form-item>
       <el-form-item label="技术员" prop="technician">
         <el-input
@@ -237,6 +238,7 @@
         :total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
+        :page-sizes="[20,50,100,200, 500, 1000, 2000]"
         @pagination="getList"
     />
 
@@ -259,10 +261,11 @@
           <el-col :span="12">
             <el-form-item label="配种方式" prop="breedType">
               <el-select v-model="form.breedType" placeholder="请选择配种方式">
-                <el-option label="同期发情" :value="1"></el-option>
+                <el-option label="供体母羊配种" value="1"></el-option>
-                <el-option label="本交" :value="2"></el-option>
+                <el-option label="同期发情人工授精" value="2"></el-option>
-                <el-option label="冲胚" :value="3"></el-option>
+                <el-option label="本交" value="3"></el-option>
-                <el-option label="自然发情人工授精" :value="4"></el-option>
+                <el-option label="胚胎移植" value="4"></el-option>
+                <el-option label="自然法请人工授精" value="5"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -406,6 +409,29 @@ import {
   getLatestBreedPlanByEweTags
 } from "@/api/Breeding_records/Breeding_records"
 
+import { ref, computed, nextTick } from 'vue'
+import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
+
+// 响应式数据
+const pasteInput = ref('')           // 批量粘贴输入框
+const earNumberOptions = ref([])     // 耳号下拉选项
+const earNumberLoading = ref(false)  // 耳号加载状态
+const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+const defaultShowCount = 2           // 默认显示的耳号数量
+
+// 计算属性：控制显示的耳号列表
+const displayedEarNumbers = computed(() => {
+  if (!queryParams.value.allEarNumbers || queryParams.value.allEarNumbers.length === 0) {
+    return []
+  }
+
+  // 如果展开或总数<=2，显示全部；否则只显示前2个
+  if (isExpanded.value || queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    return queryParams.value.allEarNumbers
+  } else {
+    return queryParams.value.allEarNumbers.slice(0, defaultShowCount)
+  }
+})
 const {proxy} = getCurrentInstance()
 
 const Breeding_recordsList = ref([])
@@ -465,10 +491,11 @@ const {queryParams, form, rules} = toRefs(data)
 
 /** 获取配种方式文字显示 */
 function getBreedTypeText(breedType) {
-  if (breedType === 1) return '同期发情'
+  if (breedType === 1) return '供体母羊配种'
-  if (breedType === 2) return '本交'
+  if (breedType === 2) return '同期发情人工授精'
-  if (breedType === 3) return '冲胚'
+  if (breedType === 3) return '本交'
-  if (breedType === 4) return '自然发情人工授精'
+  if (breedType === 4) return '胚胎移植'
+  if (breedType === 5) return '自然发情人工授精'
   return '-'
 }
 

src/views/Pregnancy_Test/Pregnancy_Test/index.vue

@@ -1,14 +1,101 @@
 <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-form-item label=" 耳号" prop="allEarNumbers">
-        <el-input
+        <div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
-            v-model="queryParams.manageTags"
+          <!-- 主选择器：不显示已选标签 -->
-            placeholder="请输入耳号，多个耳号用逗号分隔"
+          <el-select
-            clearable
+              v-model="queryParams.allEarNumbers"
-            @keyup.enter="handleQuery"
+              multiple
-            @clear="handleQuery"
+              filterable
-        />
+              remote
+              reserve-keyword
+              placeholder="输入耳号搜索"
+              :remote-method="searchEarNumber"
+              :loading="earNumberLoading"
+              allow-create
+              default-first-option
+              collapse-tags
+              :max-collapse-tags="0"
+              style="width: 300px"
+              @change="handleEarNumberChange"
+          >
+            <el-option
+                v-for="item in earNumberOptions"
+                :key="item"
+                :label="item"
+                :value="item"
+            />
+          </el-select>
+
+          <!-- 辅助粘贴输入框 -->
+          <el-input
+              v-model="pasteInput"
+              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.allEarNumbers && queryParams.allEarNumbers.length > 0"
+              type="info"
+              effect="plain"
+              size="large"
+          >
+            已选: {{ queryParams.allEarNumbers.length }} 个
+          </el-tag>
+
+          <!-- 清空按钮 -->
+          <el-button
+              type="danger"
+              plain
+              @click="clearAllEarNumbers"
+              v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+              :icon="Delete"
+          >
+            清空全部
+          </el-button>
+        </div>
+
+        <!-- 已选耳号展示区域（默认显示2个，可展开） -->
+        <div
+            v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+            class="selected-ear-numbers-display"
+            style="margin-top: 10px;"
+        >
+          <!-- 显示前2个或全部耳号 -->
+          <el-tag
+              v-for="(tag, index) in displayedEarNumbers"
+              :key="tag"
+              closable
+              @close="handleRemoveEarNumber(tag)"
+              style="margin: 4px;"
+              type="success"
+          >
+            {{ tag }}
+          </el-tag>
+
+          <!-- 展开/收起按钮 -->
+          <el-button
+              v-if="queryParams.allEarNumbers.length > defaultShowCount"
+              type="primary"
+              link
+              @click="toggleExpand"
+              style="margin-left: 8px;"
+          >
+            {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.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="datetime">
         <el-date-picker clearable
@@ -173,6 +260,7 @@
         :total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
+        :page-sizes="[20,50,100,200, 500, 1000, 2000]"
         @pagination="getList"
     />
 
@@ -288,8 +376,39 @@
 </template>
 
 <script setup name="Pregnancy_Test">
-import { listPregnancy_Test, getPregnancy_Test, delPregnancy_Test, addPregnancy_Test, updatePregnancy_Test, getSheepByManageTags, getBreedInfoByManageTags } from "@/api/Pregnancy_Test/Pregnancy_Test"
+import {
+  listPregnancy_Test,
+  getPregnancy_Test,
+  delPregnancy_Test,
+  addPregnancy_Test,
+  updatePregnancy_Test,
+  getSheepByManageTags,
+  getBreedInfoByManageTags,
+  searchEarNumbers
+} from "@/api/Pregnancy_Test/Pregnancy_Test"
+import { ref, computed, nextTick } from 'vue'
+import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
 
+// 响应式数据
+const pasteInput = ref('')           // 批量粘贴输入框
+const earNumberOptions = ref([])     // 耳号下拉选项
+const earNumberLoading = ref(false)  // 耳号加载状态
+const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+const defaultShowCount = 2           // 默认显示的耳号数量
+
+// 计算属性：控制显示的耳号列表
+const displayedEarNumbers = computed(() => {
+  if (!queryParams.value.allEarNumbers || queryParams.value.allEarNumbers.length === 0) {
+    return []
+  }
+
+  // 如果展开或总数<=2，显示全部；否则只显示前2个
+  if (isExpanded.value || queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    return queryParams.value.allEarNumbers
+  } else {
+    return queryParams.value.allEarNumbers.slice(0, defaultShowCount)
+  }
+})
 const { proxy } = getCurrentInstance()
 
 const Pregnancy_TestList = ref([])
@@ -310,6 +429,7 @@ const data = reactive({
     pageSize: 10,
     manageTags: null,
     datetime: null,
+    allEarNumbers: [],  // ✅ 添加这一行！
     result: null,
     technician: null,
     way: null,
@@ -353,6 +473,125 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data)
 
+/** 处理粘贴事件 */
+function handlePaste(event) {
+  nextTick(() => {
+    handlePasteSubmit()
+  })
+}
+
+/** 处理粘贴内容提交 */
+function handlePasteSubmit() {
+  if (!pasteInput.value || pasteInput.value.trim() === '') {
+    return
+  }
+
+  // 支持多种分隔符: 空格、换行、逗号、制表符
+  const separators = /[\s,，\n\r\t]+/
+  const earNumbers = pasteInput.value
+      .trim()
+      .split(separators)
+      .filter(item => item.trim() !== '')
+      .map(item => item.trim())
+
+  if (earNumbers.length === 0) {
+    return
+  }
+
+  // 去重并添加到已选列表
+  const existingSet = new Set(queryParams.value.allEarNumbers || [])
+  const newEarNumbers = []
+  const duplicates = []
+
+  earNumbers.forEach(earNumber => {
+    if (!existingSet.has(earNumber)) {
+      newEarNumbers.push(earNumber)
+      existingSet.add(earNumber)
+    } else {
+      duplicates.push(earNumber)
+    }
+  })
+
+  // 添加新耳号
+  if (newEarNumbers.length > 0) {
+    queryParams.value.allEarNumbers = [
+      ...(queryParams.value.allEarNumbers || []),
+      ...newEarNumbers
+    ]
+
+    const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
+        (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
+
+    proxy.$modal.msgSuccess(message)
+  } else if (duplicates.length > 0) {
+    proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
+  }
+
+  // 清空输入框
+  pasteInput.value = ''
+}
+
+/** 远程搜索耳号 */
+function searchEarNumber(query) {
+  if (query !== '') {
+    earNumberLoading.value = true
+
+    const queries = query.trim().split(/[\s,，]+/).filter(q => q)
+
+    if (queries.length === 1) {
+      // 单个耳号模糊搜索
+      searchEarNumbers(query).then(response => {
+        earNumberOptions.value = response.data || []
+        earNumberLoading.value = false
+      }).catch(() => {
+        earNumberOptions.value = []
+        earNumberLoading.value = false
+      })
+    } else {
+      // 多个耳号直接作为选项
+      earNumberOptions.value = queries
+      earNumberLoading.value = false
+    }
+  } else {
+    earNumberOptions.value = []
+  }
+}
+
+/** 耳号选择变化处理 */
+function handleEarNumberChange(value) {
+  queryParams.value.allEarNumbers = [...new Set(value)]
+  console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
+}
+
+/** 切换展开/收起状态 */
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+/** 移除单个耳号 */
+function handleRemoveEarNumber(tag) {
+  const index = queryParams.value.allEarNumbers.indexOf(tag)
+  if (index > -1) {
+    queryParams.value.allEarNumbers.splice(index, 1)
+    proxy.$modal.msgSuccess('已移除该耳号')
+  }
+
+  // 如果删除后剩余<=2个，自动收起
+  if (queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    isExpanded.value = false
+  }
+}
+
+/** 清空所有耳号 */
+function clearAllEarNumbers() {
+  proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
+    queryParams.value.allEarNumbers = []
+    pasteInput.value = ''
+    earNumberOptions.value = []
+    isExpanded.value = false  // 重置展开状态
+    proxy.$modal.msgSuccess('已清空所有耳号')
+  }).catch(() => {})
+}
 /** 孕检结果标签类型 */
 function getResultTagType(result) {
   switch (result) {
@@ -487,6 +726,9 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   console.log("重置搜索条件")
+  queryParams.value.allEarNumbers = []  // ✅ 添加这一行
+  earNumberOptions.value = []            // ✅ 添加这一行
+  isExpanded.value = false
   proxy.resetForm("queryRef")
   queryParams.value.manageTags = null
   queryParams.value.datetime = null
@@ -620,22 +862,44 @@ onMounted(() => {
 </script>
 
 <style scoped>
-.el-table {
+/* 已选耳号展示区样式 */
-  font-size: 12px;
+.selected-ear-numbers-display {
-}
+  max-height: 150px;
-
+  overflow-y: auto;
-.el-table .cell {
-  padding: 0 5px;
-}
-
-/* 调试样式 */
-.debug-info {
-  background-color: #f0f9ff;
-  border: 1px solid #0ea5e9;
-  border-radius: 4px;
   padding: 8px;
-  margin: 8px 0;
+  background-color: #f5f7fa;
-  font-size: 12px;
+  border-radius: 4px;
-  color: #0369a1;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6;
+  border-radius: 3px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-track {
+  background-color: #f5f7fa;
+}
+
+.selected-ear-numbers-display .el-tag {
+  margin: 4px;
+  cursor: pointer;
+}
+
+.selected-ear-numbers-display .el-tag:hover {
+  opacity: 0.8;
+}
+
+/* 隐藏 el-select 的下拉箭头（可选） */
+:deep(.el-select__caret) {
+  display: none;
 }
 </style>

src/views/Sperm/Sperm/index.vue

@@ -157,6 +157,7 @@
         :total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
+        :page-sizes="[20,50,100,200, 500, 1000, 2000]"
         @pagination="getList"
     />
 

src/views/Weaning/weaning_record/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
+<<<<<<< HEAD
       
       <el-form-item label="耳号" prop="allEarNumbers">
         <el-select
@@ -22,6 +23,103 @@
             :value="item"
           />
         </el-select>
+=======
+      <el-form-item label="耳号" prop="allEarNumbers">
+        <div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
+          <!-- 主选择器：不显示已选标签 -->
+          <el-select
+              v-model="queryParams.allEarNumbers"
+              multiple
+              filterable
+              remote
+              reserve-keyword
+              placeholder="输入耳号搜索"
+              :remote-method="searchEarNumber"
+              :loading="earNumberLoading"
+              allow-create
+              default-first-option
+              collapse-tags
+              :max-collapse-tags="0"
+              style="width: 300px"
+              @change="handleEarNumberChange"
+          >
+            <el-option
+                v-for="item in earNumberOptions"
+                :key="item"
+                :label="item"
+                :value="item"
+            />
+          </el-select>
+
+          <!-- 辅助粘贴输入框 -->
+          <el-input
+              v-model="pasteInput"
+              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.allEarNumbers && queryParams.allEarNumbers.length > 0"
+              type="info"
+              effect="plain"
+              size="large"
+          >
+            已选: {{ queryParams.allEarNumbers.length }} 个
+          </el-tag>
+
+          <!-- 清空按钮 -->
+          <el-button
+              type="danger"
+              plain
+              @click="clearAllEarNumbers"
+              v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+              :icon="Delete"
+          >
+            清空全部
+          </el-button>
+        </div>
+
+        <!-- 已选耳号展示区域（默认显示2个，可展开） -->
+        <div
+            v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+            class="selected-ear-numbers-display"
+            style="margin-top: 10px;"
+        >
+          <!-- 显示前2个或全部耳号 -->
+          <el-tag
+              v-for="(tag, index) in displayedEarNumbers"
+              :key="tag"
+              closable
+              @close="handleRemoveEarNumber(tag)"
+              style="margin: 4px;"
+              type="success"
+          >
+            {{ tag }}
+          </el-tag>
+
+          <!-- 展开/收起按钮 -->
+          <el-button
+              v-if="queryParams.allEarNumbers.length > defaultShowCount"
+              type="primary"
+              link
+              @click="toggleExpand"
+              style="margin-left: 8px;"
+          >
+            {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.length - defaultShowCount} 个` }}
+            <el-icon class="el-icon--right">
+              <component :is="isExpanded ? ArrowUp : ArrowDown" />
+            </el-icon>
+          </el-button>
+        </div>
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
       </el-form-item>
 
       <el-form-item label="是否在群" prop="isInHerd">
@@ -161,6 +259,7 @@
         :total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
+        :page-sizes="[20,50,100,200, 500, 1000, 2000]"
         @pagination="getList"
     />
 
@@ -230,8 +329,42 @@
 </template>
 
 <script setup name="Weaning_record">
+<<<<<<< HEAD
 import { listWeaning_record, getWeaning_record, delWeaning_record, addWeaning_record, updateWeaning_record, getSheepIdByEarNumber, searchEarNumbers } from "@/api/Weaning/weaning_record"
+=======
+import {
+  listWeaning_record,
+  getWeaning_record,
+  delWeaning_record,
+  addWeaning_record,
+  updateWeaning_record,
+  getSheepIdByEarNumber,
+  searchEarNumbers
+} from "@/api/Weaning/weaning_record"
+import { ref, computed, nextTick } from 'vue'
+import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
 
+// 响应式数据
+const pasteInput = ref('')           // 批量粘贴输入框
+const earNumberOptions = ref([])     // 耳号下拉选项
+const earNumberLoading = ref(false)  // 耳号加载状态
+const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+const defaultShowCount = 2           // 默认显示的耳号数量
+
+// 计算属性：控制显示的耳号列表
+const displayedEarNumbers = computed(() => {
+  if (!queryParams.value.allEarNumbers || queryParams.value.allEarNumbers.length === 0) {
+    return []
+  }
+
+  // 如果展开或总数<=2，显示全部；否则只显示前2个
+  if (isExpanded.value || queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    return queryParams.value.allEarNumbers
+  } else {
+    return queryParams.value.allEarNumbers.slice(0, defaultShowCount)
+  }
+})
 const { proxy } = getCurrentInstance()
 
 const weaning_recordList = ref([])
@@ -254,9 +387,17 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
+<<<<<<< HEAD
     allEarNumbers: [],   // 核心：多选数组
     isInHerd: null,      // 新增：是否在群
     sheepCategory: null, // 新增：羊只类别
+=======
+    earNumber: null,
+    breed: null,
+    datetime: null,
+    allEarNumbers: [],  // 🔥 必须添加
+    weight: null,
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
     status: null,
     gender: null,
     breed: null,
@@ -283,6 +424,125 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data)
 
+/** 处理粘贴事件 */
+function handlePaste(event) {
+  nextTick(() => {
+    handlePasteSubmit()
+  })
+}
+
+/** 处理粘贴内容提交 */
+function handlePasteSubmit() {
+  if (!pasteInput.value || pasteInput.value.trim() === '') {
+    return
+  }
+
+  // 支持多种分隔符: 空格、换行、逗号、制表符
+  const separators = /[\s,，\n\r\t]+/
+  const earNumbers = pasteInput.value
+      .trim()
+      .split(separators)
+      .filter(item => item.trim() !== '')
+      .map(item => item.trim())
+
+  if (earNumbers.length === 0) {
+    return
+  }
+
+  // 去重并添加到已选列表
+  const existingSet = new Set(queryParams.value.allEarNumbers || [])
+  const newEarNumbers = []
+  const duplicates = []
+
+  earNumbers.forEach(earNumber => {
+    if (!existingSet.has(earNumber)) {
+      newEarNumbers.push(earNumber)
+      existingSet.add(earNumber)
+    } else {
+      duplicates.push(earNumber)
+    }
+  })
+
+  // 添加新耳号
+  if (newEarNumbers.length > 0) {
+    queryParams.value.allEarNumbers = [
+      ...(queryParams.value.allEarNumbers || []),
+      ...newEarNumbers
+    ]
+
+    const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
+        (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
+
+    proxy.$modal.msgSuccess(message)
+  } else if (duplicates.length > 0) {
+    proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
+  }
+
+  // 清空输入框
+  pasteInput.value = ''
+}
+
+/** 远程搜索耳号 */
+function searchEarNumber(query) {
+  if (query !== '') {
+    earNumberLoading.value = true
+
+    const queries = query.trim().split(/[\s,，]+/).filter(q => q)
+
+    if (queries.length === 1) {
+      // 单个耳号模糊搜索
+      searchEarNumbers(query).then(response => {
+        earNumberOptions.value = response.data || []
+        earNumberLoading.value = false
+      }).catch(() => {
+        earNumberOptions.value = []
+        earNumberLoading.value = false
+      })
+    } else {
+      // 多个耳号直接作为选项
+      earNumberOptions.value = queries
+      earNumberLoading.value = false
+    }
+  } else {
+    earNumberOptions.value = []
+  }
+}
+
+/** 耳号选择变化处理 */
+function handleEarNumberChange(value) {
+  queryParams.value.allEarNumbers = [...new Set(value)]
+  console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
+}
+
+/** 切换展开/收起状态 */
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+/** 移除单个耳号 */
+function handleRemoveEarNumber(tag) {
+  const index = queryParams.value.allEarNumbers.indexOf(tag)
+  if (index > -1) {
+    queryParams.value.allEarNumbers.splice(index, 1)
+    proxy.$modal.msgSuccess('已移除该耳号')
+  }
+
+  // 如果删除后剩余<=2个，自动收起
+  if (queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    isExpanded.value = false
+  }
+}
+
+/** 清空所有耳号 */
+function clearAllEarNumbers() {
+  proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
+    queryParams.value.allEarNumbers = []
+    pasteInput.value = ''
+    earNumberOptions.value = []
+    isExpanded.value = false  // 重置展开状态
+    proxy.$modal.msgSuccess('已清空所有耳号')
+  }).catch(() => {})
+}
 /** 查询断奶记录列表 */
 function getList() {
   loading.value = true
@@ -347,8 +607,14 @@ function handleQuery() {
 
 /** 重置按钮操作 */
 function resetQuery() {
+<<<<<<< HEAD
   daterangeTime.value = []
   earNumberOptions.value = []
+=======
+  queryParams.value.allEarNumbers = []
+  earNumberOptions.value = []            // ✅ 添加这一行
+  isExpanded.value = false
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
   proxy.resetForm("queryRef")
   // 必须手动清空多选数组
   queryParams.value.allEarNumbers = []
@@ -438,8 +704,45 @@ getList()
 </script>
 
 <style scoped>
-.app-container {
+/* 已选耳号展示区样式 */
-  padding: 20px;
+.selected-ear-numbers-display {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 8px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6;
+  border-radius: 3px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-track {
+  background-color: #f5f7fa;
+}
+
+.selected-ear-numbers-display .el-tag {
+  margin: 4px;
+  cursor: pointer;
+}
+
+.selected-ear-numbers-display .el-tag:hover {
+  opacity: 0.8;
+}
+
+/* 隐藏 el-select 的下拉箭头（可选） */
+:deep(.el-select__caret) {
+  display: none;
 }
 .mb8 {
   margin-bottom: 8px;

src/views/bas_ram_file/bas_ram_file/index.vue

@@ -675,6 +675,7 @@
         :total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
+        :page-sizes="[20,50,100,200, 500, 1000, 2000]"
         @pagination="getList"
     />
 

src/views/biosafety/deworm/index.vue

@@ -2,16 +2,82 @@
   <div class="app-container">
     <!-- 1. 搜索 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
+     <el-form-item label="羊只耳号" prop="allEarNumbers">
+        <div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
+          <!-- 主选择器：不显示已选标签 -->
+          <el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword placeholder="输入耳号搜索"
+            :remote-method="searchEarNumber" :loading="earNumberLoading" allow-create default-first-option collapse-tags
+            :max-collapse-tags="0" style="width: 300px" @change="handleEarNumberChange">
+            <el-option v-for="item in earNumberOptions" :key="item" :label="item" :value="item" />
+          </el-select>
+
+
+          <!-- 辅助粘贴输入框 -->
+          <el-input v-model="pasteInput" 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.allEarNumbers && queryParams.allEarNumbers.length > 0" type="info" effect="plain"
+            size="large">
+            已选: {{ queryParams.allEarNumbers.length }} 个
+          </el-tag>
+
+
+          <!-- 清空按钮 -->
+          <el-button type="danger" plain @click="clearAllEarNumbers"
+            v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0" :icon="Delete">
+            清空全部
+          </el-button>
+
+        </div>
+
+
+        <!-- 已选耳号展示区域（默认显示2个，可展开） -->
+        <div v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+          class="selected-ear-numbers-display" style="margin-top: 10px;">
+          <!-- 显示前2个或全部耳号 -->
+          <el-tag v-for="(tag, index) in displayedEarNumbers" :key="tag" closable @close="handleRemoveEarNumber(tag)"
+            style="margin: 4px;" type="success">
+            {{ tag }}
+          </el-tag>
+
+
+          <!-- 展开/收起按钮 -->
+          <el-button v-if="queryParams.allEarNumbers.length > defaultShowCount" type="primary" link
+            @click="toggleExpand" style="margin-left: 8px;">
+            {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.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="sheepNo">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
+      </el-form-item> -->
       <el-form-item label="驱虫日期">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
-      <el-form-item label="羊只耳号" prop="sheepNo">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用逗号分隔" clearable @keyup.enter="getList" />
-      </el-form-item>
       <el-form-item label="技术员" prop="technical">
-        <el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
+          <el-select v-model="queryParams.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
-      </el-form-item>
+            @change="handleTechnicalChange">
+            <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+              <span style="float: left">{{ item.label }}</span>
+            </el-option>
+          </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>
@@ -104,10 +170,15 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+         <el-col :span="12">
-            <el-form-item label="技术员">
+              <el-form-item label="技术员">
-              <el-input v-model="addForm.technical" placeholder="请输入技术员姓名" />
+                <el-select v-model="addForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%" 
-            </el-form-item>
+                  @change="handleTechnicalChange">
+                  <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                    <span style="float: left">{{ item.label }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
           </el-col>
         </el-row>
         <div style="margin: 8px 5px;">
@@ -208,10 +279,15 @@
               <el-date-picker v-model="editForm.datetime" type="date" style="width: 100%" readonly />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+         <el-col :span="12">
-            <el-form-item label="技术员">
+              <el-form-item label="技术员">
-              <el-input v-model="editForm.technical" placeholder="请输入技术员姓名" />
+                <el-select v-model="editForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
-            </el-form-item>
+                  @change="handleTechnicalChange">
+                  <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                    <span style="float: left">{{ item.label }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
           </el-col>
         </el-row>
         <div style="margin: 10px 10px;">
@@ -261,8 +337,6 @@
           </el-table>
         </div>
 
-
-
         <el-form-item label="备注">
           <el-input type="textarea" :rows="3" v-model="editForm.comment" placeholder="请输入备注" />
         </el-form-item>
@@ -283,8 +357,10 @@
   import { listUnit } from '@/api/biosafety/unit'
   import { listUsage } from '@/api/biosafety/usage'
   import { listMedicine } from '@/api/biosafety/medicine'
+  import { searchEarNumbers } from '@/api/common/sheep'
   import request from '@/utils/request'
   import { parseTime } from '@/utils/ruoyi'
+  import { getUserByPost } from '@/api/common/user'
 
   const { proxy } = getCurrentInstance()
   const { sheep_gender } = proxy.useDict('sheep_gender')
@@ -295,16 +371,159 @@
   const total = ref(0)
   const dewormList = ref([])
   const daterangeDatetime = ref([])
+  const technicalOptions = ref([])
+
 
   const queryParams = reactive({
     pageNum: 1,
     pageSize: 20,
     sheepNo: null,
     technical: null,
+ 
     orderByColumn: null,   // 新增
     isAsc: null            // 新增
   })
 
+  // 响应式数据
+  const pasteInput = ref('')           // 批量粘贴输入框
+  const earNumberOptions = ref([])     // 耳号下拉选项
+  const earNumberLoading = ref(false)  // 耳号加载状态
+  const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+  const defaultShowCount = 2           // 默认显示的耳号数量
+
+  // 计算属性：控制显示的耳号列表
+  const displayedEarNumbers = computed(() => {
+    if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
+      return []
+    }
+
+    // 如果展开或总数<=2，显示全部；否则只显示前2个
+    if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
+      return queryParams.allEarNumbers
+    } else {
+      return queryParams.allEarNumbers.slice(0, defaultShowCount)
+    }
+  })
+  /** 处理粘贴事件 */
+  function handlePaste(event) {
+    nextTick(() => {
+      handlePasteSubmit()
+    })
+  }
+
+  /** 处理粘贴内容提交 */
+  function handlePasteSubmit() {
+    if (!pasteInput.value || pasteInput.value.trim() === '') {
+      return
+    }
+
+    // 支持多种分隔符: 空格、换行、逗号、制表符
+    const separators = /[\s,，\n\r\t]+/
+    const earNumbers = pasteInput.value
+      .trim()
+      .split(separators)
+      .filter(item => item.trim() !== '')
+      .map(item => item.trim())
+
+    if (earNumbers.length === 0) {
+      return
+    }
+
+    // 去重并添加到已选列表
+    const existingSet = new Set(queryParams.value.allEarNumbers || [])
+    const newEarNumbers = []
+    const duplicates = []
+
+    earNumbers.forEach(earNumber => {
+      if (!existingSet.has(earNumber)) {
+        newEarNumbers.push(earNumber)
+        existingSet.add(earNumber)
+      } else {
+        duplicates.push(earNumber)
+      }
+    })
+
+    // 添加新耳号
+    if (newEarNumbers.length > 0) {
+      queryParams.value.allEarNumbers = [
+        ...(queryParams.value.allEarNumbers || []),
+        ...newEarNumbers
+      ]
+
+      const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
+        (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
+
+      proxy.$modal.msgSuccess(message)
+    } else if (duplicates.length > 0) {
+      proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
+    }
+
+    // 清空输入框
+    pasteInput.value = ''
+  }
+
+  /** 远程搜索耳号 */
+  function searchEarNumber(query) {
+    if (query !== '') {
+      earNumberLoading.value = true
+
+      const queries = query.trim().split(/[\s,，]+/).filter(q => q)
+
+      if (queries.length === 1) {
+        // 单个耳号模糊搜索
+        searchEarNumbers(query).then(response => {
+          earNumberOptions.value = response.data || []
+          earNumberLoading.value = false
+        }).catch(() => {
+          earNumberOptions.value = []
+          earNumberLoading.value = false
+        })
+      } else {
+        // 多个耳号直接作为选项
+        earNumberOptions.value = queries
+        earNumberLoading.value = false
+      }
+    } else {
+      earNumberOptions.value = []
+    }
+  }
+
+  /** 耳号选择变化处理 */
+  function handleEarNumberChange(value) {
+    queryParams.value.allEarNumbers = [...new Set(value)]
+    console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
+  }
+
+  /** 切换展开/收起状态 */
+  function toggleExpand() {
+    isExpanded.value = !isExpanded.value
+  }
+
+  /** 移除单个耳号 */
+  function handleRemoveEarNumber(tag) {
+    const index = queryParams.value.allEarNumbers.indexOf(tag)
+    if (index > -1) {
+      queryParams.value.allEarNumbers.splice(index, 1)
+      proxy.$modal.msgSuccess('已移除该耳号')
+    }
+
+    // 如果删除后剩余<=2个，自动收起
+    if (queryParams.value.allEarNumbers.length <= defaultShowCount) {
+      isExpanded.value = false
+    }
+  }
+
+  /** 清空所有耳号 */
+  function clearAllEarNumbers() {
+    proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
+      queryParams.value.allEarNumbers = []
+      pasteInput.value = ''
+      earNumberOptions.value = []
+      isExpanded.value = false  // 重置展开状态
+      proxy.$modal.msgSuccess('已清空所有耳号')
+    }).catch(() => { })
+  }
+
   const ids = ref([])
   const single = ref(true)
   const multiple = ref(true)
@@ -528,6 +747,27 @@
   function handleAddDetail() {
     usageDetails.value.push({ mediId: null, dosage: 0, unit: null, usageId: null,manufacturer:null,batchNumber:null })
   }
+  // 获取技术员列表
+  const fetchTechnicalList = () => {
+    getUserByPost({ postCode: "techs" })
+      .then(res => {
+        if (res.code === 200 && Array.isArray(res.data)) {
+          technicalOptions.value = res.data.map(item => ({
+            // value: item.userId,
+            value: item.nickName,
+            label: item.nickName,
+            // postName: item.postName,      // 保留用于下拉显示
+            // postCode: item.postCode       // 保留用于逻辑判断
+          }))
+          console.log(technicalOptions.value);
+          
+        } else {
+          technicalOptions.value = []
+          ElMessage.warning(res.msg || '获取技术员列表失败')
+        }
+      })
+
+  }
 
   /* ------------------ 初始化 ------------------ */
   onMounted(() => {
@@ -546,5 +786,49 @@
     listMedicine().then(res => {
       medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
     })
+    fetchTechnicalList()
+  
   })
-</script>
+</script>
+<style scoped>
+/* 已选耳号展示区样式 */
+.selected-ear-numbers-display {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 8px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6;
+  border-radius: 3px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-track {
+  background-color: #f5f7fa;
+}
+
+.selected-ear-numbers-display .el-tag {
+  margin: 4px;
+  cursor: pointer;
+}
+
+.selected-ear-numbers-display .el-tag:hover {
+  opacity: 0.8;
+}
+
+/* 隐藏 el-select 的下拉箭头（可选） */
+:deep(.el-select__caret) {
+  display: none;
+}
+</style>

src/views/biosafety/diagnosis/index.vue

@@ -2,14 +2,81 @@
   <div class="app-container">
     <!-- 查询区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
+
+        <el-form-item label="羊只耳号" prop="allEarNumbers">
+          <div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
+            <!-- 主选择器：不显示已选标签 -->
+            <el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword
+              placeholder="输入耳号搜索" :remote-method="searchEarNumber" :loading="earNumberLoading" allow-create
+              default-first-option collapse-tags :max-collapse-tags="0" style="width: 300px"
+              @change="handleEarNumberChange">
+              <el-option v-for="item in earNumberOptions" :key="item" :label="item" :value="item" />
+            </el-select>
+
+
+            <!-- 辅助粘贴输入框 -->
+            <el-input v-model="pasteInput" 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.allEarNumbers && queryParams.allEarNumbers.length > 0" type="info" effect="plain"
+              size="large">
+              已选: {{ queryParams.allEarNumbers.length }} 个
+            </el-tag>
+
+
+            <!-- 清空按钮 -->
+            <el-button type="danger" plain @click="clearAllEarNumbers"
+              v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0" :icon="Delete">
+              清空全部
+            </el-button>
+
+          </div>
+
+
+          <!-- 已选耳号展示区域（默认显示2个，可展开） -->
+          <div v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+            class="selected-ear-numbers-display" style="margin-top: 10px;">
+            <!-- 显示前2个或全部耳号 -->
+            <el-tag v-for="(tag, index) in displayedEarNumbers" :key="tag" closable @close="handleRemoveEarNumber(tag)"
+              style="margin: 4px;" type="success">
+              {{ tag }}
+            </el-tag>
+
+
+            <!-- 展开/收起按钮 -->
+            <el-button v-if="queryParams.allEarNumbers.length > defaultShowCount" type="primary" link
+              @click="toggleExpand" style="margin-left: 8px;">
+              {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.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="sheepId">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable />
+      </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-form-item>
-      <el-form-item label="羊只" prop="sheepId">
+     <el-form-item label="羊舍" prop="sheepfoldId">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用逗号隔开" clearable />
+        <el-select v-model="queryParams.sheepfoldId" clearable placeholder="请选择羊舍" style="width: 120px;" filterable>
+          <el-option v-for="s in sheepfoldOptions" :key="s.value" :label="s.label" :value="s.value" />
+        </el-select>
       </el-form-item>
-
       <el-form-item label="疾病类型" prop="diseasePid">
         <el-select v-model="queryParams.diseasePid" clearable placeholder="请选择疾病类型" style="width: 120px;" filterable
           @change="handleDiseaseTypeChange">
@@ -34,11 +101,7 @@
         <el-input v-model="queryParams.treatDay" placeholder="请输入治疗天数" clearable />
       </el-form-item>
 
-      <el-form-item label="羊舍" prop="sheepfoldId">
+
-        <el-select v-model="queryParams.sheepfoldId" clearable placeholder="请选择羊舍" style="width: 120px;" filterable>
-          <el-option v-for="s in sheepfoldOptions" :key="s.value" :label="s.label" :value="s.value" />
-        </el-select>
-      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -210,6 +273,34 @@ import {
 import { listSheepfold_management } from '@/api/fileManagement/sheepfold_management'
 import { listDisease } from '@/api/biosafety/disease'
 import { getCurrentInstance, onMounted, ref, watch } from 'vue'
+import { searchEarNumbers } from '@/api/common/sheep'
+import { getUserByPost } from '@/api/common/user'
+
+const technicalOptions = ref([])   //自定义技术员数组变量
+
+// 获取技术员列表
+const fetchTechnicalList = () => {
+  getUserByPost({ postCode: "techs" })
+    .then(res => {
+      if (res.code === 200 && Array.isArray(res.data)) {
+        technicalOptions.value = res.data.map(item => ({
+          // value: item.userId,
+          value: item.nickName,
+          label: item.nickName,
+          // postName: item.postName,      // 保留用于下拉显示
+          // postCode: item.postCode       // 保留用于逻辑判断
+        }))
+        console.log(technicalOptions.value);
+
+      } else {
+        technicalOptions.value = []
+        ElMessage.warning(res.msg || '获取技术员列表失败')
+      }
+    })
+
+}
+
+
 
 /* ---------- 基础依赖 ---------- */
 const { proxy } = getCurrentInstance()
@@ -230,6 +321,7 @@ const queryParams = ref({
   pageNum: 1,
   pageSize: 20,
   sheepNo: null,
+  allEarNumbers: null,
   datetime: null,
   diseasePid: null,
   diseaseId: null,
@@ -273,6 +365,146 @@ const rules = {
   ],
 }
 
+// 响应式数据
+const pasteInput = ref('')           // 批量粘贴输入框
+const earNumberOptions = ref([])     // 耳号下拉选项
+const earNumberLoading = ref(false)  // 耳号加载状态
+const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+const defaultShowCount = 2           // 默认显示的耳号数量
+
+// 计算属性：控制显示的耳号列表
+const displayedEarNumbers = computed(() => {
+  if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
+    return []
+  }
+
+  // 如果展开或总数<=2，显示全部；否则只显示前2个
+  if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
+    return queryParams.allEarNumbers
+  } else {
+    return queryParams.allEarNumbers.slice(0, defaultShowCount)
+  }
+})
+/** 处理粘贴事件 */
+function handlePaste(event) {
+  nextTick(() => {
+    handlePasteSubmit()
+  })
+}
+
+/** 处理粘贴内容提交 */
+function handlePasteSubmit() {
+  if (!pasteInput.value || pasteInput.value.trim() === '') {
+    return
+  }
+
+  // 支持多种分隔符: 空格、换行、逗号、制表符
+  const separators = /[\s,，\n\r\t]+/
+  const earNumbers = pasteInput.value
+    .trim()
+    .split(separators)
+    .filter(item => item.trim() !== '')
+    .map(item => item.trim())
+
+  if (earNumbers.length === 0) {
+    return
+  }
+
+  // 去重并添加到已选列表
+  const existingSet = new Set(queryParams.value.allEarNumbers || [])
+  const newEarNumbers = []
+  const duplicates = []
+
+  earNumbers.forEach(earNumber => {
+    if (!existingSet.has(earNumber)) {
+      newEarNumbers.push(earNumber)
+      existingSet.add(earNumber)
+    } else {
+      duplicates.push(earNumber)
+    }
+  })
+
+  // 添加新耳号
+  if (newEarNumbers.length > 0) {
+    queryParams.value.allEarNumbers = [
+      ...(queryParams.value.allEarNumbers || []),
+      ...newEarNumbers
+    ]
+
+    const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
+      (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
+
+    proxy.$modal.msgSuccess(message)
+  } else if (duplicates.length > 0) {
+    proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
+  }
+
+  // 清空输入框
+  pasteInput.value = ''
+}
+
+/** 远程搜索耳号 */
+function searchEarNumber(query) {
+  if (query !== '') {
+    earNumberLoading.value = true
+
+    const queries = query.trim().split(/[\s,，]+/).filter(q => q)
+
+    if (queries.length === 1) {
+      // 单个耳号模糊搜索
+      searchEarNumbers(query).then(response => {
+        earNumberOptions.value = response.data || []
+        earNumberLoading.value = false
+      }).catch(() => {
+        earNumberOptions.value = []
+        earNumberLoading.value = false
+      })
+    } else {
+      // 多个耳号直接作为选项
+      earNumberOptions.value = queries
+      earNumberLoading.value = false
+    }
+  } else {
+    earNumberOptions.value = []
+  }
+}
+
+/** 耳号选择变化处理 */
+function handleEarNumberChange(value) {
+  queryParams.value.allEarNumbers = [...new Set(value)]
+  console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
+}
+
+/** 切换展开/收起状态 */
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+/** 移除单个耳号 */
+function handleRemoveEarNumber(tag) {
+  const index = queryParams.value.allEarNumbers.indexOf(tag)
+  if (index > -1) {
+    queryParams.value.allEarNumbers.splice(index, 1)
+    proxy.$modal.msgSuccess('已移除该耳号')
+  }
+
+  // 如果删除后剩余<=2个，自动收起
+  if (queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    isExpanded.value = false
+  }
+}
+
+/** 清空所有耳号 */
+function clearAllEarNumbers() {
+  proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
+    queryParams.value.allEarNumbers = []
+    pasteInput.value = ''
+    earNumberOptions.value = []
+    isExpanded.value = false  // 重置展开状态
+    proxy.$modal.msgSuccess('已清空所有耳号')
+  }).catch(() => { })
+}
+
 /* ---------- 下拉数据源 ---------- */
 const pDiseaseOptions = ref([])
 const cDiseaseOptions = ref([])
@@ -449,5 +681,49 @@ onMounted(() => {
       label: i.sheepfoldName,
     }))
   })
+  fetchTechnicalList()  // 获取技术员列表
 })
-</script>
+</script>
+
+<style scoped>
+/* 已选耳号展示区样式 */
+.selected-ear-numbers-display {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 8px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6;
+  border-radius: 3px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-track {
+  background-color: #f5f7fa;
+}
+
+.selected-ear-numbers-display .el-tag {
+  margin: 4px;
+  cursor: pointer;
+}
+
+.selected-ear-numbers-display .el-tag:hover {
+  opacity: 0.8;
+}
+
+/* 隐藏 el-select 的下拉箭头（可选） */
+:deep(.el-select__caret) {
+  display: none;
+}
+</style>

src/views/biosafety/disease/index.vue

@@ -2,7 +2,7 @@
     <div class="app-container">
         <!-- 查询区 -->
         <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="名称" prop="name">
+            <el-form-item label="疾病名称" prop="name">
                 <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="疾病大类" prop="pid">

src/views/biosafety/disinfect/index.vue

@@ -8,11 +8,6 @@
           end-placeholder="结束日期" value-format="YYYY-MM-DD HH:mm" />
       </el-form-item>
 
-      <el-form-item label="消毒方式" prop="way">
-        <el-select v-model="queryParams.way" clearable placeholder="请选择消毒方式" filterable style="width: 200px">
-          <el-option v-for="item in disinfect_type" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="药品名称" prop="mediName">
         <el-input v-model="queryParams.mediName" placeholder="请输入药品" clearable />
       </el-form-item>
@@ -23,7 +18,19 @@
       </el-form-item>
 
       <el-form-item label="技术员" prop="technician">
-        <el-input v-model="queryParams.technician" placeholder="请输入技术员" clearable />
+        <el-form-item label="技术员">
+          <el-select v-model="queryParams.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
+            @change="handleTechnicalChange">
+            <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+              <span style="float: left">{{ item.label }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form-item>
+      <el-form-item label="消毒方式" prop="way">
+        <el-select v-model="queryParams.way" clearable placeholder="请选择消毒方式" filterable style="width: 200px">
+          <el-option v-for="item in disinfect_type" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
       </el-form-item>
 
       <el-form-item>
@@ -101,7 +108,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="技术员" prop="technician">
-              <el-input v-model="form.technician" placeholder="请输入技术员姓名" />
+              <el-form-item label="技术员">
+                <el-select v-model="form.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
+                  @change="handleTechnicalChange">
+                  <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                    <span style="float: left">{{ item.label }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
             </el-form-item>
           </el-col>
         </el-row>
@@ -199,7 +213,14 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="技术员">
-              <el-input v-model="editForm.technician" placeholder="请输入技术员姓名" />
+              <el-form-item label="技术员">
+                <el-select v-model="editForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
+                  @change="handleTechnicalChange">
+                  <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                    <span style="float: left">{{ item.label }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
             </el-form-item>
           </el-col>
         </el-row>
@@ -289,6 +310,33 @@ import { listMedicine } from '@/api/biosafety/medicine'
 import request from '@/utils/request'
 import { parseTime } from '@/utils/ruoyi'
 
+import { getUserByPost } from '@/api/common/user'
+
+const technicalOptions = ref([])   //自定义技术员数组变量
+
+// 获取技术员列表
+const fetchTechnicalList = () => {
+  getUserByPost({ postCode: "techs" })
+    .then(res => {
+      if (res.code === 200 && Array.isArray(res.data)) {
+        technicalOptions.value = res.data.map(item => ({
+          // value: item.userId,
+          value: item.nickName,
+          label: item.nickName,
+          // postName: item.postName,      // 保留用于下拉显示
+          // postCode: item.postCode       // 保留用于逻辑判断
+        }))
+        console.log(technicalOptions.value);
+
+      } else {
+        technicalOptions.value = []
+        ElMessage.warning(res.msg || '获取技术员列表失败')
+      }
+    })
+
+}
+
+
 const { proxy } = getCurrentInstance()
 const { disinfect_type } = proxy.useDict('disinfect_type')
 
@@ -538,5 +586,6 @@ onMounted(() => {
   listMedicine().then(res => {
     medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
   })
+  fetchTechnicalList()  // 获取技术员列表
 })
 </script>

src/views/biosafety/health/index.vue

@@ -2,15 +2,84 @@
   <div class="app-container">
     <!-- 1. 搜索 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
+
+        <el-form-item label="羊只耳号" prop="allEarNumbers">
+          <div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
+            <!-- 主选择器：不显示已选标签 -->
+            <el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword
+              placeholder="输入耳号搜索" :remote-method="searchEarNumber" :loading="earNumberLoading" allow-create
+              default-first-option collapse-tags :max-collapse-tags="0" style="width: 300px"
+              @change="handleEarNumberChange">
+              <el-option v-for="item in earNumberOptions" :key="item" :label="item" :value="item" />
+            </el-select>
+
+
+            <!-- 辅助粘贴输入框 -->
+            <el-input v-model="pasteInput" 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.allEarNumbers && queryParams.allEarNumbers.length > 0" type="info" effect="plain"
+              size="large">
+              已选: {{ queryParams.allEarNumbers.length }} 个
+            </el-tag>
+
+
+            <!-- 清空按钮 -->
+            <el-button type="danger" plain @click="clearAllEarNumbers"
+              v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0" :icon="Delete">
+              清空全部
+            </el-button>
+
+          </div>
+
+
+          <!-- 已选耳号展示区域（默认显示2个，可展开） -->
+          <div v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+            class="selected-ear-numbers-display" style="margin-top: 10px;">
+            <!-- 显示前2个或全部耳号 -->
+            <el-tag v-for="(tag, index) in displayedEarNumbers" :key="tag" closable @close="handleRemoveEarNumber(tag)"
+              style="margin: 4px;" type="success">
+              {{ tag }}
+            </el-tag>
+
+
+            <!-- 展开/收起按钮 -->
+            <el-button v-if="queryParams.allEarNumbers.length > defaultShowCount" type="primary" link
+              @click="toggleExpand" style="margin-left: 8px;">
+              {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.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="sheepNo">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
+      </el-form-item> -->
       <el-form-item label="保健日期">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
-      <el-form-item label="羊只耳号" prop="sheepNo">
+
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用逗号隔开" clearable @keyup.enter="getList" />
-      </el-form-item>
       <el-form-item label="技术员" prop="technical">
-        <el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
+          <el-select v-model="queryParams.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
+            @change="handleTechnicalChange">
+            <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+              <span style="float: left">{{ item.label }}</span>
+            </el-option>
+          </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -108,7 +177,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="技术员">
-              <el-input v-model="addForm.technical" placeholder="请输入技术员姓名" />
+              <el-form-item label="技术员">
+                <el-select v-model="addForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
+                  @change="handleTechnicalChange">
+                  <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                    <span style="float: left">{{ item.label }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
             </el-form-item>
           </el-col>
         </el-row>
@@ -212,7 +288,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="技术员">
-              <el-input v-model="editForm.technical" placeholder="请输入技术员姓名" />
+              <el-select v-model="editForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
+                @change="handleTechnicalChange">
+                <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                  <span style="float: left">{{ item.label }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -287,6 +368,33 @@ import { listUsage } from '@/api/biosafety/usage'
 import { listMedicine } from '@/api/biosafety/medicine'
 import request from '@/utils/request'
 import { parseTime } from '@/utils/ruoyi'
+import { searchEarNumbers } from '@/api/common/sheep'
+import { getUserByPost } from '@/api/common/user'
+
+const technicalOptions = ref([])   //自定义技术员数组变量
+
+// 获取技术员列表
+const fetchTechnicalList = () => {
+  getUserByPost({ postCode: "techs" })
+    .then(res => {
+      if (res.code === 200 && Array.isArray(res.data)) {
+        technicalOptions.value = res.data.map(item => ({
+          // value: item.userId,
+          value: item.nickName,
+          label: item.nickName,
+          // postName: item.postName,      // 保留用于下拉显示
+          // postCode: item.postCode       // 保留用于逻辑判断
+        }))
+        console.log(technicalOptions.value);
+
+      } else {
+        technicalOptions.value = []
+        ElMessage.warning(res.msg || '获取技术员列表失败')
+      }
+    })
+
+}
+
 
 const { proxy } = getCurrentInstance()
 const { sheep_gender } = proxy.useDict('sheep_gender')
@@ -302,11 +410,152 @@ const queryParams = reactive({
   pageNum: 1,
   pageSize: 20,
   sheepNo: null,
+  allEarNumbers: [],  // 修改：改为数组，支持多耳号
   technical: null,
   orderByColumn: null,   // 新增
   isAsc: null            // 新增
 })
 
+// 响应式数据
+const pasteInput = ref('')           // 批量粘贴输入框
+const earNumberOptions = ref([])     // 耳号下拉选项
+const earNumberLoading = ref(false)  // 耳号加载状态
+const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+const defaultShowCount = 2           // 默认显示的耳号数量
+
+// 计算属性：控制显示的耳号列表
+const displayedEarNumbers = computed(() => {
+  if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
+    return []
+  }
+
+  // 如果展开或总数<=2，显示全部；否则只显示前2个
+  if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
+    return queryParams.allEarNumbers
+  } else {
+    return queryParams.allEarNumbers.slice(0, defaultShowCount)
+  }
+})
+/** 处理粘贴事件 */
+function handlePaste(event) {
+  nextTick(() => {
+    handlePasteSubmit()
+  })
+}
+
+/** 处理粘贴内容提交 */
+function handlePasteSubmit() {
+  if (!pasteInput.value || pasteInput.value.trim() === '') {
+    return
+  }
+
+  // 支持多种分隔符: 空格、换行、逗号、制表符
+  const separators = /[\s,，\n\r\t]+/
+  const earNumbers = pasteInput.value
+    .trim()
+    .split(separators)
+    .filter(item => item.trim() !== '')
+    .map(item => item.trim())
+
+  if (earNumbers.length === 0) {
+    return
+  }
+
+  // 去重并添加到已选列表
+  const existingSet = new Set(queryParams.value.allEarNumbers || [])
+  const newEarNumbers = []
+  const duplicates = []
+
+  earNumbers.forEach(earNumber => {
+    if (!existingSet.has(earNumber)) {
+      newEarNumbers.push(earNumber)
+      existingSet.add(earNumber)
+    } else {
+      duplicates.push(earNumber)
+    }
+  })
+
+  // 添加新耳号
+  if (newEarNumbers.length > 0) {
+    queryParams.value.allEarNumbers = [
+      ...(queryParams.value.allEarNumbers || []),
+      ...newEarNumbers
+    ]
+
+    const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
+      (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
+
+    proxy.$modal.msgSuccess(message)
+  } else if (duplicates.length > 0) {
+    proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
+  }
+
+  // 清空输入框
+  pasteInput.value = ''
+}
+
+/** 远程搜索耳号 */
+function searchEarNumber(query) {
+  if (query !== '') {
+    earNumberLoading.value = true
+
+    const queries = query.trim().split(/[\s,，]+/).filter(q => q)
+
+    if (queries.length === 1) {
+      // 单个耳号模糊搜索
+      searchEarNumbers(query).then(response => {
+        earNumberOptions.value = response.data || []
+        earNumberLoading.value = false
+      }).catch(() => {
+        earNumberOptions.value = []
+        earNumberLoading.value = false
+      })
+    } else {
+      // 多个耳号直接作为选项
+      earNumberOptions.value = queries
+      earNumberLoading.value = false
+    }
+  } else {
+    earNumberOptions.value = []
+  }
+}
+
+/** 耳号选择变化处理 */
+function handleEarNumberChange(value) {
+  queryParams.value.allEarNumbers = [...new Set(value)]
+  console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
+}
+
+/** 切换展开/收起状态 */
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+/** 移除单个耳号 */
+function handleRemoveEarNumber(tag) {
+  const index = queryParams.value.allEarNumbers.indexOf(tag)
+  if (index > -1) {
+    queryParams.value.allEarNumbers.splice(index, 1)
+    proxy.$modal.msgSuccess('已移除该耳号')
+  }
+
+  // 如果删除后剩余<=2个，自动收起
+  if (queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    isExpanded.value = false
+  }
+}
+
+/** 清空所有耳号 */
+function clearAllEarNumbers() {
+  proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
+    queryParams.value.allEarNumbers = []
+    pasteInput.value = ''
+    earNumberOptions.value = []
+    isExpanded.value = false  // 重置展开状态
+    proxy.$modal.msgSuccess('已清空所有耳号')
+  }).catch(() => { })
+}
+
 const ids = ref([])
 const single = ref(true)
 const multiple = ref(true)
@@ -548,5 +797,48 @@ onMounted(() => {
   listMedicine().then(res => {
     medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
   })
+  fetchTechnicalList()  // 获取技术员列表
 })
-</script>
+</script>
+<style scoped>
+/* 已选耳号展示区样式 */
+.selected-ear-numbers-display {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 8px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6;
+  border-radius: 3px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-track {
+  background-color: #f5f7fa;
+}
+
+.selected-ear-numbers-display .el-tag {
+  margin: 4px;
+  cursor: pointer;
+}
+
+.selected-ear-numbers-display .el-tag:hover {
+  opacity: 0.8;
+}
+
+/* 隐藏 el-select 的下拉箭头（可选） */
+:deep(.el-select__caret) {
+  display: none;
+}
+</style>

src/views/biosafety/immunity/index.vue

@@ -2,15 +2,82 @@
   <div class="app-container">
     <!-- 1. 搜索 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
+        <el-form-item label="羊只耳号" prop="allEarNumbers">
+          <div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
+            <!-- 主选择器：不显示已选标签 -->
+            <el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword
+              placeholder="输入耳号搜索" :remote-method="searchEarNumber" :loading="earNumberLoading" allow-create
+              default-first-option collapse-tags :max-collapse-tags="0" style="width: 300px"
+              @change="handleEarNumberChange">
+              <el-option v-for="item in earNumberOptions" :key="item" :label="item" :value="item" />
+            </el-select>
+
+
+            <!-- 辅助粘贴输入框 -->
+            <el-input v-model="pasteInput" 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.allEarNumbers && queryParams.allEarNumbers.length > 0" type="info" effect="plain"
+              size="large">
+              已选: {{ queryParams.allEarNumbers.length }} 个
+            </el-tag>
+
+
+            <!-- 清空按钮 -->
+            <el-button type="danger" plain @click="clearAllEarNumbers"
+              v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0" :icon="Delete">
+              清空全部
+            </el-button>
+
+          </div>
+
+
+          <!-- 已选耳号展示区域（默认显示2个，可展开） -->
+          <div v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+            class="selected-ear-numbers-display" style="margin-top: 10px;">
+            <!-- 显示前2个或全部耳号 -->
+            <el-tag v-for="(tag, index) in displayedEarNumbers" :key="tag" closable @close="handleRemoveEarNumber(tag)"
+              style="margin: 4px;" type="success">
+              {{ tag }}
+            </el-tag>
+
+
+            <!-- 展开/收起按钮 -->
+            <el-button v-if="queryParams.allEarNumbers.length > defaultShowCount" type="primary" link
+              @click="toggleExpand" style="margin-left: 8px;">
+              {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.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="免疫日期">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
-      <el-form-item label="羊只耳号" prop="sheepNo">
+      <!-- <el-form-item label="羊只耳号" prop="sheepNo">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用逗号隔开" clearable @keyup.enter="getList" />
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="技术员" prop="technical">
-        <el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
+          <el-select v-model="queryParams.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
+            @change="handleTechnicalChange">
+            <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+              <span style="float: left">{{ item.label }}</span>
+            </el-option>
+          </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -107,7 +174,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="技术员">
-              <el-input v-model="addForm.technical" placeholder="请输入技术员姓名" />
+              <el-form-item label="技术员">
+                <el-select v-model="addForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
+                  @change="handleTechnicalChange">
+                  <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                    <span style="float: left">{{ item.label }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
             </el-form-item>
           </el-col>
         </el-row>
@@ -211,7 +285,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="技术员">
-              <el-input v-model="editForm.technical" placeholder="请输入技术员姓名" />
+              <el-select v-model="editForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
+                @change="handleTechnicalChange">
+                <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                  <span style="float: left">{{ item.label }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -286,6 +365,32 @@ import { listUsage } from '@/api/biosafety/usage'
 import { listMedicine } from '@/api/biosafety/medicine'
 import request from '@/utils/request'
 import { parseTime } from '@/utils/ruoyi'
+import { searchEarNumbers } from '@/api/common/sheep'
+import { getUserByPost } from '@/api/common/user'
+
+const technicalOptions = ref([])   //自定义技术员数组变量
+
+// 获取技术员列表
+const fetchTechnicalList = () => {
+  getUserByPost({ postCode: "techs" })
+    .then(res => {
+      if (res.code === 200 && Array.isArray(res.data)) {
+        technicalOptions.value = res.data.map(item => ({
+          // value: item.userId,
+          value: item.nickName,
+          label: item.nickName,
+          // postName: item.postName,      // 保留用于下拉显示
+          // postCode: item.postCode       // 保留用于逻辑判断
+        }))
+        console.log(technicalOptions.value);
+
+      } else {
+        technicalOptions.value = []
+        ElMessage.warning(res.msg || '获取技术员列表失败')
+      }
+    })
+
+}
 
 const { proxy } = getCurrentInstance()
 const { sheep_gender } = proxy.useDict('sheep_gender')
@@ -301,11 +406,153 @@ const queryParams = reactive({
   pageNum: 1,
   pageSize: 20,
   sheepNo: null,
+  allEarNumbers: [],  // 修改：改为数组，支持多耳号
   technical: null,
   orderByColumn: null,   // 新增
   isAsc: null            // 新增
 })
 
+// 响应式数据
+const pasteInput = ref('')           // 批量粘贴输入框
+const earNumberOptions = ref([])     // 耳号下拉选项
+const earNumberLoading = ref(false)  // 耳号加载状态
+const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+const defaultShowCount = 2           // 默认显示的耳号数量
+
+// 计算属性：控制显示的耳号列表
+const displayedEarNumbers = computed(() => {
+  if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
+    return []
+  }
+
+  // 如果展开或总数<=2，显示全部；否则只显示前2个
+  if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
+    return queryParams.allEarNumbers
+  } else {
+    return queryParams.allEarNumbers.slice(0, defaultShowCount)
+  }
+})
+/** 处理粘贴事件 */
+function handlePaste(event) {
+  nextTick(() => {
+    handlePasteSubmit()
+  })
+}
+
+/** 处理粘贴内容提交 */
+function handlePasteSubmit() {
+  if (!pasteInput.value || pasteInput.value.trim() === '') {
+    return
+  }
+
+  // 支持多种分隔符: 空格、换行、逗号、制表符
+  const separators = /[\s,，\n\r\t]+/
+  const earNumbers = pasteInput.value
+    .trim()
+    .split(separators)
+    .filter(item => item.trim() !== '')
+    .map(item => item.trim())
+
+  if (earNumbers.length === 0) {
+    return
+  }
+
+  // 去重并添加到已选列表
+  const existingSet = new Set(queryParams.value.allEarNumbers || [])
+  const newEarNumbers = []
+  const duplicates = []
+
+  earNumbers.forEach(earNumber => {
+    if (!existingSet.has(earNumber)) {
+      newEarNumbers.push(earNumber)
+      existingSet.add(earNumber)
+    } else {
+      duplicates.push(earNumber)
+    }
+  })
+
+  // 添加新耳号
+  if (newEarNumbers.length > 0) {
+    queryParams.value.allEarNumbers = [
+      ...(queryParams.value.allEarNumbers || []),
+      ...newEarNumbers
+    ]
+
+    const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
+      (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
+
+    proxy.$modal.msgSuccess(message)
+  } else if (duplicates.length > 0) {
+    proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
+  }
+
+  // 清空输入框
+  pasteInput.value = ''
+}
+
+/** 远程搜索耳号 */
+function searchEarNumber(query) {
+  if (query !== '') {
+    earNumberLoading.value = true
+
+    const queries = query.trim().split(/[\s,，]+/).filter(q => q)
+
+    if (queries.length === 1) {
+      // 单个耳号模糊搜索
+      searchEarNumbers(query).then(response => {
+        earNumberOptions.value = response.data || []
+        earNumberLoading.value = false
+      }).catch(() => {
+        earNumberOptions.value = []
+        earNumberLoading.value = false
+      })
+    } else {
+      // 多个耳号直接作为选项
+      earNumberOptions.value = queries
+      earNumberLoading.value = false
+    }
+  } else {
+    earNumberOptions.value = []
+  }
+}
+
+/** 耳号选择变化处理 */
+function handleEarNumberChange(value) {
+  queryParams.value.allEarNumbers = [...new Set(value)]
+  console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
+}
+
+/** 切换展开/收起状态 */
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+/** 移除单个耳号 */
+function handleRemoveEarNumber(tag) {
+  const index = queryParams.value.allEarNumbers.indexOf(tag)
+  if (index > -1) {
+    queryParams.value.allEarNumbers.splice(index, 1)
+    proxy.$modal.msgSuccess('已移除该耳号')
+  }
+
+  // 如果删除后剩余<=2个，自动收起
+  if (queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    isExpanded.value = false
+  }
+}
+
+/** 清空所有耳号 */
+function clearAllEarNumbers() {
+  proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
+    queryParams.value.allEarNumbers = []
+    pasteInput.value = ''
+    earNumberOptions.value = []
+    isExpanded.value = false  // 重置展开状态
+    proxy.$modal.msgSuccess('已清空所有耳号')
+  }).catch(() => { })
+}
+
+
 const ids = ref([])
 const single = ref(true)
 const multiple = ref(true)
@@ -547,5 +794,49 @@ onMounted(() => {
   listMedicine().then(res => {
     medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
   })
+  fetchTechnicalList()  // 获取技术员列表
 })
-</script>
+</script>
+
+<style scoped>
+/* 已选耳号展示区样式 */
+.selected-ear-numbers-display {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 8px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6;
+  border-radius: 3px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-track {
+  background-color: #f5f7fa;
+}
+
+.selected-ear-numbers-display .el-tag {
+  margin: 4px;
+  cursor: pointer;
+}
+
+.selected-ear-numbers-display .el-tag:hover {
+  opacity: 0.8;
+}
+
+/* 隐藏 el-select 的下拉箭头（可选） */
+:deep(.el-select__caret) {
+  display: none;
+}
+</style>

src/views/biosafety/quarantine/index.vue

@@ -2,6 +2,71 @@
   <div class="app-container">
     <!-- 查询表单 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
+        <el-form-item label="羊只耳号" prop="allEarNumbers">
+          <div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
+            <!-- 主选择器：不显示已选标签 -->
+            <el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword
+              placeholder="输入耳号搜索" :remote-method="searchEarNumber" :loading="earNumberLoading" allow-create
+              default-first-option collapse-tags :max-collapse-tags="0" style="width: 300px"
+              @change="handleEarNumberChange">
+              <el-option v-for="item in earNumberOptions" :key="item" :label="item" :value="item" />
+            </el-select>
+
+
+            <!-- 辅助粘贴输入框 -->
+            <el-input v-model="pasteInput" 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.allEarNumbers && queryParams.allEarNumbers.length > 0" type="info" effect="plain"
+              size="large">
+              已选: {{ queryParams.allEarNumbers.length }} 个
+            </el-tag>
+
+
+            <!-- 清空按钮 -->
+            <el-button type="danger" plain @click="clearAllEarNumbers"
+              v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0" :icon="Delete">
+              清空全部
+            </el-button>
+
+          </div>
+
+
+          <!-- 已选耳号展示区域（默认显示2个，可展开） -->
+          <div v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+            class="selected-ear-numbers-display" style="margin-top: 10px;">
+            <!-- 显示前2个或全部耳号 -->
+            <el-tag v-for="(tag, index) in displayedEarNumbers" :key="tag" closable @close="handleRemoveEarNumber(tag)"
+              style="margin: 4px;" type="success">
+              {{ tag }}
+            </el-tag>
+
+
+            <!-- 展开/收起按钮 -->
+            <el-button v-if="queryParams.allEarNumbers.length > defaultShowCount" type="primary" link
+              @click="toggleExpand" style="margin-left: 8px;">
+              {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.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="sheepNo">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
+      </el-form-item> -->
       <el-form-item label="检疫日期">
         <el-date-picker v-model="daterangeDatetime" type="daterange" range-separator="-" start-placeholder="开始日期"
           end-placeholder="结束日期" value-format="YYYY-MM-DD" />
@@ -12,15 +77,23 @@
           <el-option v-for="i in quarantineItems" :key="i.value" :label="i.label" :value="i.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="羊只耳号" prop="sheepNo">
+
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用逗号隔开" clearable @keyup.enter="getList" />
-      </el-form-item>
       <el-form-item label="采样员" prop="sampler">
-        <el-input v-model="queryParams.sampler" placeholder="请输入采样员名字" clearable @keyup.enter="getList" />
+        <el-select v-model="queryParams.sampler" filterable clearable placeholder="请输入采样员姓名" style="width: 100%"
+          @change="handleTechnicalChange">
+          <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+            <span style="float: left">{{ item.label }}</span>
+          </el-option>
+        </el-select>
       </el-form-item>
 
       <el-form-item label="检疫员" prop="quarOfficer">
-        <el-input v-model="queryParams.quarOfficer" placeholder="请输入检疫员名字" clearable @keyup.enter="getList" />
+        <el-select v-model="queryParams.quarOfficer" filterable clearable placeholder="请输入检疫员姓名" style="width: 100%"
+          @change="handleTechnicalChange">
+          <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+            <span style="float: left">{{ item.label }}</span>
+          </el-option>
+        </el-select>
       </el-form-item>
 
 
@@ -162,12 +235,22 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="采样员" prop="sampler">
-              <el-input v-model="addForm.sampler" />
+             <el-select v-model="addForm.sampler" filterable clearable placeholder="请输入采样员姓名" style="width: 100%"
+                @change="handleTechnicalChange">
+                <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                  <span style="float: left">{{ item.label }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="检疫员" prop="quarOfficer">
-              <el-input v-model="addForm.quarOfficer" />
+             <el-select v-model="addForm.quarOfficer" filterable clearable placeholder="请输入检疫员姓名" style="width: 100%"
+                @change="handleTechnicalChange">
+                <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                  <span style="float: left">{{ item.label }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -253,13 +336,23 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="采样员">
-              <el-input v-model="editForm.sampler" />
+              <el-select v-model="editForm.sampleOfficer" filterable clearable placeholder="请输入采样员姓名" style="width: 100%"
+                @change="handleTechnicalChange">
+                <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                  <span style="float: left">{{ item.label }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="检疫员">
-              <el-input v-model="editForm.quarOfficer" />
+             <el-select v-model="editForm.quarOfficer" filterable clearable placeholder="请输入检疫员姓名" style="width: 100%"
+                @change="handleTechnicalChange">
+                <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                  <span style="float: left">{{ item.label }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -299,6 +392,8 @@ import { listSample } from '@/api/biosafety/sample'
 import request from '@/utils/request'
 import { parseTime } from '@/utils/ruoyi'
 import { useRouter } from 'vue-router'
+import { searchEarNumbers } from '@/api/common/sheep'
+import { getUserByPost } from '@/api/common/user'
 
 const { proxy } = getCurrentInstance()
 const { quar_result, quar_status, sheep_gender } = proxy.useDict(
@@ -308,6 +403,33 @@ const { quar_result, quar_status, sheep_gender } = proxy.useDict(
 )
 const router = useRouter()
 
+
+
+const technicalOptions = ref([])   //自定义技术员数组变量
+
+// 获取技术员列表
+const fetchTechnicalList = () => {
+  getUserByPost({ postCode: "techs" })
+    .then(res => {
+      if (res.code === 200 && Array.isArray(res.data)) {
+        technicalOptions.value = res.data.map(item => ({
+          // value: item.userId,
+          value: item.nickName,
+          label: item.nickName,
+          // postName: item.postName,      // 保留用于下拉显示
+          // postCode: item.postCode       // 保留用于逻辑判断
+        }))
+        console.log(technicalOptions.value);
+
+      } else {
+        technicalOptions.value = []
+        ElMessage.warning(res.msg || '获取技术员列表失败')
+      }
+    })
+
+}
+
+
 /* 基础数据 */
 const loading = ref(true)
 const showSearch = ref(true)
@@ -320,10 +442,152 @@ const queryParams = reactive({
   pageNum: 1,
   pageSize: 20,
   sheepId: null,
+  allEarNumbers: [],  // 修改：改为数组，支持多耳号
   orderByColumn: null,   // 新增
   isAsc: null            // 新增
 })
 
+
+// 响应式数据
+const pasteInput = ref('')           // 批量粘贴输入框
+const earNumberOptions = ref([])     // 耳号下拉选项
+const earNumberLoading = ref(false)  // 耳号加载状态
+const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+const defaultShowCount = 2           // 默认显示的耳号数量
+
+// 计算属性：控制显示的耳号列表
+const displayedEarNumbers = computed(() => {
+  if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
+    return []
+  }
+
+  // 如果展开或总数<=2，显示全部；否则只显示前2个
+  if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
+    return queryParams.allEarNumbers
+  } else {
+    return queryParams.allEarNumbers.slice(0, defaultShowCount)
+  }
+})
+/** 处理粘贴事件 */
+function handlePaste(event) {
+  nextTick(() => {
+    handlePasteSubmit()
+  })
+}
+
+/** 处理粘贴内容提交 */
+function handlePasteSubmit() {
+  if (!pasteInput.value || pasteInput.value.trim() === '') {
+    return
+  }
+
+  // 支持多种分隔符: 空格、换行、逗号、制表符
+  const separators = /[\s,，\n\r\t]+/
+  const earNumbers = pasteInput.value
+    .trim()
+    .split(separators)
+    .filter(item => item.trim() !== '')
+    .map(item => item.trim())
+
+  if (earNumbers.length === 0) {
+    return
+  }
+
+  // 去重并添加到已选列表
+  const existingSet = new Set(queryParams.value.allEarNumbers || [])
+  const newEarNumbers = []
+  const duplicates = []
+
+  earNumbers.forEach(earNumber => {
+    if (!existingSet.has(earNumber)) {
+      newEarNumbers.push(earNumber)
+      existingSet.add(earNumber)
+    } else {
+      duplicates.push(earNumber)
+    }
+  })
+
+  // 添加新耳号
+  if (newEarNumbers.length > 0) {
+    queryParams.value.allEarNumbers = [
+      ...(queryParams.value.allEarNumbers || []),
+      ...newEarNumbers
+    ]
+
+    const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
+      (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
+
+    proxy.$modal.msgSuccess(message)
+  } else if (duplicates.length > 0) {
+    proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
+  }
+
+  // 清空输入框
+  pasteInput.value = ''
+}
+
+/** 远程搜索耳号 */
+function searchEarNumber(query) {
+  if (query !== '') {
+    earNumberLoading.value = true
+
+    const queries = query.trim().split(/[\s,，]+/).filter(q => q)
+
+    if (queries.length === 1) {
+      // 单个耳号模糊搜索
+      searchEarNumbers(query).then(response => {
+        earNumberOptions.value = response.data || []
+        earNumberLoading.value = false
+      }).catch(() => {
+        earNumberOptions.value = []
+        earNumberLoading.value = false
+      })
+    } else {
+      // 多个耳号直接作为选项
+      earNumberOptions.value = queries
+      earNumberLoading.value = false
+    }
+  } else {
+    earNumberOptions.value = []
+  }
+}
+
+/** 耳号选择变化处理 */
+function handleEarNumberChange(value) {
+  queryParams.value.allEarNumbers = [...new Set(value)]
+  console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
+}
+
+/** 切换展开/收起状态 */
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+/** 移除单个耳号 */
+function handleRemoveEarNumber(tag) {
+  const index = queryParams.value.allEarNumbers.indexOf(tag)
+  if (index > -1) {
+    queryParams.value.allEarNumbers.splice(index, 1)
+    proxy.$modal.msgSuccess('已移除该耳号')
+  }
+
+  // 如果删除后剩余<=2个，自动收起
+  if (queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    isExpanded.value = false
+  }
+}
+
+/** 清空所有耳号 */
+function clearAllEarNumbers() {
+  proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
+    queryParams.value.allEarNumbers = []
+    pasteInput.value = ''
+    earNumberOptions.value = []
+    isExpanded.value = false  // 重置展开状态
+    proxy.$modal.msgSuccess('已清空所有耳号')
+  }).catch(() => { })
+}
+
 /* 多选 */
 const ids = ref([])
 const single = ref(true)
@@ -568,4 +832,48 @@ getItems()
 getSample()
 getBarns()
 getSheepType()
-</script>
+getTechnicalList()
+</script>
+
+<style scoped>
+/* 已选耳号展示区样式 */
+.selected-ear-numbers-display {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 8px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6;
+  border-radius: 3px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-track {
+  background-color: #f5f7fa;
+}
+
+.selected-ear-numbers-display .el-tag {
+  margin: 4px;
+  cursor: pointer;
+}
+
+.selected-ear-numbers-display .el-tag:hover {
+  opacity: 0.8;
+}
+
+/* 隐藏 el-select 的下拉箭头（可选） */
+:deep(.el-select__caret) {
+  display: none;
+}
+</style>

src/views/biosafety/treatment/index.vue

@@ -2,20 +2,88 @@
   <div class="app-container">
     <!-- 搜索栏 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="羊只耳号" prop="allEarNumbers">
+          <div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
+            <!-- 主选择器：不显示已选标签 -->
+            <el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword
+              placeholder="输入耳号搜索" :remote-method="searchEarNumber" :loading="earNumberLoading" allow-create
+              default-first-option collapse-tags :max-collapse-tags="0" style="width: 300px"
+              @change="handleEarNumberChange">
+              <el-option v-for="item in earNumberOptions" :key="item" :label="item" :value="item" />
+            </el-select>
+
+
+            <!-- 辅助粘贴输入框 -->
+            <el-input v-model="pasteInput" 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.allEarNumbers && queryParams.allEarNumbers.length > 0" type="info" effect="plain"
+              size="large">
+              已选: {{ queryParams.allEarNumbers.length }} 个
+            </el-tag>
+
+
+            <!-- 清空按钮 -->
+            <el-button type="danger" plain @click="clearAllEarNumbers"
+              v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0" :icon="Delete">
+              清空全部
+            </el-button>
+
+          </div>
+
+
+          <!-- 已选耳号展示区域（默认显示2个，可展开） -->
+          <div v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+            class="selected-ear-numbers-display" style="margin-top: 10px;">
+            <!-- 显示前2个或全部耳号 -->
+            <el-tag v-for="(tag, index) in displayedEarNumbers" :key="tag" closable @close="handleRemoveEarNumber(tag)"
+              style="margin: 4px;" type="success">
+              {{ tag }}
+            </el-tag>
+
+
+            <!-- 展开/收起按钮 -->
+            <el-button v-if="queryParams.allEarNumbers.length > defaultShowCount" type="primary" link
+              @click="toggleExpand" style="margin-left: 8px;">
+              {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.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="sheepNo">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
+      </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-form-item>
-     <el-form-item label="羊只耳号" prop="sheepNo">
+
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用逗号隔开" clearable @keyup.enter="getList" />
-      </el-form-item>
       <el-form-item label="治疗状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择治疗状态" style="width: 120px;">
           <el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="兽医" prop="veterinary">
-        <el-input v-model="queryParams.veterinary" placeholder="请输入兽医" clearable />
+        <el-select v-model="editForm.veterinary" filterable clearable placeholder="请输入兽医姓名" style="width: 100%"
+          @change="handleTechnicalChange">
+          <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+            <span style="float: left">{{ item.label }}</span>
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -200,7 +268,12 @@
         <el-row :gutter="20" style="margin-top:20px;">
           <el-col :span="12">
             <el-form-item label="兽医">
-              <el-input v-model="addForm.veterinarian" placeholder="请输入兽医姓名" />
+              <el-select v-model="addForm.veterinarian" filterable clearable placeholder="请输入兽医姓名" style="width: 100%"
+                @change="handleTechnicalChange">
+                <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                  <span style="float: left">{{ item.label }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -379,6 +452,12 @@
           <el-col :span="12">
             <el-form-item label="兽医">
               <el-input v-model="editForm.veterinarian" placeholder="请输入兽医姓名" />
+              <el-select v-model="editForm.veterinarian" filterable clearable placeholder="请输入兽医姓名" style="width: 100%"
+                @change="handleTechnicalChange">
+                <el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
+                  <span style="float: left">{{ item.label }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -444,6 +523,32 @@ import { listUsage } from '@/api/biosafety/usage'
 import { listMedicine } from '@/api/biosafety/medicine'
 import request from '@/utils/request'
 import { useRouter } from 'vue-router'
+import { searchEarNumbers } from '@/api/common/sheep'
+import { getUserByPost } from '@/api/common/user'
+
+const technicalOptions = ref([])   //自定义技术员数组变量
+
+// 获取技术员列表
+const fetchTechnicalList = () => {
+  getUserByPost({ postCode: "techs" })
+    .then(res => {
+      if (res.code === 200 && Array.isArray(res.data)) {
+        technicalOptions.value = res.data.map(item => ({
+          // value: item.userId,
+          value: item.nickName,
+          label: item.nickName,
+          // postName: item.postName,      // 保留用于下拉显示
+          // postCode: item.postCode       // 保留用于逻辑判断
+        }))
+        console.log(technicalOptions.value);
+
+      } else {
+        technicalOptions.value = []
+        ElMessage.warning(res.msg || '获取技术员列表失败')
+      }
+    })
+
+}
 
 const router = useRouter()
 
@@ -466,11 +571,153 @@ const queryParams = reactive({
   pageNum: 1,
   pageSize: 20,
   sheepNo: null,
+  allEarNumbers: [],
   veterinary: null,
   orderByColumn: null,   // 新增
   isAsc: null
 })
 
+// 响应式数据
+const pasteInput = ref('')           // 批量粘贴输入框
+const earNumberOptions = ref([])     // 耳号下拉选项
+const earNumberLoading = ref(false)  // 耳号加载状态
+const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+const defaultShowCount = 2           // 默认显示的耳号数量
+
+// 计算属性：控制显示的耳号列表
+const displayedEarNumbers = computed(() => {
+  if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
+    return []
+  }
+
+  // 如果展开或总数<=2，显示全部；否则只显示前2个
+  if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
+    return queryParams.allEarNumbers
+  } else {
+    return queryParams.allEarNumbers.slice(0, defaultShowCount)
+  }
+})
+/** 处理粘贴事件 */
+function handlePaste(event) {
+  nextTick(() => {
+    handlePasteSubmit()
+  })
+}
+
+/** 处理粘贴内容提交 */
+function handlePasteSubmit() {
+  if (!pasteInput.value || pasteInput.value.trim() === '') {
+    return
+  }
+
+  // 支持多种分隔符: 空格、换行、逗号、制表符
+  const separators = /[\s,，\n\r\t]+/
+  const earNumbers = pasteInput.value
+    .trim()
+    .split(separators)
+    .filter(item => item.trim() !== '')
+    .map(item => item.trim())
+
+  if (earNumbers.length === 0) {
+    return
+  }
+
+  // 去重并添加到已选列表
+  const existingSet = new Set(queryParams.value.allEarNumbers || [])
+  const newEarNumbers = []
+  const duplicates = []
+
+  earNumbers.forEach(earNumber => {
+    if (!existingSet.has(earNumber)) {
+      newEarNumbers.push(earNumber)
+      existingSet.add(earNumber)
+    } else {
+      duplicates.push(earNumber)
+    }
+  })
+
+  // 添加新耳号
+  if (newEarNumbers.length > 0) {
+    queryParams.value.allEarNumbers = [
+      ...(queryParams.value.allEarNumbers || []),
+      ...newEarNumbers
+    ]
+
+    const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
+      (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
+
+    proxy.$modal.msgSuccess(message)
+  } else if (duplicates.length > 0) {
+    proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
+  }
+
+  // 清空输入框
+  pasteInput.value = ''
+}
+
+/** 远程搜索耳号 */
+function searchEarNumber(query) {
+  if (query !== '') {
+    earNumberLoading.value = true
+
+    const queries = query.trim().split(/[\s,，]+/).filter(q => q)
+
+    if (queries.length === 1) {
+      // 单个耳号模糊搜索
+      searchEarNumbers(query).then(response => {
+        earNumberOptions.value = response.data || []
+        earNumberLoading.value = false
+      }).catch(() => {
+        earNumberOptions.value = []
+        earNumberLoading.value = false
+      })
+    } else {
+      // 多个耳号直接作为选项
+      earNumberOptions.value = queries
+      earNumberLoading.value = false
+    }
+  } else {
+    earNumberOptions.value = []
+  }
+}
+
+/** 耳号选择变化处理 */
+function handleEarNumberChange(value) {
+  queryParams.value.allEarNumbers = [...new Set(value)]
+  console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
+}
+
+/** 切换展开/收起状态 */
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+/** 移除单个耳号 */
+function handleRemoveEarNumber(tag) {
+  const index = queryParams.value.allEarNumbers.indexOf(tag)
+  if (index > -1) {
+    queryParams.value.allEarNumbers.splice(index, 1)
+    proxy.$modal.msgSuccess('已移除该耳号')
+  }
+
+  // 如果删除后剩余<=2个，自动收起
+  if (queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    isExpanded.value = false
+  }
+}
+
+/** 清空所有耳号 */
+function clearAllEarNumbers() {
+  proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
+    queryParams.value.allEarNumbers = []
+    pasteInput.value = ''
+    earNumberOptions.value = []
+    isExpanded.value = false  // 重置展开状态
+    proxy.$modal.msgSuccess('已清空所有耳号')
+  }).catch(() => { })
+}
+
+
 /* ---------- 弹窗控制 ---------- */
 const addDialog = ref(false)
 const editDialog = ref(false)
@@ -801,5 +1048,50 @@ onMounted(() => {
   listSheepfold_management().then(res => {
     sheepfolds.value = res.rows.map(item => ({ id: item.id, name: item.sheepfoldName }))
   })
+  fetchTechnicalList()  // 获取技术员列表
 })
+
 </script>
+
+<style scoped>
+/* 已选耳号展示区样式 */
+.selected-ear-numbers-display {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 8px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6;
+  border-radius: 3px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-track {
+  background-color: #f5f7fa;
+}
+
+.selected-ear-numbers-display .el-tag {
+  margin: 4px;
+  cursor: pointer;
+}
+
+.selected-ear-numbers-display .el-tag:hover {
+  opacity: 0.8;
+}
+
+/* 隐藏 el-select 的下拉箭头（可选） */
+:deep(.el-select__caret) {
+  display: none;
+}
+</style>

src/views/biosafety/usageInfo/index.vue

@@ -2,28 +2,89 @@
   <div class="app-container">
     <!-- 搜索表单 -->
     <el-form ref="queryRef" :model="queryParams" :inline="true" v-show="showSearch" label-width="68px">
+
+        <el-form-item label="羊只耳号" prop="allEarNumbers">
+          <div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
+            <!-- 主选择器：不显示已选标签 -->
+            <el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword
+              placeholder="输入耳号搜索" :remote-method="searchEarNumber" :loading="earNumberLoading" allow-create
+              default-first-option collapse-tags :max-collapse-tags="0" style="width: 300px"
+              @change="handleEarNumberChange">
+              <el-option v-for="item in earNumberOptions" :key="item" :label="item" :value="item" />
+            </el-select>
+
+
+            <!-- 辅助粘贴输入框 -->
+            <el-input v-model="pasteInput" 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.allEarNumbers && queryParams.allEarNumbers.length > 0" type="info" effect="plain"
+              size="large">
+              已选: {{ queryParams.allEarNumbers.length }} 个
+            </el-tag>
+
+
+            <!-- 清空按钮 -->
+            <el-button type="danger" plain @click="clearAllEarNumbers"
+              v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0" :icon="Delete">
+              清空全部
+            </el-button>
+
+          </div>
+
+
+          <!-- 已选耳号展示区域（默认显示2个，可展开） -->
+          <div v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+            class="selected-ear-numbers-display" style="margin-top: 10px;">
+            <!-- 显示前2个或全部耳号 -->
+            <el-tag v-for="(tag, index) in displayedEarNumbers" :key="tag" closable @close="handleRemoveEarNumber(tag)"
+              style="margin: 4px;" type="success">
+              {{ tag }}
+            </el-tag>
+
+
+            <!-- 展开/收起按钮 -->
+            <el-button v-if="queryParams.allEarNumbers.length > defaultShowCount" type="primary" link
+              @click="toggleExpand" style="margin-left: 8px;">
+              {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.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="sheepNo">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
+      </el-form-item> -->
       <!-- 使用日期（新增） -->
       <el-form-item label="使用日期" style="width: 308px">
         <el-date-picker v-model="daterangeUseTime" type="daterange" range-separator="-" start-placeholder="开始日期"
           end-placeholder="结束日期" value-format="YYYY-MM-DD" />
       </el-form-item>
-
+     <el-form-item label="使用名称" prop="name">
-      <!-- 创建日期（原有） -->
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" type="daterange" range-separator="-" start-placeholder="开始日期"
-          end-placeholder="结束日期" value-format="YYYY-MM-DD" />
-      </el-form-item>
-     <el-form-item label="羊只耳号" prop="sheepNo">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用逗号隔开" clearable @keyup.enter="getList" />
-      </el-form-item>
-
-      <el-form-item label="使用名称" prop="name">
         <el-select v-model="queryParams.name" placeholder="请选择使用药品名称" clearable filterable style="width: 100%"
           @keyup.enter="handleQuery">
           <el-option v-for="item in medicines" :key="item.value" :label="item.label" :value="item.label" />
         </el-select>
       </el-form-item>
 
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" type="daterange" range-separator="-" start-placeholder="开始日期"
+          end-placeholder="结束日期" value-format="YYYY-MM-DD" />
+      </el-form-item>
+
       <el-form-item label="使用类型" prop="useType">
         <el-select v-model="queryParams.useType" placeholder="请选择使用类型" clearable style="width: 180px">
           <el-option v-for="dict in pres_type" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -144,6 +205,7 @@ import { listUsageInfo, getUsageInfo } from '@/api/biosafety/usageInfo'
 import { listUnit } from '@/api/biosafety/unit'
 import { listUsage } from '@/api/biosafety/usage'
 import { getCurrentInstance, reactive, ref, toRefs } from 'vue'
+import { searchEarNumbers } from '@/api/common/sheep'
 
 const { proxy } = getCurrentInstance()
 const { pres_type } = proxy.useDict('pres_type')
@@ -163,12 +225,156 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 20,
+    allEarNumbers: [],
     name: null,
     useType: null,
     createTime: null
   },
   rules: {}
 })
+
+// 响应式数据
+const pasteInput = ref('')           // 批量粘贴输入框
+const earNumberOptions = ref([])     // 耳号下拉选项
+const earNumberLoading = ref(false)  // 耳号加载状态
+const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+const defaultShowCount = 2           // 默认显示的耳号数量
+
+// 计算属性：控制显示的耳号列表
+const displayedEarNumbers = computed(() => {
+  if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
+    return []
+  }
+
+  // 如果展开或总数<=2，显示全部；否则只显示前2个
+  if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
+    return queryParams.allEarNumbers
+  } else {
+    return queryParams.allEarNumbers.slice(0, defaultShowCount)
+  }
+})
+/** 处理粘贴事件 */
+function handlePaste(event) {
+  nextTick(() => {
+    handlePasteSubmit()
+  })
+}
+
+/** 处理粘贴内容提交 */
+function handlePasteSubmit() {
+  if (!pasteInput.value || pasteInput.value.trim() === '') {
+    return
+  }
+
+  // 支持多种分隔符: 空格、换行、逗号、制表符
+  const separators = /[\s,，\n\r\t]+/
+  const earNumbers = pasteInput.value
+    .trim()
+    .split(separators)
+    .filter(item => item.trim() !== '')
+    .map(item => item.trim())
+
+  if (earNumbers.length === 0) {
+    return
+  }
+
+  // 去重并添加到已选列表
+  const existingSet = new Set(queryParams.value.allEarNumbers || [])
+  const newEarNumbers = []
+  const duplicates = []
+
+  earNumbers.forEach(earNumber => {
+    if (!existingSet.has(earNumber)) {
+      newEarNumbers.push(earNumber)
+      existingSet.add(earNumber)
+    } else {
+      duplicates.push(earNumber)
+    }
+  })
+
+  // 添加新耳号
+  if (newEarNumbers.length > 0) {
+    queryParams.value.allEarNumbers = [
+      ...(queryParams.value.allEarNumbers || []),
+      ...newEarNumbers
+    ]
+
+    const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
+      (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
+
+    proxy.$modal.msgSuccess(message)
+  } else if (duplicates.length > 0) {
+    proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
+  }
+
+  // 清空输入框
+  pasteInput.value = ''
+}
+
+/** 远程搜索耳号 */
+function searchEarNumber(query) {
+  if (query !== '') {
+    earNumberLoading.value = true
+
+    const queries = query.trim().split(/[\s,，]+/).filter(q => q)
+
+    if (queries.length === 1) {
+      // 单个耳号模糊搜索
+      searchEarNumbers(query).then(response => {
+        earNumberOptions.value = response.data || []
+        earNumberLoading.value = false
+      }).catch(() => {
+        earNumberOptions.value = []
+        earNumberLoading.value = false
+      })
+    } else {
+      // 多个耳号直接作为选项
+      earNumberOptions.value = queries
+      earNumberLoading.value = false
+    }
+  } else {
+    earNumberOptions.value = []
+  }
+}
+
+/** 耳号选择变化处理 */
+function handleEarNumberChange(value) {
+  queryParams.value.allEarNumbers = [...new Set(value)]
+  console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
+}
+
+/** 切换展开/收起状态 */
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+/** 移除单个耳号 */
+function handleRemoveEarNumber(tag) {
+  const index = queryParams.value.allEarNumbers.indexOf(tag)
+  if (index > -1) {
+    queryParams.value.allEarNumbers.splice(index, 1)
+    proxy.$modal.msgSuccess('已移除该耳号')
+  }
+
+  // 如果删除后剩余<=2个，自动收起
+  if (queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    isExpanded.value = false
+  }
+}
+
+/** 清空所有耳号 */
+function clearAllEarNumbers() {
+  proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
+    queryParams.value.allEarNumbers = []
+    pasteInput.value = ''
+    earNumberOptions.value = []
+    isExpanded.value = false  // 重置展开状态
+    proxy.$modal.msgSuccess('已清空所有耳号')
+  }).catch(() => { })
+}
+
+
+
 const { queryParams, form, rules } = toRefs(data)
 
 const units = ref([])
@@ -295,4 +501,46 @@ getUsageOptions()
 .usage-detail-dialog .card-header .el-icon {
   margin-right: 6px;
 }
-</style>
+</style>
+<style scoped>
+/* 已选耳号展示区样式 */
+.selected-ear-numbers-display {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 8px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6;
+  border-radius: 3px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-track {
+  background-color: #f5f7fa;
+}
+
+.selected-ear-numbers-display .el-tag {
+  margin: 4px;
+  cursor: pointer;
+}
+
+.selected-ear-numbers-display .el-tag:hover {
+  opacity: 0.8;
+}
+
+/* 隐藏 el-select 的下拉箭头（可选） */
+:deep(.el-select__caret) {
+  display: none;
+}
+</style>

src/views/breed/lambing_records/index.vue

@@ -1,14 +1,105 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="母羊耳号" prop="femaleEarNumber">
+      <!-- 修改母羊耳号查询组件 -->
-        <el-input
+      <el-form-item label="耳号" prop="allEarNumbers">
-            v-model="queryParams.femaleEarNumber"
+        <div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
-            placeholder="请输入母羊耳号"
+          <!-- 主选择器：不显示已选标签 -->
-            clearable
+          <el-select
-            @keyup.enter="handleQuery"
+              v-model="queryParams.allEarNumbers"
-        />
+              multiple
+              filterable
+              remote
+              reserve-keyword
+              placeholder="输入耳号搜索"
+              :remote-method="searchEarNumber"
+              :loading="earNumberLoading"
+              allow-create
+              default-first-option
+              collapse-tags
+              :max-collapse-tags="0"
+              style="width: 300px"
+              @change="handleEarNumberChange"
+          >
+            <el-option
+                v-for="item in earNumberOptions"
+                :key="item"
+                :label="item"
+                :value="item"
+            />
+          </el-select>
+
+          <!-- 辅助粘贴输入框 -->
+          <el-input
+              v-model="pasteInput"
+              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.allEarNumbers && queryParams.allEarNumbers.length > 0"
+              type="info"
+              effect="plain"
+              size="large"
+          >
+            已选: {{ queryParams.allEarNumbers.length }} 个
+          </el-tag>
+
+          <!-- 清空按钮 -->
+          <el-button
+              type="danger"
+              plain
+              @click="clearAllEarNumbers"
+              v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+              :icon="Delete"
+          >
+            清空全部
+          </el-button>
+        </div>
+
+        <!-- 已选耳号展示区域（默认显示2个，可展开） -->
+        <div
+            v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+            class="selected-ear-numbers-display"
+            style="margin-top: 10px;"
+        >
+          <!-- 显示前2个或全部耳号 -->
+          <el-tag
+              v-for="(tag, index) in displayedEarNumbers"
+              :key="tag"
+              closable
+              @close="handleRemoveEarNumber(tag)"
+              style="margin: 4px;"
+              type="success"
+          >
+            {{ tag }}
+          </el-tag>
+
+          <!-- 展开/收起按钮 -->
+          <el-button
+              v-if="queryParams.allEarNumbers.length > defaultShowCount"
+              type="primary"
+              link
+              @click="toggleExpand"
+              style="margin-left: 8px;"
+          >
+            {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.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="femaleBreed">
         <el-input
             v-model="queryParams.femaleBreed"
@@ -151,6 +242,7 @@
         :total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
+        :page-sizes="[20,50,100,200, 500, 1000, 2000]"
         @pagination="getList"
     />
 
@@ -240,6 +332,19 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <!-- 显示已选择的耳号标签 -->
+        <div v-if="queryParams.femaleEarNumbers && queryParams.femaleEarNumbers.length > 0" class="selected-ear-numbers">
+          <span style="margin-right: 10px; color: #606266;">已选择耳号：</span>
+          <el-tag
+              v-for="earNumber in queryParams.femaleEarNumbers"
+              :key="earNumber"
+              closable
+              @close="removeEarNumber(earNumber)"
+              style="margin-right: 8px;"
+          >
+            {{ earNumber }}
+          </el-tag>
+        </div>
 
         <!-- 羔羊信息录入 -->
         <div v-if="form.lambsBorn > 0 && showLambForms">
@@ -375,10 +480,32 @@
 </template>
 
 <script setup name="Lambing_records">
-import { listLambing_records, getLambing_records, delLambing_records, addLambing_records, updateLambing_records, getLambDetail, getVarietyList, getBreedingInfo } from "@/api/breed/lambing_records"
+import { listLambing_records, getLambing_records, delLambing_records, addLambing_records, updateLambing_records, getLambDetail, getVarietyList, getBreedingInfo,searchEarNumbers } from "@/api/breed/lambing_records"
+import { ref, computed, nextTick } from 'vue'
+import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
 
+// 响应式数据
+const pasteInput = ref('')           // 批量粘贴输入框
+const earNumberOptions = ref([])     // 耳号下拉选项
+const earNumberLoading = ref(false)  // 耳号加载状态
+const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+const defaultShowCount = 2           // 默认显示的耳号数量
+
+// 计算属性：控制显示的耳号列表
+const displayedEarNumbers = computed(() => {
+  if (!queryParams.value.allEarNumbers || queryParams.value.allEarNumbers.length === 0) {
+    return []
+  }
+
+  // 如果展开或总数<=2，显示全部；否则只显示前2个
+  if (isExpanded.value || queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    return queryParams.value.allEarNumbers
+  } else {
+    return queryParams.value.allEarNumbers.slice(0, defaultShowCount)
+  }
+})
 const { proxy } = getCurrentInstance()
-
+// 新增：耳号搜索相关状
 const lambing_recordsList = ref([])
 const open = ref(false)
 const detailOpen = ref(false)
@@ -400,7 +527,7 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    femaleEarNumber: null,
+    femaleEarNumber: [],
     femaleBreed: null,
     sheepId: null,
     parity: null,
@@ -425,7 +552,125 @@ const data = reactive({
 })
 
 const { queryParams, form, rules } = toRefs(data)
+/** 处理粘贴事件 */
+function handlePaste(event) {
+  nextTick(() => {
+    handlePasteSubmit()
+  })
+}
 
+/** 处理粘贴内容提交 */
+function handlePasteSubmit() {
+  if (!pasteInput.value || pasteInput.value.trim() === '') {
+    return
+  }
+
+  // 支持多种分隔符: 空格、换行、逗号、制表符
+  const separators = /[\s,，\n\r\t]+/
+  const earNumbers = pasteInput.value
+      .trim()
+      .split(separators)
+      .filter(item => item.trim() !== '')
+      .map(item => item.trim())
+
+  if (earNumbers.length === 0) {
+    return
+  }
+
+  // 去重并添加到已选列表
+  const existingSet = new Set(queryParams.value.allEarNumbers || [])
+  const newEarNumbers = []
+  const duplicates = []
+
+  earNumbers.forEach(earNumber => {
+    if (!existingSet.has(earNumber)) {
+      newEarNumbers.push(earNumber)
+      existingSet.add(earNumber)
+    } else {
+      duplicates.push(earNumber)
+    }
+  })
+
+  // 添加新耳号
+  if (newEarNumbers.length > 0) {
+    queryParams.value.allEarNumbers = [
+      ...(queryParams.value.allEarNumbers || []),
+      ...newEarNumbers
+    ]
+
+    const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
+        (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
+
+    proxy.$modal.msgSuccess(message)
+  } else if (duplicates.length > 0) {
+    proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
+  }
+
+  // 清空输入框
+  pasteInput.value = ''
+}
+
+/** 远程搜索耳号 */
+function searchEarNumber(query) {
+  if (query !== '') {
+    earNumberLoading.value = true
+
+    const queries = query.trim().split(/[\s,，]+/).filter(q => q)
+
+    if (queries.length === 1) {
+      // 单个耳号模糊搜索
+      searchEarNumbers(query).then(response => {
+        earNumberOptions.value = response.data || []
+        earNumberLoading.value = false
+      }).catch(() => {
+        earNumberOptions.value = []
+        earNumberLoading.value = false
+      })
+    } else {
+      // 多个耳号直接作为选项
+      earNumberOptions.value = queries
+      earNumberLoading.value = false
+    }
+  } else {
+    earNumberOptions.value = []
+  }
+}
+
+/** 耳号选择变化处理 */
+function handleEarNumberChange(value) {
+  queryParams.value.allEarNumbers = [...new Set(value)]
+  console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
+}
+
+/** 切换展开/收起状态 */
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+/** 移除单个耳号 */
+function handleRemoveEarNumber(tag) {
+  const index = queryParams.value.allEarNumbers.indexOf(tag)
+  if (index > -1) {
+    queryParams.value.allEarNumbers.splice(index, 1)
+    proxy.$modal.msgSuccess('已移除该耳号')
+  }
+
+  // 如果删除后剩余<=2个，自动收起
+  if (queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    isExpanded.value = false
+  }
+}
+
+/** 清空所有耳号 */
+function clearAllEarNumbers() {
+  proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
+    queryParams.value.allEarNumbers = []
+    pasteInput.value = ''
+    earNumberOptions.value = []
+    isExpanded.value = false  // 重置展开状态
+    proxy.$modal.msgSuccess('已清空所有耳号')
+  }).catch(() => {})
+}
 /** 获取品种列表 */
 function getVarietyData() {
   return getVarietyList().then(response => {
@@ -438,6 +683,17 @@ function getVarietyData() {
   })
 }
 
+/** 新增：清空所有耳号 */
+function clearEarNumbers() {
+  queryParams.value.femaleEarNumbers = []
+}
+/** 新增：移除单个耳号 */
+function removeEarNumber(earNumber) {
+  const index = queryParams.value.femaleEarNumbers.indexOf(earNumber)
+  if (index > -1) {
+    queryParams.value.femaleEarNumbers.splice(index, 1)
+  }
+}
 /** 根据品种ID获取品种名称 */
 function getVarietyName(varietyId) {
   if (!varietyId) return '-'
@@ -448,8 +704,8 @@ function getVarietyName(varietyId) {
 
 /** 性别转换函数 - 前端显示转后端数值 */
 function genderToNumber(gender) {
-  if (gender === 'male') return 1
+  if (gender === 'male') return 2
-  if (gender === 'female') return 0
+  if (gender === 'female') return 1
   return gender
 }
 
@@ -535,6 +791,7 @@ function reset() {
     parity: null,
     maleEarNumber: null,
     breedingDate: null,
+    allEarNumbers: [],  // ✅ 添加这一行！
     pregnancyDays: null,
     lambsBorn: null,
     survival: null,
@@ -550,13 +807,17 @@ function reset() {
 }
 
 /** 搜索按钮操作 */
+/** 搜索按钮操作 - 修改 */
 function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
-/** 重置按钮操作 */
+/** 重置按钮操作 - 修改 */
 function resetQuery() {
+  queryParams.value.allEarNumbers = []  // ✅ 添加这一行
+  earNumberOptions.value = []            // ✅ 添加这一行
+  isExpanded.value = false
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -702,29 +963,44 @@ onMounted(() => {
 </script>
 
 <style scoped>
-.lamb-form-item {
+/* 已选耳号展示区样式 */
-  margin-bottom: 20px;
+.selected-ear-numbers-display {
-  padding: 15px;
+  max-height: 150px;
-  border: 1px solid #e4e7ed;
+  overflow-y: auto;
+  padding: 8px;
+  background-color: #f5f7fa;
   border-radius: 4px;
-  background-color: #fafafa;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
 }
 
-.lamb-form-header {
+.selected-ear-numbers-display::-webkit-scrollbar {
-  margin-bottom: 15px;
+  width: 6px;
+  height: 6px;
 }
 
-.lamb-title {
+.selected-ear-numbers-display::-webkit-scrollbar-thumb {
-  font-weight: bold;
+  background-color: #dcdfe6;
-  color: #409eff;
+  border-radius: 3px;
-  font-size: 14px;
 }
 
-.lamb-form-content {
+.selected-ear-numbers-display::-webkit-scrollbar-track {
-  margin-bottom: 10px;
+  background-color: #f5f7fa;
 }
 
-.lamb-form-content:last-child {
+.selected-ear-numbers-display .el-tag {
-  margin-bottom: 0;
+  margin: 4px;
+  cursor: pointer;
+}
+
+.selected-ear-numbers-display .el-tag:hover {
+  opacity: 0.8;
+}
+
+/* 隐藏 el-select 的下拉箭头（可选） */
+:deep(.el-select__caret) {
+  display: none;
 }
 </style>

src/views/drymilk/drymilk/index.vue

@@ -1,14 +1,23 @@
 <template>
   <div class="app-container">
+<<<<<<< HEAD
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
       
       <el-form-item label="耳号" prop="manageTagsList">
          <el-select
             v-model="queryParams.manageTagsList"
+=======
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <!-- 羊只耳号（全部） - 多选模糊查询 -->
+      <el-form-item label="耳号" prop="allEarNumbers">
+        <el-select
+            v-model="queryParams.allEarNumbers"
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
             multiple
             filterable
             remote
             reserve-keyword
+<<<<<<< HEAD
             placeholder="请输入耳号关键字搜索"
             :remote-method="searchEarNumber"
             :loading="earNumberLoading"
@@ -34,6 +43,82 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
         ></el-date-picker>
+=======
+            placeholder="输入耳号搜索，支持多选"
+            :remote-method="searchEarNumber"
+            :loading="earNumberLoading"
+            allow-create
+            default-first-option
+            style="width: 300px"
+            @change="handleEarNumberChange"
+            collapse-tags
+            :max-collapse-tags="0"
+        >
+          <el-option
+              v-for="item in earNumberOptions"
+              :key="item"
+              :label="item"
+              :value="item"
+          />
+        </el-select>
+        <el-input
+            v-model="pasteInput"
+            placeholder="或粘贴多个耳号(空格/换行/逗号分隔)"
+            style="width: 300px; margin-left: 10px"
+            @paste="handlePaste"
+            @keyup.enter="handlePasteSubmit"
+            clearable
+        >
+          <template #append>
+            <el-button @click="handlePasteSubmit" icon="Plus">添加</el-button>
+          </template>
+        </el-input>
+        <!-- 耳号计数显示 -->
+        <el-tag
+            v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+            type="info"
+            effect="plain"
+            size="large"
+        >
+          已选: {{ queryParams.allEarNumbers.length }} 个
+        </el-tag>
+
+        <!-- 清空按钮 -->
+        <el-button
+            type="danger"
+            plain
+            @click="clearAllEarNumbers"
+            v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+            icon="Delete"
+        >
+          清空全部
+        </el-button>
+        <el-button
+            type="text"
+            @click="clearEarNumbers"
+            v-if="queryParams.femaleEarNumbers && queryParams.femaleEarNumbers.length > 0"
+            style="margin-left: 10px"
+        >
+          清空
+        </el-button>
+      </el-form-item>
+
+      <el-form-item label="品种" prop="variety">
+        <el-input
+            v-model="queryParams.variety"
+            placeholder="请输入品种"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="干奶日期" prop="datetime">
+        <el-date-picker clearable
+                        v-model="queryParams.datetime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择干奶日期">
+        </el-date-picker>
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
       </el-form-item>
 
       <el-form-item label="技术员" prop="tecahnician">
@@ -58,6 +143,30 @@
       </el-form-item>
     </el-form>
 
+    <div v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0" class="selected-ear-numbers">
+      <span style="margin-right: 10px; color: #606266;">已选择耳号：</span>
+      <el-tag
+          v-for="(tag, index) in displayedEarNumbers"
+          :key="tag"
+          closable
+          @close="handleRemoveEarNumber(index)"
+          style="margin: 4px;"
+          type="success"
+      >
+        {{ tag }}
+      </el-tag>
+
+      <el-button
+          v-if="queryParams.allEarNumbers.length > 1"
+          type="text"
+          @click="toggleExpand"
+          style="margin-left: 8px;"
+      >
+        <el-icon><component :is="isExpanded ? 'ArrowUp' : 'ArrowDown'" /></el-icon>
+        {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.length - 1} 个` }}
+      </el-button>
+    </div>
+
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['drymilk:drymilk:add']">新增</el-button>
@@ -106,6 +215,7 @@
         :total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
+        :page-sizes="[20,50,100,200, 500, 1000, 2000]"
         @pagination="getList"
     />
 
@@ -157,16 +267,23 @@
       </template>
     </el-dialog>
   </div>
+
 </template>
 
 <script setup name="Drymilk">
+<<<<<<< HEAD
 import { listDrymilk, getDrymilk, delDrymilk, addDrymilk, updateDrymilk } from "@/api/drymilk/drymilk"
 import { listUser } from "@/api/system/user";
 import axios from 'axios';
 import { getToken } from "@/utils/auth"; // 必须引入token
+=======
+import { listDrymilk, getDrymilk, delDrymilk, addDrymilk, updateDrymilk,searchEarNumbers} from "@/api/drymilk/drymilk"
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
 
 const { proxy } = getCurrentInstance()
-
+// 新增：耳号搜索相关状态
+const earNumberOptions = ref([])
+const earNumberLoading = ref(false)
 const drymilkList = ref([])
 const open = ref(false)
 const loading = ref(true)
@@ -176,6 +293,7 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
+<<<<<<< HEAD
 const dateRange = ref([])
 const sheepfoldOptions = ref([])
 const userOptions = ref([])
@@ -183,17 +301,31 @@ const userOptions = ref([])
 // 新增：耳号搜索相关变量
 const earNumberLoading = ref(false)
 const earNumberOptions = ref([])
+=======
+const pasteInput = ref('')
+const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
 
 const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
+<<<<<<< HEAD
     manageTags: null,     // 字符串字段，用于兼容
     manageTagsList: [],   // 数组字段，用于el-select多选
+=======
+    allEarNumbers: [],
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
     variety: null,
     status: null,
     tecahnician: null,
+<<<<<<< HEAD
+=======
+    createBy: null,
+    createTime: null
+
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
   },
   rules: {
     manageTags: [{ required: true, message: "耳号不能为空", trigger: "blur" }],
@@ -204,6 +336,7 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data)
 
+<<<<<<< HEAD
 /** 1. 远程搜索耳号方法 */
 function searchEarNumber(query) {
   if (query) {
@@ -228,6 +361,126 @@ function searchEarNumber(query) {
     });
   } else {
     earNumberOptions.value = [];
+=======
+/** 计算显示的耳号列表 */
+const displayedEarNumbers = computed(() => {
+  if (!queryParams.value.allEarNumbers || queryParams.value.allEarNumbers.length === 0) {
+    return []
+  }
+
+  // 如果展开或总数<=2，显示全部；否则只显示前2个
+  if (isExpanded.value || queryParams.value.allEarNumbers.length <= 1) {
+    return queryParams.value.allEarNumbers
+  } else {
+    return queryParams.value.allEarNumbers.slice(0, 1)
+  }
+})
+
+/** 切换展开/收起状态 */
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+/** 移除单个耳号（需要修改以处理展开状态下的索引） */
+function handleRemoveEarNumber(displayIndex) {
+  // 如果是收起状态，直接使用显示索引
+  // 如果是展开状态，需要找到实际索引
+  let actualIndex = displayIndex
+
+  if (!isExpanded.value && queryParams.value.allEarNumbers.length > 1) {
+    // 收起状态下，显示的是前2个，索引直接对应
+    actualIndex = displayIndex
+  }
+
+  queryParams.value.allEarNumbers.splice(actualIndex, 1)
+  proxy.$modal.msgSuccess('已移除该耳号')
+
+  // 如果删除后剩余<=2个，自动收起
+  if (queryParams.value.allEarNumbers.length <= 1) {
+    isExpanded.value = false
+  }
+}
+
+/** 清空所有耳号 */
+function clearAllEarNumbers() {
+  proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
+    queryParams.value.allEarNumbers = []
+    pasteInput.value = ''
+    earNumberOptions.value = []
+    isExpanded.value = false  // 重置展开状态
+    proxy.$modal.msgSuccess('已清空所有耳号')
+  }).catch(() => {})
+}
+
+
+/** 处理粘贴事件 */
+function handlePaste(event) {
+  // 延迟处理,确保粘贴内容已填入
+  nextTick(() => {
+    handlePasteSubmit()
+  })
+}
+
+/** 处理粘贴内容提交 */
+function handlePasteSubmit() {
+  if (!pasteInput.value || pasteInput.value.trim() === '') {
+    return
+  }
+
+  // 支持多种分隔符: 空格、换行、逗号、制表符
+  const separators = /[\s,，\n\r\t]+/
+  const earNumbers = pasteInput.value
+      .trim()
+      .split(separators)
+      .filter(item => item.trim() !== '')
+      .map(item => item.trim())
+
+  if (earNumbers.length === 0) {
+    return
+  }
+
+  // 去重并添加到已选列表
+  const existingSet = new Set(queryParams.value.allEarNumbers || [])
+  const newEarNumbers = []
+  const duplicates = []
+
+  earNumbers.forEach(earNumber => {
+    if (!existingSet.has(earNumber)) {
+      newEarNumbers.push(earNumber)
+      existingSet.add(earNumber)
+    } else {
+      duplicates.push(earNumber)
+    }
+  })
+
+  // 添加新耳号
+  if (newEarNumbers.length > 0) {
+    queryParams.value.allEarNumbers = [
+      ...(queryParams.value.allEarNumbers || []),
+      ...newEarNumbers
+    ]
+
+    const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
+        (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
+
+    proxy.$modal.msgSuccess(message)
+  } else if (duplicates.length > 0) {
+    proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
+  }
+
+  // 清空输入框
+  pasteInput.value = ''
+}
+
+/** 批量验证耳号(可选功能) */
+async function validateBatchEarNumbers(earNumbers) {
+  try {
+    // 可以调用后端批量验证接口
+    // 这里简化处理,仅在搜索时验证
+    console.log('待验证耳号:', earNumbers)
+  } catch (error) {
+    console.error('验证耳号失败:', error)
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
   }
 }
 
@@ -276,6 +529,43 @@ function cancel() {
   open.value = false
   reset()
 }
+/** 新增：远程搜索耳号（模糊查询） */
+function searchEarNumber(query) {
+  if (query !== '') {
+    earNumberLoading.value = true
+
+    const queries = query.trim().split(/[\s,，]+/).filter(q => q)
+
+    if (queries.length === 1) {
+      searchEarNumbers(query).then(response => {
+        earNumberOptions.value = response.data || []
+        earNumberLoading.value = false
+      }).catch(() => {
+        earNumberOptions.value = []
+        earNumberLoading.value = false
+      })
+    } else {
+      earNumberOptions.value = queries
+      earNumberLoading.value = false
+    }
+  } else {
+    earNumberOptions.value = []
+  }
+}
+
+/** 新增：耳号选择变化处理 */
+function handleEarNumberChange(value) {
+  queryParams.value.allEarNumbers = [...new Set(value)]
+  console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
+}
+
+/** 新增：移除单个耳号 */
+function removeEarNumber(earNumber) {
+  const index = queryParams.value.allEarNumbers.indexOf(earNumber)
+  if (index > -1) {
+    queryParams.value.allEarNumbers.splice(index, 1)
+  }
+}
 
 // 表单重置
 function reset() {
@@ -291,6 +581,7 @@ function reset() {
   proxy.resetForm("drymilkRef")
 }
 
+<<<<<<< HEAD
 // 搜索重置
 function resetQuery() {
   dateRange.value = []
@@ -301,11 +592,25 @@ function resetQuery() {
 }
 
 /** 搜索按钮操作 */
+=======
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
 function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
+<<<<<<< HEAD
+=======
+/** 重置按钮操作 - 修改 */
+function resetQuery() {
+  queryParams.value.allEarNumbers = []
+  earNumberOptions.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.id)
   single.value = selection.length != 1
@@ -320,6 +625,11 @@ function handleAdd() {
   title.value = "添加干奶记录"
 }
 
+<<<<<<< HEAD
+=======
+
+/** 修改按钮操作 */
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
 function handleUpdate(row) {
   reset()
   getSheepfoldList();
@@ -379,6 +689,59 @@ function handleExport() {
 
 // 初始化
 getList()
+<<<<<<< HEAD
 getSheepfoldList()
 getUserList()
-</script>
+</script>
+=======
+</script>
+
+<style scoped>
+/* 已选耳号展示区样式 */
+.selected-ear-numbers-display {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 8px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6;
+  border-radius: 3px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-track {
+  background-color: #f5f7fa;
+}
+
+.selected-ear-numbers-display .el-tag {
+  margin: 4px;
+  cursor: pointer;
+}
+
+.selected-ear-numbers-display .el-tag:hover {
+  opacity: 0.8;
+}
+
+/* 展开按钮样式 */
+.selected-ear-numbers-display .el-button--text {
+  padding: 0 8px;
+  font-size: 14px;
+  color: #409eff;
+}
+
+.selected-ear-numbers-display .el-button--text:hover {
+  color: #66b1ff;
+}
+</style>
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4

src/views/embryo/flush/index.vue

@@ -127,6 +127,7 @@
         :total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
+        :page-sizes="[20,50,100,200, 500, 1000, 2000]"
         @pagination="getList"
     />
 

src/views/feed/FeedStatistic/index.vue

@@ -201,7 +201,7 @@
   import { listFeedStatistic, getFeedStatistic, delFeedStatistic, addFeedStatistic, updateFeedStatistic, initFeedStatistic } from "@/api/feed/FeedStatistic"
   import { listFormulaManagement } from "@/api/feed/FormulaManagement"
   import { listSheepfold } from "@/api/produce/manage_sheep/trans_group.js";
-  import { listMaterial } from "@/api/feed/material"
+  import { listMaterial } from "@/api/feed/Material"
   import { ref } from "vue";
 
   const { proxy } = getCurrentInstance()

src/views/feed/FormulaManagement/index.vue

@@ -282,8 +282,8 @@
   import { listFormulaManagement, getFormulaManagement, delFormulaManagement, addFormulaManagement, updateFormulaManagement } from "@/api/feed/FormulaManagement"
   import { ref, reactive, toRefs, getCurrentInstance } from 'vue'
   import { listFormulaList, getFormulaList, delFormulaList, addFormulaList, updateFormulaList } from "@/api/feed/FormulaList"
-  import { listMaterial } from "@/api/feed/material"
+  import { listMaterial } from "@/api/feed/Material"
-  import { fa } from "element-plus/es/locales.mjs"
+
   const { proxy } = getCurrentInstance()
   const { pres_status } = proxy.useDict('pres_status')
   // Data and refs

src/views/feed/material/index.vue

@@ -131,7 +131,7 @@
 </template>
 
 <script setup name="Material">
-import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/feed/material"
+import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/feed/Material"
 
 const { proxy } = getCurrentInstance()
 const { material_type } = proxy.useDict('material_type')

src/views/fileManagement/sheep_file/index.vue

@@ -334,21 +334,6 @@
           <span>{{ parseTime(scope.row.weaningDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        v-if="columns['statusId'].visible"
-        label="羊只状态"
-        align="center"
-        prop="statusId"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">羊只状态</span>
-        </template>
-        <template #default="scope">
-          <dict-tag :options="sheep_status" :value="scope.row.statusId"/>
-        </template>
-      </el-table-column>
       <el-table-column
         v-if="columns['weaningWeight'].visible"
         label="断奶体重"
@@ -491,18 +476,6 @@
           <span style="font-weight: bold; color: #333;">受体id</span>
         </template>
       </el-table-column> -->
-      <el-table-column
-        v-if="columns['receptorManageTags'].visible"
-        label="受体耳号"
-        align="center"
-        prop="receptorManageTags"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">受体耳号</span>
-        </template>
-      </el-table-column>
       <!-- <el-table-column
         v-if="columns['fatherFatherId'].visible"
         label="祖父号id"
@@ -599,6 +572,18 @@
           <span style="font-weight: bold; color: #333;">外祖母耳号</span>
         </template>
       </el-table-column>
+      <el-table-column
+        v-if="columns['receptorManageTags'].visible"
+        label="受体耳号"
+        align="center"
+        prop="receptorManageTags"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">受体耳号</span>
+        </template>
+      </el-table-column>
       <el-table-column
         v-if="columns['matingDate'].visible"
         label="配种日期"
@@ -608,7 +593,7 @@
         sortable
       >
         <template #header>
-          <span style="font-weight: bold; color: #333;">配种日期</span>
+          <span style="font-weight: bold; color: #333;">最近配种日期</span>
         </template>
         <template #default="scope">
           <span>{{ parseTime(scope.row.matingDate, '{y}-{m}-{d}') }}</span>
@@ -623,7 +608,7 @@
         sortable
       >
         <template #header>
-          <span style="font-weight: bold; color: #333;">配种类型</span>
+          <span style="font-weight: bold; color: #333;">最近配种类型</span>
         </template>
         <template #default="scope">
           <dict-tag :options="breed_type" :value="scope.row.matingTypeId"/>
@@ -638,7 +623,7 @@
         sortable
       >
         <template #header>
-          <span style="font-weight: bold; color: #333;">孕检日期</span>
+          <span style="font-weight: bold; color: #333;">最近孕检日期</span>
         </template>
         <template #default="scope">
           <span>{{ parseTime(scope.row.pregDate, '{y}-{m}-{d}') }}</span>
@@ -653,7 +638,7 @@
         sortable
       >
         <template #header>
-          <span style="font-weight: bold; color: #333;">产羔日期</span>
+          <span style="font-weight: bold; color: #333;">最近产羔日期</span>
         </template>
         <template #default="scope">
           <span>{{ parseTime(scope.row.lambingDate, '{y}-{m}-{d}') }}</span>
@@ -894,7 +879,7 @@
           <span style="font-weight: bold; color: #333;">来源牧场</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         v-if="columns['updateBy'].visible"
         label="修改人"
         align="center"
@@ -947,6 +932,21 @@
         <template #default="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
+      </el-table-column> -->
+      <el-table-column
+        v-if="columns['statusId'].visible"
+        label="羊只状态"
+        align="center"
+        prop="statusId"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">羊只状态</span>
+        </template>
+        <template #default="scope">
+          <dict-tag :options="sheep_status" :value="scope.row.statusId"/>
+        </template>
       </el-table-column>
       <!-- <el-table-column
         label="操作"
@@ -995,7 +995,6 @@
           <el-checkbox label="parity">胎次</el-checkbox>
           <el-checkbox label="birthWeight">出生体重</el-checkbox>
           <el-checkbox label="weaningDate">断奶日期</el-checkbox>
-          <el-checkbox label="statusId">羊只状态</el-checkbox>
           <el-checkbox label="weaningWeight">断奶体重</el-checkbox>
           <el-checkbox label="currentWeight">当前体重</el-checkbox>\
           <el-checkbox label="weaningDayAge">断奶日龄</el-checkbox>
@@ -1007,7 +1006,6 @@
           <!-- <el-checkbox label="bsMotherId">母号id</el-checkbox> -->
           <el-checkbox label="motherManageTags">母亲耳号</el-checkbox>
           <!-- <el-checkbox label="receptorId">受体id</el-checkbox> -->
-          <el-checkbox label="receptorManageTags">受体耳号</el-checkbox>
           <!-- <el-checkbox label="fatherFatherId">祖父号id</el-checkbox> -->
           <el-checkbox label="grandfatherManageTags">祖父耳号</el-checkbox>
           <!-- <el-checkbox label="fatherMotherId">祖母号id</el-checkbox> -->
@@ -1016,6 +1014,7 @@
           <el-checkbox label="maternalGrandfatherManageTags">外祖父耳号</el-checkbox>
           <!-- <el-checkbox label="motherId">外祖母号id</el-checkbox> -->
           <el-checkbox label="maternalGrandmotherManageTags">外祖母耳号</el-checkbox>
+          <el-checkbox label="receptorManageTags">受体耳号</el-checkbox>
           <el-checkbox label="matingDate">配种日期</el-checkbox>
           <el-checkbox label="matingTypeId">配种类型</el-checkbox>
           <el-checkbox label="pregDate">孕检日期</el-checkbox>
@@ -1038,10 +1037,11 @@
           <el-checkbox label="sourceDate">入群日期</el-checkbox>
           <!-- <el-checkbox label="sourceRanchId">来源牧场id</el-checkbox> -->
           <el-checkbox label="sourceRanch">来源牧场</el-checkbox>
-          <el-checkbox label="updateBy">修改人</el-checkbox>
+          <!-- <el-checkbox label="updateBy">修改人</el-checkbox>
           <el-checkbox label="updateTime">修改日期</el-checkbox>
           <el-checkbox label="createBy">创建人</el-checkbox>
-          <el-checkbox label="createTime">创建日期</el-checkbox>
+          <el-checkbox label="createTime">创建日期</el-checkbox> -->
+          <el-checkbox label="statusId">羊只状态</el-checkbox>
         </el-checkbox-group>
       </div>
       <div style="margin-top: 20px; display: flex; justify-content: space-between; align-items: center;">
@@ -1085,8 +1085,36 @@ const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
 const columnDialogVisible = ref(false)
+// const selectedColumns = ref([
+//   'id', 'bsManageTags', 'ranchId', 'drRanch', 'sheepfoldId', 'sheepfoldName', 'electronicTags', 'varietyId', 'variety', 'family', 'name', 'gender', 'birthday', 'dayAge', 'monthAge', 'parity', 'birthWeight', 'weaningDate', 'statusId', 'weaningWeight', 'currentWeight','weaningDayAge', 'weaningDailyGain','breedStatusId', 'breed', 'bsFatherId', 'fatherManageTags', 'bsMotherId', 'motherManageTags', 'receptorId', 'receptorManageTags', 'fatherFatherId', 'grandfatherManageTags', 'fatherMotherId', 'grandmotherManageTags', 'fatherId', 'maternalGrandfatherManageTags', 'motherId', 'maternalGrandmotherManageTags', 'matingDate', 'matingTypeId', 'pregDate', 'lambingDate', 'lambingDay', 'matingDay', 'gestationDay', 'expectedDate', 'postLambingDay', 'lactationDay', 'anestrousDay', 'matingCounts', 'matingTotal', 'miscarriageCounts', 'comment', 'controlled', 'body', 'breast', 'source', 'sourceDate', 'sourceRanchId', 'sourceRanch', 'updateBy', 'updateTime', 'createBy', 'createTime'
+// ])
+
+// 在 setup 中修改 selectedColumns 的默认值
 const selectedColumns = ref([
-  'id', 'bsManageTags', 'ranchId', 'drRanch', 'sheepfoldId', 'sheepfoldName', 'electronicTags', 'varietyId', 'variety', 'family', 'name', 'gender', 'birthday', 'dayAge', 'monthAge', 'parity', 'birthWeight', 'weaningDate', 'statusId', 'weaningWeight', 'currentWeight','weaningDayAge', 'weaningDailyGain','breedStatusId', 'breed', 'bsFatherId', 'fatherManageTags', 'bsMotherId', 'motherManageTags', 'receptorId', 'receptorManageTags', 'fatherFatherId', 'grandfatherManageTags', 'fatherMotherId', 'grandmotherManageTags', 'fatherId', 'maternalGrandfatherManageTags', 'motherId', 'maternalGrandmotherManageTags', 'matingDate', 'matingTypeId', 'pregDate', 'lambingDate', 'lambingDay', 'matingDay', 'gestationDay', 'expectedDate', 'postLambingDay', 'lactationDay', 'anestrousDay', 'matingCounts', 'matingTotal', 'miscarriageCounts', 'comment', 'controlled', 'body', 'breast', 'source', 'sourceDate', 'sourceRanchId', 'sourceRanch', 'updateBy', 'updateTime', 'createBy', 'createTime'
+    'bsManageTags', // 耳号
+    'drRanch',      // 牧场名称
+    'sheepfoldName', // 羊舍名称
+    'electronicTags', // 电子耳号
+    'variety',      // 品种
+    'family',        //家系
+    'name',         // 羊只类型
+    'gender',       // 性别
+    'birthday',     // 出生日期
+    'dayAge',       // 日龄
+    'monthAge',     //月龄
+    'parity',       //胎次
+    'birthWeight',  //出生体重
+    'weaningDate',  //断奶日期
+    'weaningWeight',//断奶体重
+    'currentWeight', // 当前体重
+    'breed',        // 繁殖状态
+    'fatherManageTags', // 父亲耳号
+    'motherManageTags', // 母亲耳号
+    'grandfatherManageTags',//祖父
+    'grandmotherManageTags',//祖母
+    'maternalGrandfatherManageTags',//外祖父
+    'maternalGrandmotherManageTags',//外祖母
+    'comment'//备注
 ])
 const isAllSelected = ref(false)
 const columns = reactive({
@@ -1380,10 +1408,38 @@ function confirmColumnSettings() {
   columnDialogVisible.value = false
 }
 
-// 重置列设置
+// 修改重置函数
 function resetColumnSettings() {
+  // 只重置为默认的核心字段
   selectedColumns.value = [
-    'id', 'bsManageTags', 'ranchId', 'drRanch', 'sheepfoldId', 'sheepfoldName', 'electronicTags', 'varietyId', 'variety', 'family', 'name', 'gender', 'birthday', 'dayAge', 'monthAge', 'parity', 'birthWeight', 'weaningDate', 'statusId', 'weaningWeight', 'currentWeight','weaningDayAge', 'weaningDailyGain','breedStatusId', 'breed', 'bsFatherId', 'fatherManageTags', 'bsMotherId', 'motherManageTags', 'receptorId', 'receptorManageTags', 'fatherFatherId', 'grandfatherManageTags', 'fatherMotherId', 'grandmotherManageTags', 'fatherId', 'maternalGrandfatherManageTags', 'motherId', 'maternalGrandmotherManageTags', 'matingDate', 'matingTypeId', 'pregDate', 'lambingDate', 'lambingDay', 'matingDay', 'gestationDay', 'expectedDate', 'postLambingDay', 'lactationDay', 'anestrousDay', 'matingCounts', 'matingTotal', 'miscarriageCounts', 'comment', 'controlled', 'body', 'breast', 'source', 'sourceDate', 'sourceRanchId', 'sourceRanch', 'updateBy', 'updateTime', 'createBy', 'createTime'
+    'bsManageTags', // 耳号
+    'drRanch',      // 牧场名称
+    'sheepfoldName', // 羊舍名称
+    'electronicTags', // 电子耳号
+    'variety',      // 品种
+    'family',        //家系
+    'name',         // 羊只类型
+    'gender',       // 性别
+    'birthday',     // 出生日期
+    'dayAge',       // 日龄
+    'monthAge',     //月龄
+    'parity',       //胎次
+    'birthWeight',  //出生体重
+    'weaningDate',  //断奶日期
+    'weaningWeight',//断奶体重
+    'currentWeight', // 当前体重
+    'breed',        // 繁殖状态
+    'fatherManageTags', // 父亲耳号
+    'motherManageTags', // 母亲耳号
+    'grandfatherManageTags',//祖父
+    'grandmotherManageTags',//祖母
+    'maternalGrandfatherManageTags',//外祖父
+    'maternalGrandmotherManageTags',//外祖母
+    'comment'//备注
+
+
+
+
   ]
   updateColumnVisibility()
   localStorage.setItem('selectedColumns', JSON.stringify(selectedColumns.value))

src/views/frozen/embryo/index.vue

@@ -17,6 +17,14 @@
         <el-date-picker v-model="daterangeOutDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" style="width: 100%" />
       </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="全部状态" clearable style="width:150px">
+          <el-option label="正常" value="正常" />
+          <el-option label="销售" value="销售" />
+          <el-option label="自用" value="自用" />
+          <el-option label="废弃" value="废弃" />
+        </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>
@@ -69,7 +77,16 @@
           {{ scope.row.sexCtl === 1 ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <el-tag :type="scope.row.status === '正常' ? 'primary'
+            : scope.row.status === '销售' ? 'success'
+              : scope.row.status === '自用' ? 'warning'
+                : 'danger'">
+            {{ scope.row.status }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="技术员" align="center" prop="tech" />
       <el-table-column label="液氮罐ID" align="center" prop="tankId" />
       <el-table-column label="提桶ID" align="center" prop="bucketId" />
@@ -537,12 +554,12 @@ function submitDiscard() {
   })
 }
 function checkCodeUnique() {
-  if (!form.value.code) return 
+  if (!form.value.code) return
   request.get('/frozen/embryo/checkCode', { params: { code: form.value.code } })
     .then(res => {
-      if (res.data) {                  
+      if (res.data) {
         proxy.$modal.msgError('胚胎编号已存在，请重新输入')
-        form.value.code = '' 
+        form.value.code = ''
         proxy.$refs.embryoRef.validateField('code')
       }
     })

src/views/frozen/sperm/index.vue

@@ -17,6 +17,14 @@
         <el-date-picker v-model="daterangeOutDt" type="daterange" range-separator="-" start-placeholder="开始日期"
           end-placeholder="结束日期" value-format="YYYY-MM-DD" clearable style="width: 100%" />
       </el-form-item>
+      <el-form-item label="状态" prop="stat">
+        <el-select v-model="queryParams.stat" placeholder="全部状态" clearable style="width:150px">
+          <el-option label="正常" value="正常" />
+          <el-option label="销售" value="销售" />
+          <el-option label="自用" value="自用" />
+          <el-option label="废弃" value="废弃" />
+        </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>
@@ -62,7 +70,16 @@
           {{ scope.row.sexCtl === 1 ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="stat" />
+      <el-table-column label="状态" align="center" prop="stat">
+        <template #default="scope">
+          <el-tag :type="scope.row.stat === '正常' ? 'primary'
+            : scope.row.stat === '销售' ? 'success'
+              : scope.row.stat === '自用' ? 'warning'
+                : 'danger'">
+            {{ scope.row.stat }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="技术员" align="center" prop="tech" />
       <el-table-column label="液氮罐ID" align="center" prop="tankId" />
       <el-table-column label="提桶ID" align="center" prop="bucketId" />

src/views/miscarriage/miscarriage/index.vue

@@ -1,13 +1,101 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="耳号" prop="bsManageTags">
+      <el-form-item label="耳号" prop="allEarNumbers">
-        <el-input
+        <div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
-            v-model="queryParams.bsManageTags"
+          <!-- 主选择器：不显示已选标签 -->
-            placeholder="请输入羊只耳号"
+          <el-select
-            clearable
+              v-model="queryParams.allEarNumbers"
-            @keyup.enter="handleQuery"
+              multiple
-        />
+              filterable
+              remote
+              reserve-keyword
+              placeholder="输入耳号搜索"
+              :remote-method="searchEarNumber"
+              :loading="earNumberLoading"
+              allow-create
+              default-first-option
+              collapse-tags
+              :max-collapse-tags="0"
+              style="width: 300px"
+              @change="handleEarNumberChange"
+          >
+            <el-option
+                v-for="item in earNumberOptions"
+                :key="item"
+                :label="item"
+                :value="item"
+            />
+          </el-select>
+
+          <!-- 辅助粘贴输入框 -->
+          <el-input
+              v-model="pasteInput"
+              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.allEarNumbers && queryParams.allEarNumbers.length > 0"
+              type="info"
+              effect="plain"
+              size="large"
+          >
+            已选: {{ queryParams.allEarNumbers.length }} 个
+          </el-tag>
+
+          <!-- 清空按钮 -->
+          <el-button
+              type="danger"
+              plain
+              @click="clearAllEarNumbers"
+              v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+              :icon="Delete"
+          >
+            清空全部
+          </el-button>
+        </div>
+
+        <!-- 已选耳号展示区域（默认显示2个，可展开） -->
+        <div
+            v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+            class="selected-ear-numbers-display"
+            style="margin-top: 10px;"
+        >
+          <!-- 显示前2个或全部耳号 -->
+          <el-tag
+              v-for="(tag, index) in displayedEarNumbers"
+              :key="tag"
+              closable
+              @close="handleRemoveEarNumber(tag)"
+              style="margin: 4px;"
+              type="success"
+          >
+            {{ tag }}
+          </el-tag>
+
+          <!-- 展开/收起按钮 -->
+          <el-button
+              v-if="queryParams.allEarNumbers.length > defaultShowCount"
+              type="primary"
+              link
+              @click="toggleExpand"
+              style="margin-left: 8px;"
+          >
+            {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.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="variety">
         <el-input
@@ -285,8 +373,31 @@ import {
   addMiscarriage,
   updateMiscarriage,
   getSheepInfo,
-  getReasonOptions
+  getReasonOptions, searchEarNumbers
 } from "@/api/miscarriage/miscarriage"
+import { ref, computed, nextTick } from 'vue'
+import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
+
+// 响应式数据
+const pasteInput = ref('')           // 批量粘贴输入框
+const earNumberOptions = ref([])     // 耳号下拉选项
+const earNumberLoading = ref(false)  // 耳号加载状态
+const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+const defaultShowCount = 2           // 默认显示的耳号数量
+
+// 计算属性：控制显示的耳号列表
+const displayedEarNumbers = computed(() => {
+  if (!queryParams.value.allEarNumbers || queryParams.value.allEarNumbers.length === 0) {
+    return []
+  }
+
+  // 如果展开或总数<=2，显示全部；否则只显示前2个
+  if (isExpanded.value || queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    return queryParams.value.allEarNumbers
+  } else {
+    return queryParams.value.allEarNumbers.slice(0, defaultShowCount)
+  }
+})
 
 const {proxy} = getCurrentInstance()
 
@@ -381,7 +492,125 @@ function getList() {
     loading.value = false
   })
 }
+/** 处理粘贴事件 */
+function handlePaste(event) {
+  nextTick(() => {
+    handlePasteSubmit()
+  })
+}
 
+/** 处理粘贴内容提交 */
+function handlePasteSubmit() {
+  if (!pasteInput.value || pasteInput.value.trim() === '') {
+    return
+  }
+
+  // 支持多种分隔符: 空格、换行、逗号、制表符
+  const separators = /[\s,，\n\r\t]+/
+  const earNumbers = pasteInput.value
+      .trim()
+      .split(separators)
+      .filter(item => item.trim() !== '')
+      .map(item => item.trim())
+
+  if (earNumbers.length === 0) {
+    return
+  }
+
+  // 去重并添加到已选列表
+  const existingSet = new Set(queryParams.value.allEarNumbers || [])
+  const newEarNumbers = []
+  const duplicates = []
+
+  earNumbers.forEach(earNumber => {
+    if (!existingSet.has(earNumber)) {
+      newEarNumbers.push(earNumber)
+      existingSet.add(earNumber)
+    } else {
+      duplicates.push(earNumber)
+    }
+  })
+
+  // 添加新耳号
+  if (newEarNumbers.length > 0) {
+    queryParams.value.allEarNumbers = [
+      ...(queryParams.value.allEarNumbers || []),
+      ...newEarNumbers
+    ]
+
+    const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
+        (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
+
+    proxy.$modal.msgSuccess(message)
+  } else if (duplicates.length > 0) {
+    proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
+  }
+
+  // 清空输入框
+  pasteInput.value = ''
+}
+
+/** 远程搜索耳号 */
+function searchEarNumber(query) {
+  if (query !== '') {
+    earNumberLoading.value = true
+
+    const queries = query.trim().split(/[\s,，]+/).filter(q => q)
+
+    if (queries.length === 1) {
+      // 单个耳号模糊搜索
+      searchEarNumbers(query).then(response => {
+        earNumberOptions.value = response.data || []
+        earNumberLoading.value = false
+      }).catch(() => {
+        earNumberOptions.value = []
+        earNumberLoading.value = false
+      })
+    } else {
+      // 多个耳号直接作为选项
+      earNumberOptions.value = queries
+      earNumberLoading.value = false
+    }
+  } else {
+    earNumberOptions.value = []
+  }
+}
+
+/** 耳号选择变化处理 */
+function handleEarNumberChange(value) {
+  queryParams.value.allEarNumbers = [...new Set(value)]
+  console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
+}
+
+/** 切换展开/收起状态 */
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+/** 移除单个耳号 */
+function handleRemoveEarNumber(tag) {
+  const index = queryParams.value.allEarNumbers.indexOf(tag)
+  if (index > -1) {
+    queryParams.value.allEarNumbers.splice(index, 1)
+    proxy.$modal.msgSuccess('已移除该耳号')
+  }
+
+  // 如果删除后剩余<=2个，自动收起
+  if (queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    isExpanded.value = false
+  }
+}
+
+/** 清空所有耳号 */
+function clearAllEarNumbers() {
+  proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
+    queryParams.value.allEarNumbers = []
+    pasteInput.value = ''
+    earNumberOptions.value = []
+    isExpanded.value = false  // 重置展开状态
+    proxy.$modal.msgSuccess('已清空所有耳号')
+  }).catch(() => {})
+}
 /** 获取流产原因选项 */
 function getReasonOptionsList() {
   getReasonOptions().then(response => {
@@ -404,6 +633,7 @@ function reset() {
     datetime: null,
     comment: null,
     technician: null,
+    allEarNumbers: [],  // ✅ 添加这一行！
     reason: null,
     exposeType: null,
     status: null,
@@ -422,6 +652,9 @@ function handleQuery() {
 
 /** 重置按钮操作 */
 function resetQuery() {
+  queryParams.value.allEarNumbers = []  // ✅ 添加这一行
+  earNumberOptions.value = []            // ✅ 添加这一行
+  isExpanded.value = false               // ✅ 添加这一行
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -583,4 +816,47 @@ function handleExport() {
 
 getList()
 getReasonOptionsList()
-</script>
+</script>
+
+<style scoped>
+/* 已选耳号展示区样式 */
+.selected-ear-numbers-display {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 8px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6;
+  border-radius: 3px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-track {
+  background-color: #f5f7fa;
+}
+
+.selected-ear-numbers-display .el-tag {
+  margin: 4px;
+  cursor: pointer;
+}
+
+.selected-ear-numbers-display .el-tag:hover {
+  opacity: 0.8;
+}
+
+/* 隐藏 el-select 的下拉箭头（可选） */
+:deep(.el-select__caret) {
+  display: none;
+}
+</style>

src/views/sheep_death/death/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+<<<<<<< HEAD
       
       <el-form-item label="管理耳号" prop="manageTagsList">
         <el-select
@@ -24,6 +25,103 @@
               :value="item"
           />
         </el-select>
+=======
+      <el-form-item label="耳号" prop="allEarNumbers">
+        <div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
+          <!-- 主选择器：不显示已选标签 -->
+          <el-select
+              v-model="queryParams.allEarNumbers"
+              multiple
+              filterable
+              remote
+              reserve-keyword
+              placeholder="输入耳号搜索"
+              :remote-method="searchEarNumber"
+              :loading="earNumberLoading"
+              allow-create
+              default-first-option
+              collapse-tags
+              :max-collapse-tags="0"
+              style="width: 300px"
+              @change="handleEarNumberChange"
+          >
+            <el-option
+                v-for="item in earNumberOptions"
+                :key="item"
+                :label="item"
+                :value="item"
+            />
+          </el-select>
+
+          <!-- 辅助粘贴输入框 -->
+          <el-input
+              v-model="pasteInput"
+              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.allEarNumbers && queryParams.allEarNumbers.length > 0"
+              type="info"
+              effect="plain"
+              size="large"
+          >
+            已选: {{ queryParams.allEarNumbers.length }} 个
+          </el-tag>
+
+          <!-- 清空按钮 -->
+          <el-button
+              type="danger"
+              plain
+              @click="clearAllEarNumbers"
+              v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+              :icon="Delete"
+          >
+            清空全部
+          </el-button>
+        </div>
+
+        <!-- 已选耳号展示区域（默认显示2个，可展开） -->
+        <div
+            v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
+            class="selected-ear-numbers-display"
+            style="margin-top: 10px;"
+        >
+          <!-- 显示前2个或全部耳号 -->
+          <el-tag
+              v-for="(tag, index) in displayedEarNumbers"
+              :key="tag"
+              closable
+              @close="handleRemoveEarNumber(tag)"
+              style="margin: 4px;"
+              type="success"
+          >
+            {{ tag }}
+          </el-tag>
+
+          <!-- 展开/收起按钮 -->
+          <el-button
+              v-if="queryParams.allEarNumbers.length > defaultShowCount"
+              type="primary"
+              link
+              @click="toggleExpand"
+              style="margin-left: 8px;"
+          >
+            {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.length - defaultShowCount} 个` }}
+            <el-icon class="el-icon--right">
+              <component :is="isExpanded ? ArrowUp : ArrowDown" />
+            </el-icon>
+          </el-button>
+        </div>
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
       </el-form-item>
 
       <el-form-item label="死亡日期" prop="deathDateRange">
@@ -243,6 +341,7 @@
         :total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
+        :page-sizes="[20,50,100,200, 500, 1000, 2000]"
         @pagination="getList"
     />
 
@@ -351,6 +450,7 @@
 
 <script setup name="Death">
 import {
+<<<<<<< HEAD
   listDeath, 
   getDeath, 
   delDeath, 
@@ -362,7 +462,40 @@ import {
   searchTechnician,
   searchHandler
 } from "@/api/sheep_death/death"
+=======
+  listDeath,
+  getDeath,
+  delDeath,
+  addDeath,
+  updateDeath,
+  getSheepInfo,
+  getDiseaseTree,
+  searchEarNumbers
+} from "@/api/sheep_death/death"
+import { ref, computed, nextTick } from 'vue'
+import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
 
+// 响应式数据
+const pasteInput = ref('')           // 批量粘贴输入框
+const earNumberOptions = ref([])     // 耳号下拉选项
+const earNumberLoading = ref(false)  // 耳号加载状态
+const isExpanded = ref(false)        // 控制耳号展开/折叠状态
+const defaultShowCount = 2           // 默认显示的耳号数量
+
+// 计算属性：控制显示的耳号列表
+const displayedEarNumbers = computed(() => {
+  if (!queryParams.value.allEarNumbers || queryParams.value.allEarNumbers.length === 0) {
+    return []
+  }
+
+  // 如果展开或总数<=2，显示全部；否则只显示前2个
+  if (isExpanded.value || queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    return queryParams.value.allEarNumbers
+  } else {
+    return queryParams.value.allEarNumbers.slice(0, defaultShowCount)
+  }
+})
 const {proxy} = getCurrentInstance()
 // 获取字典数据
 const { sys_sheep_type } = proxy.useDict("sys_sheep_type");
@@ -413,7 +546,125 @@ const data = reactive({
 })
 
 const {queryParams, form, rules} = toRefs(data)
+/** 处理粘贴事件 */
+function handlePaste(event) {
+  nextTick(() => {
+    handlePasteSubmit()
+  })
+}
 
+/** 处理粘贴内容提交 */
+function handlePasteSubmit() {
+  if (!pasteInput.value || pasteInput.value.trim() === '') {
+    return
+  }
+
+  // 支持多种分隔符: 空格、换行、逗号、制表符
+  const separators = /[\s,，\n\r\t]+/
+  const earNumbers = pasteInput.value
+      .trim()
+      .split(separators)
+      .filter(item => item.trim() !== '')
+      .map(item => item.trim())
+
+  if (earNumbers.length === 0) {
+    return
+  }
+
+  // 去重并添加到已选列表
+  const existingSet = new Set(queryParams.value.allEarNumbers || [])
+  const newEarNumbers = []
+  const duplicates = []
+
+  earNumbers.forEach(earNumber => {
+    if (!existingSet.has(earNumber)) {
+      newEarNumbers.push(earNumber)
+      existingSet.add(earNumber)
+    } else {
+      duplicates.push(earNumber)
+    }
+  })
+
+  // 添加新耳号
+  if (newEarNumbers.length > 0) {
+    queryParams.value.allEarNumbers = [
+      ...(queryParams.value.allEarNumbers || []),
+      ...newEarNumbers
+    ]
+
+    const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
+        (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
+
+    proxy.$modal.msgSuccess(message)
+  } else if (duplicates.length > 0) {
+    proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
+  }
+
+  // 清空输入框
+  pasteInput.value = ''
+}
+
+/** 远程搜索耳号 */
+function searchEarNumber(query) {
+  if (query !== '') {
+    earNumberLoading.value = true
+
+    const queries = query.trim().split(/[\s,，]+/).filter(q => q)
+
+    if (queries.length === 1) {
+      // 单个耳号模糊搜索
+      searchEarNumbers(query).then(response => {
+        earNumberOptions.value = response.data || []
+        earNumberLoading.value = false
+      }).catch(() => {
+        earNumberOptions.value = []
+        earNumberLoading.value = false
+      })
+    } else {
+      // 多个耳号直接作为选项
+      earNumberOptions.value = queries
+      earNumberLoading.value = false
+    }
+  } else {
+    earNumberOptions.value = []
+  }
+}
+
+/** 耳号选择变化处理 */
+function handleEarNumberChange(value) {
+  queryParams.value.allEarNumbers = [...new Set(value)]
+  console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
+}
+
+/** 切换展开/收起状态 */
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+/** 移除单个耳号 */
+function handleRemoveEarNumber(tag) {
+  const index = queryParams.value.allEarNumbers.indexOf(tag)
+  if (index > -1) {
+    queryParams.value.allEarNumbers.splice(index, 1)
+    proxy.$modal.msgSuccess('已移除该耳号')
+  }
+
+  // 如果删除后剩余<=2个，自动收起
+  if (queryParams.value.allEarNumbers.length <= defaultShowCount) {
+    isExpanded.value = false
+  }
+}
+
+/** 清空所有耳号 */
+function clearAllEarNumbers() {
+  proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
+    queryParams.value.allEarNumbers = []
+    pasteInput.value = ''
+    earNumberOptions.value = []
+    isExpanded.value = false  // 重置展开状态
+    proxy.$modal.msgSuccess('已清空所有耳号')
+  }).catch(() => {})
+}
 /** 查询羊只死淘记录列表 */
 function getList() {
   loading.value = true
@@ -525,6 +776,7 @@ function reset() {
     diseaseSubtypeId: null,
     disposalDirection: null,
     technician: null,
+    allEarNumbers: [],  // 🔥 必须添加
     handler: null,
     workGroup: null,
     comment: null,
@@ -546,6 +798,7 @@ function handleQuery() {
 
 /** 重置按钮操作 */
 function resetQuery() {
+<<<<<<< HEAD
   // 手动清空数组类型的查询条件
   queryParams.value.manageTagsList = []
   queryParams.value.sheepTypeList = []
@@ -554,6 +807,11 @@ function resetQuery() {
   queryParams.value.workGroupList = []
   queryParams.value.deathDateRange = []
   
+=======
+  queryParams.value.allEarNumbers = []  // ✅ 添加这一行
+  earNumberOptions.value = []            // ✅ 添加这一行
+  isExpanded.value = false               // ✅ 添加这一行
+>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -640,4 +898,44 @@ getList()
 </script>
 
 <style scoped>
+/* 已选耳号展示区样式 */
+.selected-ear-numbers-display {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 8px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  border: 1px dashed #dcdfe6;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-thumb {
+  background-color: #dcdfe6;
+  border-radius: 3px;
+}
+
+.selected-ear-numbers-display::-webkit-scrollbar-track {
+  background-color: #f5f7fa;
+}
+
+.selected-ear-numbers-display .el-tag {
+  margin: 4px;
+  cursor: pointer;
+}
+
+.selected-ear-numbers-display .el-tag:hover {
+  opacity: 0.8;
+}
+
+/* 隐藏 el-select 的下拉箭头（可选） */
+:deep(.el-select__caret) {
+  display: none;
+}
 </style>

src/views/system/dept/index.vue

@@ -2,22 +2,13 @@
    <div class="app-container">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
          <el-form-item label="部门名称" prop="deptName">
-            <el-input
+            <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable style="width: 200px"
-               v-model="queryParams.deptName"
+               @keyup.enter="handleQuery" />
-               placeholder="请输入部门名称"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
          </el-form-item>
          <el-form-item label="状态" prop="status">
             <el-select v-model="queryParams.status" placeholder="部门状态" clearable style="width: 200px">
-               <el-option
+               <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
-                  v-for="dict in sys_normal_disable"
+                  :value="dict.value" />
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
             </el-select>
          </el-form-item>
          <el-form-item>
@@ -28,50 +19,33 @@
 
       <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
-            <el-button
+            <el-button type="primary" plain icon="Plus" @click="handleAdd"
-               type="primary"
+               v-hasPermi="['system:dept:add']">新增</el-button>
-               plain
-               icon="Plus"
-               @click="handleAdd"
-               v-hasPermi="['system:dept:add']"
-            >新增</el-button>
          </el-col>
          <el-col :span="1.5">
-            <el-button
+            <el-button type="info" plain icon="Sort" @click="toggleExpandAll">展开/折叠</el-button>
-               type="info"
-               plain
-               icon="Sort"
-               @click="toggleExpandAll"
-            >展开/折叠</el-button>
          </el-col>
          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
-      <el-table
+      <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId"
-         v-if="refreshTable"
+         :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
-         v-loading="loading"
+         <el-table-column prop="deptName" label="部门名称" ></el-table-column>
-         :data="deptList"
+         <el-table-column prop="ranchName" label="牧场名称"></el-table-column>
-         row-key="deptId"
+         <el-table-column prop="orderNum" label="排序"></el-table-column>
-         :default-expand-all="isExpandAll"
+         <el-table-column prop="status" label="状态">
-         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      >
-         <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-         <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
-         <el-table-column prop="status" label="状态" width="100">
             <template #default="scope">
                <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
             </template>
          </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime" width="200">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-         </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']">修改</el-button>
+               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-               <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
+                  v-hasPermi="['system:dept:edit']">修改</el-button>
-               <el-button v-if="scope.row.parentId != 0" link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
+               <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)"
+                  v-hasPermi="['system:dept:add']">新增</el-button>
+               <el-button v-if="scope.row.parentId != 0" link type="primary" icon="Delete"
+                  @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
             </template>
          </el-table-column>
       </el-table>
@@ -82,14 +56,15 @@
             <el-row>
                <el-col :span="24" v-if="form.parentId !== 0">
                   <el-form-item label="上级部门" prop="parentId">
-                     <el-tree-select
+                     <el-tree-select v-model="form.parentId" :data="deptOptions"
-                        v-model="form.parentId"
+                        :props="{ value: 'deptId', label: 'deptName', children: 'children' }" value-key="deptId"
-                        :data="deptOptions"
+                        placeholder="选择上级部门" check-strictly />
-                        :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
+                  </el-form-item>
-                        value-key="deptId"
+               </el-col>
-                        placeholder="选择上级部门"
+               <!-- 修改：当新增且上级部门为根部门时显示 -->
-                        check-strictly
+               <el-col :span="24" v-if="showRanchNameInput">
-                     />
+                  <el-form-item label="羊场名称" prop="ranchName">
+                     <el-input v-model="form.ranchName" placeholder="请输入羊场名称" maxlength="50" />
                   </el-form-item>
                </el-col>
                <el-col :span="12">
@@ -120,11 +95,8 @@
                <el-col :span="12">
                   <el-form-item label="部门状态">
                      <el-radio-group v-model="form.status">
-                        <el-radio
+                        <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
-                           v-for="dict in sys_normal_disable"
+                           }}</el-radio>
-                           :key="dict.value"
-                           :value="dict.value"
-                        >{{ dict.label }}</el-radio>
                      </el-radio-group>
                   </el-form-item>
                </el-col>
@@ -156,128 +128,160 @@ const isExpandAll = ref(true)
 const refreshTable = ref(true)
 
 const data = reactive({
-  form: {},
+   form: {},
-  queryParams: {
+   queryParams: {
-    deptName: undefined,
+      deptName: undefined,
-    status: undefined
+      status: undefined
-  },
+   },
-  rules: {
+   rules: {
-    parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
+      parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
-    deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
+      deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
-    orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
+      orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
-    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+      email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
-    phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+      phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
-  },
+      // 羊场名称非必填，如需必填添加规则
+      ranchName: [{ required: false, message: "请输入羊场名称", trigger: "blur" }]
+   },
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
+// 计算属性：是否显示羊场名称输入框
+// 条件：1. 新增模式（无deptId） 2. 上级部门为根部门（所选部门的parentId为0）
+const showRanchNameInput = computed(() => {
+   // 编辑模式不显示
+   if (form.value.deptId !== undefined) return false
+
+   // 新增模式：如果没有选择上级（parentId为undefined或0），或者是根部门的直接上级
+   if (!form.value.parentId) {
+      // 未选择上级或上级为0（根），通常这种情况视为添加根部门，显示羊场名称
+      return true
+   }
+
+   // 从部门树中查找所选上级部门的信息
+   const findNode = (tree, id) => {
+      for (let node of tree) {
+         if (node.deptId === id) return node
+         if (node.children && node.children.length > 0) {
+            const found = findNode(node.children, id)
+            if (found) return found
+         }
+      }
+      return null
+   }
+
+   const parentNode = findNode(deptOptions.value, form.value.parentId)
+   // 如果找到父节点，且其父ID为0，说明选择的是根部门（一级部门）
+   return parentNode && parentNode.parentId === 0
+})
+
 /** 查询部门列表 */
 function getList() {
-  loading.value = true
+   loading.value = true
-  listDept(queryParams.value).then(response => {
+   listDept(queryParams.value).then(response => {
-    deptList.value = proxy.handleTree(response.data, "deptId")
+      deptList.value = proxy.handleTree(response.data, "deptId")
-    loading.value = false
+      loading.value = false
-  })
+   })
 }
 
 /** 取消按钮 */
 function cancel() {
-  open.value = false
+   open.value = false
-  reset()
+   reset()
 }
 
 /** 表单重置 */
 function reset() {
-  form.value = {
+   form.value = {
-    deptId: undefined,
+      deptId: undefined,
-    parentId: undefined,
+      parentId: undefined,
-    deptName: undefined,
+      deptName: undefined,
-    orderNum: 0,
+      orderNum: 0,
-    leader: undefined,
+      leader: undefined,
-    phone: undefined,
+      phone: undefined,
-    email: undefined,
+      email: undefined,
-    status: "0"
+      status: "0",
-  }
+      ranchName: undefined  // 重置羊场名称
-  proxy.resetForm("deptRef")
+   }
+   proxy.resetForm("deptRef")
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  getList()
+   getList()
 }
 
 /** 重置按钮操作 */
 function resetQuery() {
-  proxy.resetForm("queryRef")
+   proxy.resetForm("queryRef")
-  handleQuery()
+   handleQuery()
 }
 
 /** 新增按钮操作 */
 function handleAdd(row) {
-  reset()
+   reset()
-  listDept().then(response => {
+   listDept().then(response => {
-    deptOptions.value = proxy.handleTree(response.data, "deptId")
+      deptOptions.value = proxy.handleTree(response.data, "deptId")
-  })
+   })
-  if (row != undefined) {
+   if (row != undefined) {
-    form.value.parentId = row.deptId
+      form.value.parentId = row.deptId
-  }
+   }
-  open.value = true
+   open.value = true
-  title.value = "添加部门"
+   title.value = "添加部门"
 }
 
 /** 展开/折叠操作 */
 function toggleExpandAll() {
-  refreshTable.value = false
+   refreshTable.value = false
-  isExpandAll.value = !isExpandAll.value
+   isExpandAll.value = !isExpandAll.value
-  nextTick(() => {
+   nextTick(() => {
-    refreshTable.value = true
+      refreshTable.value = true
-  })
+   })
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  reset()
+   reset()
-  listDeptExcludeChild(row.deptId).then(response => {
+   listDeptExcludeChild(row.deptId).then(response => {
-    deptOptions.value = proxy.handleTree(response.data, "deptId")
+      deptOptions.value = proxy.handleTree(response.data, "deptId")
-  })
+   })
-  getDept(row.deptId).then(response => {
+   getDept(row.deptId).then(response => {
-    form.value = response.data
+      form.value = response.data
-    open.value = true
+      open.value = true
-    title.value = "修改部门"
+      title.value = "修改部门"
-  })
+   })
 }
 
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["deptRef"].validate(valid => {
+   proxy.$refs["deptRef"].validate(valid => {
-    if (valid) {
+      if (valid) {
-      if (form.value.deptId != undefined) {
+         if (form.value.deptId != undefined) {
-        updateDept(form.value).then(response => {
+            updateDept(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
+               proxy.$modal.msgSuccess("修改成功")
-          open.value = false
+               open.value = false
-          getList()
+               getList()
-        })
+            })
-      } else {
+         } else {
-        addDept(form.value).then(response => {
+            addDept(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
+               proxy.$modal.msgSuccess("新增成功")
-          open.value = false
+               open.value = false
-          getList()
+               getList()
-        })
+            })
+         }
       }
-    }
+   })
-  })
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() {
+   proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function () {
-    return delDept(row.deptId)
+      return delDept(row.deptId)
-  }).then(() => {
+   }).then(() => {
-    getList()
+      getList()
-    proxy.$modal.msgSuccess("删除成功")
+      proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+   }).catch(() => { })
 }
 
 getList()
-</script>
+</script>