diff --git a/src/views/fileManagement/sheep_file/index.vue b/src/views/fileManagement/sheep_file/index.vue
index 70d9f2f..30dfb5c 100644
--- a/src/views/fileManagement/sheep_file/index.vue
+++ b/src/views/fileManagement/sheep_file/index.vue
@@ -1,46 +1,156 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <!-- <el-form-item label="羊只id" prop="id">
-        <el-input
-          v-model="queryParams.id"
-          placeholder="请输入羊只id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="耳号" prop="bsManageTags">
-        <el-input
-          v-model="queryParams.bsManageTags"
-          placeholder="请输入耳号"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="电子耳号" prop="electronicTags">
-        <el-input
-          v-model="queryParams.electronicTags"
-          placeholder="请输入电子耳号"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="90px">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="牧场名称" prop="drRanch" style="width: 100%">
+            <el-select
+              v-model="queryParams.drRanch"
+              placeholder="请选择牧场"
+              clearable
+              filterable
+              style="width: 100%"
+            >
+              <el-option
+                v-for="dict in da_ranch"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.label"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="耳号" prop="allEarNumbers" style="width: 100%">
+            <el-select
+              v-model="queryParams.allEarNumbers"
+              multiple
+              filterable
+              remote
+              reserve-keyword
+              placeholder="输入耳号搜索"
+              :remote-method="searchEarMethod"
+              :loading="loadingEar"
+              collapse-tags
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in earOptions"
+                :key="item"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="电子耳号" prop="allEleEarNumbers" style="width: 100%">
+            <el-select
+              v-model="queryParams.allEleEarNumbers"
+              multiple
+              filterable
+              allow-create
+              default-first-option
+              collapse-tags
+              placeholder="输入号码"
+              style="width: 100%"
+            >
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="性别" prop="allGenders" style="width: 100%">
+            <el-select 
+              v-model="queryParams.allGenders" 
+              multiple 
+              collapse-tags
+              placeholder="请选择性别" 
+              style="width: 100%"
+            >
+              <el-option
+                v-for="dict in sheep_gender"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="是否在群" prop="statusId" style="width: 100%">
+             <el-radio-group v-model="queryParams.statusId">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+                <el-radio :label="null">全部</el-radio>
+             </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="繁殖状态" prop="allBreedingStatus" style="width: 100%">
+            <el-select 
+              v-model="queryParams.allBreedingStatus" 
+              multiple 
+              collapse-tags
+              placeholder="请选择繁殖状态" 
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in breedOptions"
+                :key="item"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="羊只类型" prop="allSheepTypes" style="width: 100%">
+            <el-select 
+              v-model="queryParams.allSheepTypes" 
+              multiple 
+              collapse-tags
+              placeholder="请选择类型" 
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in typeOptions"
+                :key="item"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item style="margin-left: 10px;">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <!-- 新增：自定义筛选按钮 -->
+         <el-button type="info" plain icon="Setting" @click="openColumnDialog">显示列</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
         <CustomFilter ref="customFilterRef" @filter="handleCustomFilter" />
         <span v-if="isCustomFilterActive" style="color: #67c23a; margin-left: 5px;">
           <i class="el-icon-success"></i> 筛选条件已激活
         </span>
       </el-col>
 
-
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -63,7 +173,6 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-        <!-- 新增：显示已应用的筛选条件 -->
     <div v-if="appliedFilters.length > 0" class="applied-filters mb8">
       <div class="filter-title">已应用筛选条件:</div>
       <el-tag
@@ -81,10 +190,6 @@
       </el-button>
     </div>
 
-    <div style="margin-bottom: 10px;">
-      <el-button type="info" plain icon="Setting" @click="openColumnDialog">显示列</el-button>
-    </div>
-
     <el-table
       v-loading="loading"
       :data="sheep_fileList"
