生物安全模块批量新增修改

2026-02-03 22:14:29 +08:00
parent 5fdbb2dfb6
commit d18d720fe1
5 changed files with 344 additions and 136 deletions
--- a/src/views/biosafety/deworm/index.vue
+++ b/src/views/biosafety/deworm/index.vue
@@ -146,9 +146,16 @@
          </el-col>
        </el-row>

-
+  
        <!-- 已选耳号 -->
-        <el-form-item label="已选耳号">
+        <el-form-item v-if="selectedSheepList.length > 0" label="">
+            <p style="font-size: 12px; color: #999; margin: 5px 0 0 0; width: 100%; display: block;">
+          羊只总数：{{ selectedSheepList.length }}
+          <el-button  link type="danger" size="small" @click="clearAllSheep"
+            style="margin-left: 10px;">
+            清空全部
+          </el-button>
+        </p>
          <el-tag v-for="(tag, idx) in selectedSheepList" :key="tag.sheepId" closable @close="removeSheep(idx)"
            style="margin-right: 6px">
            {{ tag.sheepNo }}
@@ -621,27 +628,60 @@
    })
  }

+  function clearAllSheep() {
+    proxy.$modal.confirm('确认清空所有已选羊只？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(() => {
+      selectedSheepList.value = []
+      proxy.$modal.msgSuccess('已清空全部羊只')
+    }).catch(() => { })
+  }
+
  function validateSheep() {
    const no = sheepInput.value.trim()
    if (!no) return
+
+    // 检查是否已选择
    if (selectedSheepList.value.some(s => s.sheepNo === no)) {
      proxy.$modal.msgWarning('该耳号已存在')
      sheepInput.value = ''
      return
    }
-    request.get(`/sheep_file/sheep_file/byNo/${no}`).then(res => {
-      if (!res.data) {
-        proxy.$modal.msgError('羊只耳号不存在')
-      } else {
-        selectedSheepList.value.push({
-          sheepNo: res.data.sheepNo || res.data.bsManageTags,
-          sheepId: res.data.id
+
+    request.get(`/sheep/sheep/byManageTags/${no}`).then(res => {
+      // 有未查询到的耳号，弹窗显示
+      if (res.data?.notInHerd?.length > 0) {
+        const notFoundEars = res.data.notInHerd.join(' ')
+        proxy.$modal.msgWarning(`以下耳号未查询到：${notFoundEars} 请检查后重新输入`)
+      }
+
+      // 处理查询到的耳号
+      if (res.data?.inHerd?.length > 0) {
+        res.data.inHerd.forEach(earNum => {
+          // 检查是否已存在
+          if (!selectedSheepList.value.some(s => s.sheepNo === earNum)) {
+            const sheep = res.data.sheepDetails.find(s => s.manageTags === earNum)
+            if (sheep) {
+              selectedSheepList.value.push({
+                sheepId: sheep.id,
+                sheepNo: sheep.manageTags
+              })
+            }
+          }
        })
      }
-      sheepInput.value = ''
+
+      // 只要 inHerd 有数据就清空输入框
+      if (res.data?.inHerd?.length > 0) {
+        sheepInput.value = ''
+      }
+    }).catch(err => {
+      proxy.$modal.msgError('查询失败，请稍后重试')
    })
  }
-
+  
  function removeSheep(index) {
    selectedSheepList.value.splice(index, 1)
  }
--- a/src/views/biosafety/health/index.vue
+++ b/src/views/biosafety/health/index.vue
@@ -152,8 +152,14 @@
        </el-row>


-        <!-- 已选耳号 -->
-        <el-form-item label="已选耳号">
+      <!-- 已选耳号 -->
+        <el-form-item v-if="selectedSheepList.length > 0" label="">
+          <p style="font-size: 12px; color: #999; margin: 5px 0 0 0; width: 100%; display: block;">
+            羊只总数：{{ selectedSheepList.length }}
+            <el-button link type="danger" size="small" @click="clearAllSheep" style="margin-left: 10px;">
+              清空全部
+            </el-button>
+          </p>
          <el-tag v-for="(tag, idx) in selectedSheepList" :key="tag.sheepId" closable @close="removeSheep(idx)"
            style="margin-right: 6px">
            {{ tag.sheepNo }}
@@ -654,24 +660,57 @@ function handleBarnChange(barnIds) {
  })
 }

+function clearAllSheep() {
+  proxy.$modal.confirm('确认清空所有已选羊只？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    selectedSheepList.value = []
+    proxy.$modal.msgSuccess('已清空全部羊只')
+  }).catch(() => { })
+}
+
 function validateSheep() {
  const no = sheepInput.value.trim()
  if (!no) return
+
+  // 检查是否已选择
  if (selectedSheepList.value.some(s => s.sheepNo === no)) {
    proxy.$modal.msgWarning('该耳号已存在')
    sheepInput.value = ''
    return
  }
-  request.get(`/sheep_file/sheep_file/byNo/${no}`).then(res => {
-    if (!res.data) {
-      proxy.$modal.msgError('羊只耳号不存在')
-    } else {
-      selectedSheepList.value.push({
-        sheepNo: res.data.sheepNo || res.data.bsManageTags,
-        sheepId: res.data.id
+
+  request.get(`/sheep/sheep/byManageTags/${no}`).then(res => {
+    // 有未查询到的耳号，弹窗显示
+    if (res.data?.notInHerd?.length > 0) {
+      const notFoundEars = res.data.notInHerd.join(' ')
+      proxy.$modal.msgWarning(`以下耳号未查询到：${notFoundEars} 请检查后重新输入`)
+    }
+
+    // 处理查询到的耳号
+    if (res.data?.inHerd?.length > 0) {
+      res.data.inHerd.forEach(earNum => {
+        // 检查是否已存在
+        if (!selectedSheepList.value.some(s => s.sheepNo === earNum)) {
+          const sheep = res.data.sheepDetails.find(s => s.manageTags === earNum)
+          if (sheep) {
+            selectedSheepList.value.push({
+              sheepId: sheep.id,
+              sheepNo: sheep.manageTags
+            })
+          }
+        }
      })
    }
-    sheepInput.value = ''
+
+    // 只要 inHerd 有数据就清空输入框
+    if (res.data?.inHerd?.length > 0) {
+      sheepInput.value = ''
+    }
+  }).catch(err => {
+    proxy.$modal.msgError('查询失败，请稍后重试')
  })
 }

--- a/src/views/biosafety/immunity/index.vue
+++ b/src/views/biosafety/immunity/index.vue
@@ -149,8 +149,14 @@
        </el-row>


-        <!-- 已选耳号 -->
-        <el-form-item label="已选耳号">
+     <!-- 已选耳号 -->
+        <el-form-item v-if="selectedSheepList.length > 0" label="">
+          <p style="font-size: 12px; color: #999; margin: 5px 0 0 0; width: 100%; display: block;">
+            羊只总数：{{ selectedSheepList.length }}
+            <el-button link type="danger" size="small" @click="clearAllSheep" style="margin-left: 10px;">
+              清空全部
+            </el-button>
+          </p>
          <el-tag v-for="(tag, idx) in selectedSheepList" :key="tag.sheepId" closable @close="removeSheep(idx)"
            style="margin-right: 6px">
            {{ tag.sheepNo }}
@@ -651,27 +657,59 @@ function handleBarnChange(barnIds) {
  })
 }

+function clearAllSheep() {
+  proxy.$modal.confirm('确认清空所有已选羊只？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    selectedSheepList.value = []
+    proxy.$modal.msgSuccess('已清空全部羊只')
+  }).catch(() => { })
+}
+
 function validateSheep() {
  const no = sheepInput.value.trim()
  if (!no) return
+
+  // 检查是否已选择
  if (selectedSheepList.value.some(s => s.sheepNo === no)) {
    proxy.$modal.msgWarning('该耳号已存在')
    sheepInput.value = ''
    return
  }
-  request.get(`/sheep_file/sheep_file/byNo/${no}`).then(res => {
-    if (!res.data) {
-      proxy.$modal.msgError('羊只耳号不存在')
-    } else {
-      selectedSheepList.value.push({
-        sheepNo: res.data.sheepNo || res.data.bsManageTags,
-        sheepId: res.data.id
+
+  request.get(`/sheep/sheep/byManageTags/${no}`).then(res => {
+    // 有未查询到的耳号，弹窗显示
+    if (res.data?.notInHerd?.length > 0) {
+      const notFoundEars = res.data.notInHerd.join(' ')
+      proxy.$modal.msgWarning(`以下耳号未查询到：${notFoundEars} 请检查后重新输入`)
+    }
+
+    // 处理查询到的耳号
+    if (res.data?.inHerd?.length > 0) {
+      res.data.inHerd.forEach(earNum => {
+        // 检查是否已存在
+        if (!selectedSheepList.value.some(s => s.sheepNo === earNum)) {
+          const sheep = res.data.sheepDetails.find(s => s.manageTags === earNum)
+          if (sheep) {
+            selectedSheepList.value.push({
+              sheepId: sheep.id,
+              sheepNo: sheep.manageTags
+            })
+          }
+        }
      })
    }
-    sheepInput.value = ''
+
+    // 只要 inHerd 有数据就清空输入框
+    if (res.data?.inHerd?.length > 0) {
+      sheepInput.value = ''
+    }
+  }).catch(err => {
+    proxy.$modal.msgError('查询失败，请稍后重试')
  })
 }
-
 function removeSheep(index) {
  selectedSheepList.value.splice(index, 1)
 }
--- a/src/views/biosafety/quarantine/index.vue
+++ b/src/views/biosafety/quarantine/index.vue
@@ -2,68 +2,8 @@
  <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> -->
@@ -71,6 +11,77 @@
        <el-date-picker v-model="daterangeDatetime" type="daterange" range-separator="-" start-placeholder="开始日期"
          end-placeholder="结束日期" value-format="YYYY-MM-DD" />
      </el-form-item>
+      <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="sheepType">
+        <el-select v-model="queryParams.sheepType" placeholder="请选择" filterable clearable style="width: 150px">
+          <el-option v-for="i in sheepTypes" :key="i.value" :label="i.makeLabelFormatter" :value="i.label" />
+        </el-select>
+      </el-form-item>
+
+    <el-form-item label="样品类型" prop="sampleType">
+        <el-select v-model="queryParams.sampleType" placeholder="请选择" filterable clearable style="width: 150px">
+          <el-option v-for="i in sampleTypes" :key="i.value" :label="i.label" :value="i.value" />
+        </el-select>
+      </el-form-item>

      <el-form-item label="检疫项目" prop="quarItem">
        <el-select v-model="queryParams.quarItem" placeholder="请选择" filterable clearable style="width: 150px">
@@ -97,18 +108,6 @@
      </el-form-item>


-      <el-form-item label="羊只类型" prop="sheepType">
-        <el-select v-model="queryParams.sheepType" placeholder="请选择" filterable clearable style="width: 150px">
-          <el-option v-for="i in sheepTypes" :key="i.value" :label="i.makeLabelFormatter" :value="i.label" />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="样品类型" prop="sampleType">
-        <el-select v-model="queryParams.sampleType" placeholder="请选择" filterable clearable style="width: 150px">
-          <el-option v-for="i in sampleTypes" :key="i.value" :label="i.label" :value="i.value" />
-        </el-select>
-      </el-form-item>
-
      <el-form-item>
        <el-button type="primary" icon="Search" @click="getList">搜索</el-button>
        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -134,6 +133,9 @@
      <el-table-column type="selection" width="55" align="center" />

      <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
+      <el-table-column label="品种" align="center" prop="variety" />
+      <el-table-column label="检疫日期" align="center" prop="datetime" width="180"
+        :formatter="(_, __, v) => parseTime(v, '{y}-{m}-{d}')" />
      <el-table-column label="羊只性别" align="center" prop="gender">
        <template #default="scope">
          <dict-tag :options="sheep_gender" :value="scope.row.gender" />
@@ -142,8 +144,7 @@
      <el-table-column label="羊只类别" align="center" prop="sheepType" />
      <el-table-column label="月龄" align="center" prop="monthAge" sortable="custom" />
      <el-table-column label="繁育状态" align="center" prop="breed" />
-      <el-table-column label="检疫日期" align="center" prop="datetime" width="180"
-        :formatter="(_, __, v) => parseTime(v, '{y}-{m}-{d}')" />
+
      <el-table-column label="检疫项目" align="center" prop="itemName" />
      <el-table-column label="样品类型" align="center" prop="sample" />
      <el-table-column label="采样员" align="center" prop="sampler" />
@@ -193,9 +194,15 @@
              </div>
            </template>
          </el-input>
-
+         <p style="font-size: 12px; color: #999; margin: 5px 0 0 0; width: 100%; display: block;">
+            羊只总数：{{ addForm.sheepList.length }}
+            <el-button v-if="addForm.sheepList.length > 0" link type="danger" size="small" @click="clearAllSheep"
+              style="margin-left: 10px;">
+              清空全部
+            </el-button>
+          </p>
          <el-tag v-for="(item, i) in addForm.sheepList" :key="item.id" closable @close="addForm.sheepList.splice(i, 1)"
-            style="margin: 5px 5px 0 0">
+            style="margin: 0px 5px 0 0">
            {{ item.ear }}
          </el-tag>
        </el-form-item>
@@ -291,6 +298,11 @@
              <span>{{ editForm.sheepNo }}</span>
            </el-form-item>
          </el-col>
+          <el-col :span="12">
+            <el-form-item label="羊只品种">
+              <span>{{ editForm.variety }}</span>
+            </el-form-item>
+          </el-col>
          <el-col :span="12">
            <el-form-item label="羊只性别">
              <dict-tag :options="sheep_gender" :value="editForm.gender" />
@@ -718,6 +730,17 @@ function handleBarnChange(selectedBarnIds) {
    }
  })
 }
+function clearAllSheep() {
+  proxy.$modal.confirm('确认清空所有已选羊只？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    addForm.value.sheepList = []
+    validSheepId.value = false
+    proxy.$modal.msgSuccess('已清空全部羊只')
+  }).catch(() => { })
+}

 function validateSheepId() {
  const ear = addForm.value.sheepIdInput.trim()
@@ -727,6 +750,7 @@ function validateSheepId() {
  validSheepId.value = false
  alreadySelected.value = false

+  // 检查是否已选择
  if (addForm.value.sheepList.some(s => s.ear === ear)) {
    alreadySelected.value = true
    addForm.value.sheepIdInput = ''
@@ -734,17 +758,42 @@ function validateSheepId() {
  }

  request.get(`/sheep/sheep/byManageTags/${ear}`).then(res => {
-    if (res.data) {
-      addForm.value.sheepList.push({ id: res.data.id, ear })
-      validSheepId.value = true
-    } else {
-      invalidSheepId.value = true
+    // 有未查询到的耳号，弹窗显示
+    if (res.data?.notInHerd?.length > 0) {
+      const notFoundEars = res.data.notInHerd.join(' ')
+      proxy.$modal.msgWarning(`以下耳号未查询到：${notFoundEars} 请检查后重新输入` )
    }
-    addForm.value.sheepIdInput = ''
+
+    // 处理查询到的耳号
+    if (res.data?.inHerd?.length > 0) {
+      res.data.inHerd.forEach(earNum => {
+        // 检查是否已存在
+        if (!addForm.value.sheepList.some(s => s.ear === earNum)) {
+          const sheep = res.data.sheepDetails.find(s => s.manageTags === earNum)
+          if (sheep) {
+            addForm.value.sheepList.push({
+              id: sheep.id,
+              ear: sheep.manageTags
+            })
+          }
+        }
+      })
+      validSheepId.value = true
+    }
+
+    // 只要 inHerd 有数据就清空输入框
+    if (res.data?.inHerd?.length > 0) {
+      addForm.value.sheepIdInput = ''
+    }
+  }).catch(err => {
+    proxy.$modal.msgError('查询失败，请稍后重试')
  })
 }

 function submitAddForm() {
+  if (addForm.value.sheepList.length === 0) {
+    return proxy.$modal.msgError('请至少添加一个耳号')
+  }
  addForm.value.ids = addForm.value.sheepList.map(s => s.id)
  addQuarantine(addForm.value).then(() => {
    proxy.$modal.msgSuccess('新增成功')
@@ -832,7 +881,7 @@ getItems()
 getSample()
 getBarns()
 getSheepType()
-getTechnicalList()
+fetchTechnicalList()
 </script>

 <style scoped>
--- a/src/views/biosafety/treatment/index.vue
+++ b/src/views/biosafety/treatment/index.vue
@@ -163,12 +163,20 @@
            </el-form-item>
          </el-col>
          <el-col :span="24">
-            <div style="margin-bottom: 10px;margin-left: 60px;">
-              <el-tag v-for="(item, index) in selectedSheepList" :key="item.sheepNo" closable
-                @close="removeSheep(index)" style="margin-right: 10px">
-                {{ item.sheepNo }}（{{ item.barnName }}）
-              </el-tag>
-            </div>
+              <!-- 已选耳号 -->
+              <el-form-item v-if="selectedSheepList.length > 0" label="">
+                <p style="font-size: 12px; color: #999; width: 100%; display: block;">
+                  羊只总数：{{ selectedSheepList.length }}
+                  <el-button link type="danger" size="small" @click="clearAllSheep" style="margin-left: 10px;">
+                    清空全部
+                  </el-button>
+                </p>
+                <el-tag v-for="(tag, idx) in selectedSheepList" :key="tag.sheepId" closable @close="removeSheep(idx)"
+                  style="margin-right: 6px">
+                  {{ tag.sheepNo }}
+                </el-tag>
+              </el-form-item>
+        
          </el-col>
        </el-row>

@@ -198,7 +206,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item label="疾病子类型" prop="diseaseId">
+            <el-form-item label="疾病子类" prop="diseaseId">
              <el-select v-model="addForm.diseaseId" :disabled="!addForm.diseasePid" placeholder="请选择"
                style="width: 100%">
                <el-option v-for="item in childDiseaseOptions" :key="item.id" :label="item.name" :value="item.id" />
@@ -382,7 +390,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item label="疾病子类型" prop="diseaseId">
+            <el-form-item label="疾病子类" prop="diseaseId">
              <el-select v-model="editForm.diseaseId" :disabled="!editForm.diseasePid" placeholder="请选择"
                style="width: 100%">
                <el-option v-for="item in childDiseaseOptions" :key="item.id" :label="item.name" :value="item.id" />
@@ -869,23 +877,57 @@ function deletePresDetail(row) {
  swPresDetailList.value.splice(swPresDetailList.value.indexOf(row), 1)
 }

-/* ---------- 羊只验证 ---------- */
+function clearAllSheep() {
+  proxy.$modal.confirm('确认清空所有已选羊只？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    selectedSheepList.value = []
+    proxy.$modal.msgSuccess('已清空全部羊只')
+  }).catch(() => { })
+}
+
 function validateSheep() {
  const no = sheepInput.value.trim()
  if (!no) return
-  request.get(`/sheep_file/sheep_file/byNo/${no}`).then(res => {
-    if (!res.data) {
-      proxy.$modal.msgError('羊只耳号不存在'); return
-    }
-    if (selectedSheepList.value.some(s => s.sheepNo === no)) {
-      proxy.$modal.msgWarning('该羊只已添加'); return
-    }
-    selectedSheepList.value.push({
-      sheepNo: res.data.bsManageTags,
-      sheepId: res.data.id,
-      barnName: res.data.sheepfoldName
-    })
+
+  // 检查是否已选择
+  if (selectedSheepList.value.some(s => s.sheepNo === no)) {
+    proxy.$modal.msgWarning('该耳号已存在')
    sheepInput.value = ''
+    return
+  }
+
+  request.get(`/sheep/sheep/byManageTags/${no}`).then(res => {
+    // 有未查询到的耳号，弹窗显示
+    if (res.data?.notInHerd?.length > 0) {
+      const notFoundEars = res.data.notInHerd.join(' ')
+      proxy.$modal.msgWarning(`以下耳号未查询到：${notFoundEars} 请检查后重新输入`)
+    }
+
+    // 处理查询到的耳号
+    if (res.data?.inHerd?.length > 0) {
+      res.data.inHerd.forEach(earNum => {
+        // 检查是否已存在
+        if (!selectedSheepList.value.some(s => s.sheepNo === earNum)) {
+          const sheep = res.data.sheepDetails.find(s => s.manageTags === earNum)
+          if (sheep) {
+            selectedSheepList.value.push({
+              sheepId: sheep.id,
+              sheepNo: sheep.manageTags
+            })
+          }
+        }
+      })
+    }
+
+    // 只要 inHerd 有数据就清空输入框
+    if (res.data?.inHerd?.length > 0) {
+      sheepInput.value = ''
+    }
+  }).catch(err => {
+    proxy.$modal.msgError('查询失败，请稍后重试')
  })
 }
 function removeSheep(index) {