断奶录入问题，断奶查询问题，干奶录入问题，干奶查询问题，死亡录入问题，死亡查询问题

src/views/sheep_death/death/index.vue

@@ -1,7 +1,6 @@
 <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
@@ -25,103 +24,6 @@
               :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">
@@ -450,7 +352,6 @@
 
 <script setup name="Death">
 import {
-<<<<<<< HEAD
   listDeath, 
   getDeath, 
   delDeath, 
@@ -462,19 +363,6 @@ 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('')           // 批量粘贴输入框
@@ -798,7 +686,6 @@ function handleQuery() {
 
 /** 重置按钮操作 */
 function resetQuery() {
-<<<<<<< HEAD
   // 手动清空数组类型的查询条件
   queryParams.value.manageTagsList = []
   queryParams.value.sheepTypeList = []
@@ -807,11 +694,6 @@ function resetQuery() {
   queryParams.value.workGroupList = []
   queryParams.value.deathDateRange = []
   
-=======
-  queryParams.value.allEarNumbers = []  // ✅ 添加这一行
-  earNumberOptions.value = []            // ✅ 添加这一行
-  isExpanded.value = false               // ✅ 添加这一行
->>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
   proxy.resetForm("queryRef")
   handleQuery()
 }