@@ -93,44 +198,6 @@
       border
     >
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column
-        v-if="columns['id'].visible"
-        label="羊只id"
-        align="center"
-        prop="id"
-        width="120"
-        fixed="left"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">羊只id</span>
-        </template>
-      </el-table-column> -->
-      <el-table-column
-        v-if="columns['bsManageTags'].visible"
-        label="耳号"
-        align="center"
-        prop="bsManageTags"
-        width="120"
-        fixed="left"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">耳号</span>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column
-        v-if="columns['ranchId'].visible"
-        label="牧场id"
-        align="center"
-        prop="ranchId"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">牧场id</span>
-        </template>
-      </el-table-column> -->
       <el-table-column
         v-if="columns['drRanch'].visible"
         label="牧场名称"
@@ -143,35 +210,17 @@
           <span style="font-weight: bold; color: #333;">牧场名称</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        v-if="columns['sheepfoldId'].visible"
-        label="羊舍id"
-        align="center"
-        prop="sheepfoldId"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">羊舍id</span>
-        </template>
-      </el-table-column> -->
       <el-table-column
-        v-if="columns['sheepfoldName'].visible"
-        label="羊舍名称"
+        v-if="columns['bsManageTags'].visible"
+        label="耳号"
         align="center"
-        prop="sheepfoldName"
+        prop="bsManageTags"
         width="120"
+        fixed="left"
         sortable
       >
         <template #header>
-          <span style="font-weight: bold; color: #333;">羊舍名称</span>
-        </template>
-        <template #default="scope">
-          <el-tooltip :content="scope.row.sheepfoldName" placement="top">
-            <span style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
-            {{ scope.row.sheepfoldName }}
-            </span>
-          </el-tooltip>
+          <span style="font-weight: bold; color: #333;">耳号</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -193,18 +242,72 @@
           </el-tooltip>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        v-if="columns['varietyId'].visible"
-        label="品种id"
+      <el-table-column
+        v-if="columns['gender'].visible"
+        label="性别"
         align="center"
-        prop="varietyId"
+        prop="gender"
+        width="120"
+        sortable
+      >
+        <template #default="scope">
+          <dict-tag :options="sheep_gender" :value="scope.row.gender"/>
+        </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;">品种id</span>
+          <span style="font-weight: bold; color: #333;">羊只状态</span>
         </template>
-      </el-table-column> -->
+        <template #default="scope">
+          <dict-tag :options="sheep_status" :value="scope.row.statusId"/>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        v-if="columns['breed'].visible"
+        label="繁殖状态"
+        align="center"
+        prop="breed"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">繁殖状态</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['name'].visible"
+        label="羊只类型"
+        align="center"
+        prop="name"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">羊只类型</span>
+        </template>
+      </el-table-column>
+      
+      <el-table-column
+        v-if="columns['sheepfoldName'].visible"
+        label="羊舍名称"
+        align="center"
+        prop="sheepfoldName"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">羊舍名称</span>
+        </template>
+      </el-table-column>
       <el-table-column
         v-if="columns['variety'].visible"
         label="品种"
@@ -229,33 +332,6 @@
           <span style="font-weight: bold; color: #333;">家系</span>
         </template>
       </el-table-column>
-      <el-table-column
-        v-if="columns['name'].visible"
-        label="羊只类型"
-        align="center"
-        prop="name"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">羊只类型</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-if="columns['gender'].visible"
-        label="性别"
-        align="center"
-        prop="gender"
-        width="120"
-        sortable
-      >
-        <!-- <template #header>
-          <span style="font-weight: bold; color: #333;">性别</span>
-        </template> -->
-        <template #default="scope">
-          <dict-tag :options="sheep_gender" :value="scope.row.gender"/>
-        </template>
-      </el-table-column>
       <el-table-column
         v-if="columns['birthday'].visible"
         label="出生日期"
@@ -358,8 +434,6 @@
           <span style="font-weight: bold; color: #333;">当前体重</span>
         </template>
       </el-table-column>
-
-
       <el-table-column
         v-if="columns['weaningDayAge'].visible"
         label="断奶日龄"
@@ -372,7 +446,6 @@
           <span style="font-weight: bold; color: #333;">断奶日龄</span>
         </template>
       </el-table-column>
-
       <el-table-column
         v-if="columns['weaningDailyGain'].visible"
         label="断奶日增重"
@@ -385,49 +458,6 @@
           <span style="font-weight: bold; color: #333;">断奶日增重</span>
         </template>
       </el-table-column>
-    
-
-
-
-
-
-
-      <!-- <el-table-column
-        v-if="columns['breedStatusId'].visible"
-        label="繁育状态id"
-        align="center"
-        prop="breedStatusId"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">繁育状态id</span>
-        </template>
-      </el-table-column> -->
-      <el-table-column
-        v-if="columns['breed'].visible"
-        label="繁殖状态"
-        align="center"
-        prop="breed"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">繁殖状态</span>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column
-        v-if="columns['bsFatherId'].visible"
-        label="父号id"
-        align="center"
-        prop="bsFatherId"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">父号id</span>
-        </template>
-      </el-table-column> -->
       <el-table-column
         v-if="columns['fatherManageTags'].visible"
         label="父亲耳号"
@@ -440,18 +470,6 @@
           <span style="font-weight: bold; color: #333;">父亲耳号</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        v-if="columns['bsMotherId'].visible"
-        label="母号id"
-        align="center"
-        prop="bsMotherId"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">母号id</span>
-        </template>
-      </el-table-column> -->
       <el-table-column
         v-if="columns['motherManageTags'].visible"
         label="母亲耳号"
@@ -464,30 +482,6 @@
           <span style="font-weight: bold; color: #333;">母亲耳号</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        v-if="columns['receptorId'].visible"
-        label="受体id"
-        align="center"
-        prop="receptorId"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">受体id</span>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column
-        v-if="columns['fatherFatherId'].visible"
-        label="祖父号id"
-        align="center"
-        prop="fatherFatherId"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">祖父号id</span>
-        </template>
-      </el-table-column> -->
       <el-table-column
         v-if="columns['grandfatherManageTags'].visible"
         label="祖父耳号"
@@ -500,18 +494,6 @@
           <span style="font-weight: bold; color: #333;">祖父耳号</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        v-if="columns['fatherMotherId'].visible"
-        label="祖母号id"
-        align="center"
-        prop="fatherMotherId"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">祖母号id</span>
-        </template>
-      </el-table-column> -->
       <el-table-column
         v-if="columns['grandmotherManageTags'].visible"
         label="祖母耳号"
@@ -524,18 +506,6 @@
           <span style="font-weight: bold; color: #333;">祖母耳号</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        v-if="columns['fatherId'].visible"
-        label="外祖父号id"
-        align="center"
-        prop="fatherId"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">外祖父号id</span>
-        </template>
-      </el-table-column> -->
       <el-table-column
         v-if="columns['maternalGrandfatherManageTags'].visible"
         label="外祖父耳号"
@@ -548,18 +518,6 @@
           <span style="font-weight: bold; color: #333;">外祖父耳号</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        v-if="columns['motherId'].visible"
-        label="外祖母号id"
-        align="center"
-        prop="motherId"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">外祖母号id</span>
-        </template>
-      </el-table-column> -->
       <el-table-column
         v-if="columns['maternalGrandmotherManageTags'].visible"
         label="外祖母耳号"
@@ -855,18 +813,6 @@
           <span>{{ parseTime(scope.row.sourceDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        v-if="columns['sourceRanchId'].visible"
-        label="来源牧场id"
-        align="center"
-        prop="sourceRanchId"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">来源牧场id</span>
-        </template>
-      </el-table-column> -->
       <el-table-column
         v-if="columns['sourceRanch'].visible"
         label="来源牧场"
@@ -879,89 +825,6 @@
           <span style="font-weight: bold; color: #333;">来源牧场</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        v-if="columns['updateBy'].visible"
-        label="修改人"
-        align="center"
-        prop="updateBy"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">修改人</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-if="columns['updateTime'].visible"
-        label="修改日期"
-        align="center"
-        prop="updateTime"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">修改日期</span>
-        </template>
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-if="columns['createBy'].visible"
-        label="创建人"
-        align="center"
-        prop="createBy"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">创建人</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-if="columns['createTime'].visible"
-        label="创建日期"
-        align="center"
-        prop="createTime"
-        width="120"
-        sortable
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">创建日期</span>
-        </template>
-        <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="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        fixed="right"
-        width="120"
-      >
-        <template #header>
-          <span style="font-weight: bold; color: #333;">操作</span>
-        </template>
-        <template #default="scope">
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['sheep_file:sheep_file:remove']">删除</el-button>
-        </template>
-      </el-table-column> -->
     </el-table>
     
     <pagination
@@ -973,18 +836,13 @@
       :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]"
     />
 
-    <!-- 列显示设置对话框 -->
     <el-dialog v-model="columnDialogVisible" title="显示列设置" width="800px">
       <div style="max-height: 400px; overflow-y: auto; ">
-        <el-checkbox-group v-model="selectedColumns" style="grid; grid-template-columns: repeat(3, 1fr); gap: 10px;" >
-          <!-- <el-checkbox label="id">羊只id</el-checkbox> -->
+        <el-checkbox-group v-model="selectedColumns" style="display: grid; grid-template-columns: repeat(3, 1fr); gap: 10px;" >
           <el-checkbox label="bsManageTags">耳号</el-checkbox>
-          <!-- <el-checkbox label="ranchId">牧场id</el-checkbox> -->
           <el-checkbox label="drRanch">牧场名称</el-checkbox>
-          <!-- <el-checkbox label="sheepfoldId">羊舍id</el-checkbox> -->
           <el-checkbox label="sheepfoldName">羊舍名称</el-checkbox>
           <el-checkbox label="electronicTags">电子耳号</el-checkbox>
-          <!-- <el-checkbox label="varietyId">品种id</el-checkbox> -->
           <el-checkbox label="variety">品种</el-checkbox>
           <el-checkbox label="family">家系</el-checkbox>
           <el-checkbox label="name">羊只类型</el-checkbox>
@@ -996,23 +854,15 @@
           <el-checkbox label="birthWeight">出生体重</el-checkbox>
           <el-checkbox label="weaningDate">断奶日期</el-checkbox>
           <el-checkbox label="weaningWeight">断奶体重</el-checkbox>
-          <el-checkbox label="currentWeight">当前体重</el-checkbox>\
+          <el-checkbox label="currentWeight">当前体重</el-checkbox>
           <el-checkbox label="weaningDayAge">断奶日龄</el-checkbox>
           <el-checkbox label="weaningDailyGain">断奶日增重</el-checkbox>
-          <!-- <el-checkbox label="breedStatusId">繁育状态id</el-checkbox> -->
           <el-checkbox label="breed">繁殖状态</el-checkbox>
-          <!-- <el-checkbox label="bsFatherId">父号id</el-checkbox> -->
           <el-checkbox label="fatherManageTags">父亲耳号</el-checkbox>
-          <!-- <el-checkbox label="bsMotherId">母号id</el-checkbox> -->
           <el-checkbox label="motherManageTags">母亲耳号</el-checkbox>
-          <!-- <el-checkbox label="receptorId">受体id</el-checkbox> -->
-          <!-- <el-checkbox label="fatherFatherId">祖父号id</el-checkbox> -->
           <el-checkbox label="grandfatherManageTags">祖父耳号</el-checkbox>
-          <!-- <el-checkbox label="fatherMotherId">祖母号id</el-checkbox> -->
           <el-checkbox label="grandmotherManageTags">祖母耳号</el-checkbox>
-          <!-- <el-checkbox label="fatherId">外祖父号id</el-checkbox> -->
           <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>
@@ -1035,12 +885,7 @@
           <el-checkbox label="breast">乳房评分</el-checkbox>
           <el-checkbox label="source">入群来源</el-checkbox>
           <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="updateTime">修改日期</el-checkbox>
-          <el-checkbox label="createBy">创建人</el-checkbox>
-          <el-checkbox label="createTime">创建日期</el-checkbox> -->
           <el-checkbox label="statusId">羊只状态</el-checkbox>
         </el-checkbox-group>
       </div>
@@ -1056,7 +901,8 @@
 </template>
 
 <script setup name="Sheep_file">
-import { listSheep_file, getSheep_file } from "@/api/fileManagement/sheep_file"
+import { listSheep_file, getSheep_file, delSheep_file, getFieldValues } from "@/api/fileManagement/sheep_file"
+import request from '@/utils/request'
 // 新增：引入自定义筛选组件
 import CustomFilter from '@/components/CustomFilter/index.vue'
 
@@ -1075,6 +921,7 @@ const { breed_type } = proxy.useDict('breed_type')
 const { controlled } = proxy.useDict('controlled')
 const { source } = proxy.useDict('source')
 const { sheep_status } = proxy.useDict('sheep_status')
+const { da_ranch } = proxy.useDict('da_ranch')
 const sheep_fileList = ref([])
 const open = ref(false)
 const loading = ref(true)
@@ -1085,12 +932,16 @@ 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'
-// ])
+
+// 新增：下拉选项响应式数据
+const earOptions = ref([])
+const loadingEar = ref(false)
+const breedOptions = ref([])
+const typeOptions = ref([])
 
 // 在 setup 中修改 selectedColumns 的默认值
 const selectedColumns = ref([
+    'drRanch',      // 牧场名称
     'bsManageTags', // 耳号
     'drRanch',      // 牧场名称
     'sheepfoldName', // 羊舍名称
@@ -1190,14 +1041,24 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
+    // 多选参数
+    allEarNumbers: [],
+    allEleEarNumbers: [],
+    allGenders: [],
+    allBreedingStatus: [],
+    allSheepTypes: [],
+    
+    // 默认在群 (1)
+    statusId: 1,
+
+    // 其他单值参数
+    drRanch: null,
     id: null,
     bsManageTags: null,
-    drRanch: null,
     electronicTags: null,
     variety: null,
     name: null,
     gender: null,
-    statusId: null,
     breed: null,
   },
   rules: {
@@ -1209,6 +1070,35 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data)
 
+/** 初始化加载选项数据 */
+function initOptions() {
+  getFieldValues('breed').then(res => { breedOptions.value = res.data || [] })
+  getFieldValues('name').then(res => { typeOptions.value = res.data || [] })
+}
+
+// 页面加载时初始化
+initOptions()
+
+/** 耳号远程搜索方法 */
+function searchEarMethod(query) {
+  if (query) {
+    loadingEar.value = true
+    request({
+      url: '/sheep_file/sheep_file/searchEarNumbers',
+      method: 'get',
+      params: { query: query }
+    }).then(res => {
+      loadingEar.value = false
+      earOptions.value = res.data || []
+    }).catch(() => {
+        loadingEar.value = false
+        earOptions.value = []
+    })
+  } else {
+    earOptions.value = []
+  }
+}
+
 // 5. 修改 getList 函数，支持传入自定义参数
 function getList(queryParamOverride = null) {
   loading.value = true
@@ -1330,6 +1220,16 @@ function handleQuery() {
 function resetQuery() {
   proxy.resetForm("queryRef")
   
+  // 重置新增的多选字段
+  queryParams.value.allEarNumbers = []
+  queryParams.value.allEleEarNumbers = []
+  queryParams.value.allGenders = []
+  queryParams.value.allBreedingStatus = []
+  queryParams.value.allSheepTypes = []
+  
+  // 重置默认值
+  queryParams.value.statusId = 1
+
   // 清空自定义筛选条件
   customFilterParams.value = {}
   appliedFilters.value = []
@@ -1436,10 +1336,6 @@ function resetColumnSettings() {
     'maternalGrandfatherManageTags',//外祖父
     'maternalGrandmotherManageTags',//外祖母
     'comment'//备注
-
-
-
-
   ]
   updateColumnVisibility()
   localStorage.setItem('selectedColumns', JSON.stringify(selectedColumns.value))
@@ -1448,10 +1344,6 @@ function resetColumnSettings() {
 /**
  * 处理自定义筛选
  */
-/**
- * 处理自定义筛选
- */
-//  
 function handleCustomFilter(filterParams) {
   console.log('接收到筛选参数:', filterParams)
   
@@ -1533,7 +1425,6 @@ function getDictLabel(field, value) {
 /**
  * 移除单个筛选条件
  */
-// 6. 修改 removeAppliedFilter 函数
 function removeAppliedFilter(index) {
   const filter = appliedFilters.value[index]
   
@@ -1553,7 +1444,6 @@ function removeAppliedFilter(index) {
 /**
  * 清除所有筛选条件
  */
-// 7. 修改 clearAllFilters 函数
 function clearAllFilters() {
   customFilterParams.value = {}
   appliedFilters.value = []