diff --git a/src/api/sheep_file/sheep_file.js b/src/api/sheep_file/sheep_file.js
index 4d3b737..892580a 100644
--- a/src/api/sheep_file/sheep_file.js
+++ b/src/api/sheep_file/sheep_file.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询羊只基本信息列表
+// 查询羊只档案列表
 export function listSheep_file(query) {
   return request({
     url: '/sheep_file/sheep_file/list',
@@ -9,7 +9,7 @@ export function listSheep_file(query) {
   })
 }
 
-// 查询羊只基本信息详细
+// 查询羊只档案详细
 export function getSheep_file(id) {
   return request({
     url: '/sheep_file/sheep_file/' + id,
@@ -17,25 +17,8 @@ export function getSheep_file(id) {
   })
 }
 
-// 新增羊只基本信息
-export function addSheep_file(data) {
-  return request({
-    url: '/sheep_file/sheep_file',
-    method: 'post',
-    data: data
-  })
-}
 
-// 修改羊只基本信息
-export function updateSheep_file(data) {
-  return request({
-    url: '/sheep_file/sheep_file',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除羊只基本信息
+// 删除羊只档案
 export function delSheep_file(id) {
   return request({
     url: '/sheep_file/sheep_file/' + id,
diff --git a/src/views/sheep_file/sheep_file/index.vue b/src/views/sheep_file/sheep_file/index.vue
index 5868097..d53d6bc 100644
--- a/src/views/sheep_file/sheep_file/index.vue
+++ b/src/views/sheep_file/sheep_file/index.vue
@@ -1,30 +1,22 @@
 <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="羊只id" prop="id">
         <el-input
-          v-model="queryParams.manageTags"
+          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="牧场id" prop="ranchId">
-        <el-input
-          v-model="queryParams.ranchId"
-          placeholder="请输入牧场id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="羊舍id" prop="sheepfoldId">
-        <el-input
-          v-model="queryParams.sheepfoldId"
-          placeholder="请输入羊舍id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="电子耳号" prop="electronicTags">
         <el-input
           v-model="queryParams.electronicTags"
@@ -33,254 +25,6 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="品种id" prop="varietyId">
-        <el-input
-          v-model="queryParams.varietyId"
-          placeholder="请输入品种id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="家系" prop="family">
-        <el-input
-          v-model="queryParams.family"
-          placeholder="请输入家系"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="羊只类别" prop="typeId">
-        <el-input
-          v-model="queryParams.typeId"
-          placeholder="请输入羊只类别"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="性别" prop="gender">
-        <el-input
-          v-model="queryParams.gender"
-          placeholder="请输入性别"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="出生日期" prop="birthday">
-        <el-date-picker clearable
-          v-model="queryParams.birthday"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择出生日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="出生体重" prop="birthWeight">
-        <el-input
-          v-model="queryParams.birthWeight"
-          placeholder="请输入出生体重"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="胎次" prop="parity">
-        <el-input
-          v-model="queryParams.parity"
-          placeholder="请输入胎次"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="羊只状态" prop="statusId">
-        <el-input
-          v-model="queryParams.statusId"
-          placeholder="请输入羊只状态"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="断奶日期" prop="weaningDate">
-        <el-date-picker clearable
-          v-model="queryParams.weaningDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择断奶日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="断奶体重" prop="weaningWeight">
-        <el-input
-          v-model="queryParams.weaningWeight"
-          placeholder="请输入断奶体重"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="繁育状态id" prop="breedStatusId">
-        <el-input
-          v-model="queryParams.breedStatusId"
-          placeholder="请输入繁育状态id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="父号id" prop="fatherId">
-        <el-input
-          v-model="queryParams.fatherId"
-          placeholder="请输入父号id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="母号id" prop="motherId">
-        <el-input
-          v-model="queryParams.motherId"
-          placeholder="请输入母号id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="受体id" prop="receptorId">
-        <el-input
-          v-model="queryParams.receptorId"
-          placeholder="请输入受体id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="配种日期" prop="matingDate">
-        <el-date-picker clearable
-          v-model="queryParams.matingDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择配种日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="配种类型" prop="matingTypeId">
-        <el-input
-          v-model="queryParams.matingTypeId"
-          placeholder="请输入配种类型"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="孕检日期" prop="pregDate">
-        <el-date-picker clearable
-          v-model="queryParams.pregDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择孕检日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="产羔日期" prop="lambingDate">
-        <el-date-picker clearable
-          v-model="queryParams.lambingDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择产羔日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="产羔时怀孕天数" prop="lambingDay">
-        <el-input
-          v-model="queryParams.lambingDay"
-          placeholder="请输入产羔时怀孕天数"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="预产日期" prop="expectedDate">
-        <el-date-picker clearable
-          v-model="queryParams.expectedDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择预产日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="是否性控" prop="controlled">
-        <el-input
-          v-model="queryParams.controlled"
-          placeholder="请输入是否性控"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="配种次数" prop="matingCounts">
-        <el-input
-          v-model="queryParams.matingCounts"
-          placeholder="请输入配种次数"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="羊只id" prop="matingTotal">
-        <el-input
-          v-model="queryParams.matingTotal"
-          placeholder="请输入羊只id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="累计流产次数" prop="miscarriageCounts">
-        <el-input
-          v-model="queryParams.miscarriageCounts"
-          placeholder="请输入累计流产次数"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="体况评分" prop="body">
-        <el-input
-          v-model="queryParams.body"
-          placeholder="请输入体况评分"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乳房评分" prop="breast">
-        <el-input
-          v-model="queryParams.breast"
-          placeholder="请输入乳房评分"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入群来源" prop="source">
-        <el-input
-          v-model="queryParams.source"
-          placeholder="请输入入群来源"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入群日期" prop="soureDate">
-        <el-date-picker clearable
-          v-model="queryParams.soureDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择入群日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="来源牧场id" prop="sourceRanchId">
-        <el-input
-          v-model="queryParams.sourceRanchId"
-          placeholder="请输入来源牧场id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="comment">
-        <el-input
-          v-model="queryParams.comment"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否删除" prop="isDelete">
-        <el-input
-          v-model="queryParams.isDelete"
-          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>
@@ -288,25 +32,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['sheep_file:sheep_file:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['sheep_file:sheep_file:edit']"
-        >修改</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -329,75 +54,835 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="sheep_fileList" @selection-change="handleSelectionChange">
+    <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"
+      @selection-change="handleSelectionChange"
+      style="width: 100%"
+      border
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="羊只id" align="center" prop="id" />
-      <el-table-column label="管理耳号" align="center" prop="manageTags" />
-      <el-table-column label="牧场id" align="center" prop="ranchId" />
-      <el-table-column label="羊舍id" align="center" prop="sheepfoldId" />
-      <el-table-column label="电子耳号" align="center" prop="electronicTags" />
-      <el-table-column label="品种id" align="center" prop="varietyId" />
-      <el-table-column label="家系" align="center" prop="family" />
-      <el-table-column label="羊只类别" align="center" prop="typeId" />
-      <el-table-column label="性别" align="center" prop="gender" />
-      <el-table-column label="出生日期" align="center" prop="birthday" width="180">
+      <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="牧场名称"
+        align="center"
+        prop="drRanch"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <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="羊舍名称"
+        align="center"
+        prop="sheepfoldName"
+        width="120"
+        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>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['electronicTags'].visible"
+        label="电子耳号"
+        align="center"
+        prop="electronicTags"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">电子耳号</span>
+        </template>
+        <template #default="scope">
+          <el-tooltip :content="scope.row.electronicTags" placement="top">
+            <span style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+            {{ scope.row.electronicTags }}
+            </span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['varietyId'].visible"
+        label="品种id"
+        align="center"
+        prop="varietyId"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">品种id</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['variety'].visible"
+        label="品种"
+        align="center"
+        prop="variety"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">品种</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['family'].visible"
+        label="家系"
+        align="center"
+        prop="family"
+        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['gender'].visible"
+        label="性别"
+        align="center"
+        prop="gender"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">性别</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['birthday'].visible"
+        label="出生日期"
+        align="center"
+        prop="birthday"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">出生日期</span>
+        </template>
         <template #default="scope">
           <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="出生体重" align="center" prop="birthWeight" />
-      <el-table-column label="胎次" align="center" prop="parity" />
-      <el-table-column label="羊只状态" align="center" prop="statusId" />
-      <el-table-column label="断奶日期" align="center" prop="weaningDate" width="180">
+      <el-table-column
+        v-if="columns['dayAge'].visible"
+        label="日龄"
+        align="center"
+        prop="dayAge"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">日龄</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['monthAge'].visible"
+        label="月龄"
+        align="center"
+        prop="monthAge"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">月龄</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['parity'].visible"
+        label="胎次"
+        align="center"
+        prop="parity"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">胎次</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['birthWeight'].visible"
+        label="出生体重"
+        align="center"
+        prop="birthWeight"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">出生体重</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['weaningDate'].visible"
+        label="断奶日期"
+        align="center"
+        prop="weaningDate"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">断奶日期</span>
+        </template>
         <template #default="scope">
           <span>{{ parseTime(scope.row.weaningDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="断奶体重" align="center" prop="weaningWeight" />
-      <el-table-column label="繁育状态id" align="center" prop="breedStatusId" />
-      <el-table-column label="父号id" align="center" prop="fatherId" />
-      <el-table-column label="母号id" align="center" prop="motherId" />
-      <el-table-column label="受体id" align="center" prop="receptorId" />
-      <el-table-column label="配种日期" align="center" prop="matingDate" width="180">
+      <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>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['weaningWeight'].visible"
+        label="断奶体重"
+        align="center"
+        prop="weaningWeight"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">断奶体重</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['currentWeight'].visible"
+        label="当前体重"
+        align="center"
+        prop="currentWeight"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <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="父亲管理耳号"
+        align="center"
+        prop="fatherManageTags"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <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="母亲管理耳号"
+        align="center"
+        prop="motherManageTags"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <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['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"
+        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="祖父管理耳号"
+        align="center"
+        prop="grandfatherManageTags"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <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="祖母管理耳号"
+        align="center"
+        prop="grandmotherManageTags"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <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="外祖父管理耳号"
+        align="center"
+        prop="maternalGrandfatherManageTags"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <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="外祖母管理耳号"
+        align="center"
+        prop="maternalGrandmotherManageTags"
+        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="配种日期"
+        align="center"
+        prop="matingDate"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">配种日期</span>
+        </template>
         <template #default="scope">
           <span>{{ parseTime(scope.row.matingDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="配种类型" align="center" prop="matingTypeId" />
-      <el-table-column label="孕检日期" align="center" prop="pregDate" width="180">
+      <el-table-column
+        v-if="columns['matingTypeId'].visible"
+        label="配种类型"
+        align="center"
+        prop="matingTypeId"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">配种类型</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['pregDate'].visible"
+        label="孕检日期"
+        align="center"
+        prop="pregDate"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">孕检日期</span>
+        </template>
         <template #default="scope">
           <span>{{ parseTime(scope.row.pregDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="产羔日期" align="center" prop="lambingDate" width="180">
+      <el-table-column
+        v-if="columns['lambingDate'].visible"
+        label="产羔日期"
+        align="center"
+        prop="lambingDate"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">产羔日期</span>
+        </template>
         <template #default="scope">
           <span>{{ parseTime(scope.row.lambingDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="产羔时怀孕天数" align="center" prop="lambingDay" />
-      <el-table-column label="预产日期" align="center" prop="expectedDate" width="180">
+      <el-table-column
+        v-if="columns['lambingDay'].visible"
+        label="产羔时怀孕天数"
+        align="center"
+        prop="lambingDay"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">产羔时怀孕天数</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['matingDay'].visible"
+        label="配后天数"
+        align="center"
+        prop="matingDay"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">配后天数</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['gestationDay'].visible"
+        label="怀孕天数"
+        align="center"
+        prop="gestationDay"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">怀孕天数</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['expectedDate'].visible"
+        label="预产日期"
+        align="center"
+        prop="expectedDate"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">预产日期</span>
+        </template>
         <template #default="scope">
           <span>{{ parseTime(scope.row.expectedDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否性控" align="center" prop="controlled" />
-      <el-table-column label="配种次数" align="center" prop="matingCounts" />
-      <el-table-column label="羊只id" align="center" prop="matingTotal" />
-      <el-table-column label="累计流产次数" align="center" prop="miscarriageCounts" />
-      <el-table-column label="体况评分" align="center" prop="body" />
-      <el-table-column label="乳房评分" align="center" prop="breast" />
-      <el-table-column label="入群来源" align="center" prop="source" />
-      <el-table-column label="入群日期" align="center" prop="soureDate" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.soureDate, '{y}-{m}-{d}') }}</span>
+      <el-table-column
+        v-if="columns['postLambingDay'].visible"
+        label="产后天数"
+        align="center"
+        prop="postLambingDay"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">产后天数</span>
         </template>
       </el-table-column>
-      <el-table-column label="来源牧场id" align="center" prop="sourceRanchId" />
-      <el-table-column label="备注" align="center" prop="comment" />
-      <el-table-column label="是否删除" align="center" prop="isDelete" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        v-if="columns['lactationDay'].visible"
+        label="泌乳天数"
+        align="center"
+        prop="lactationDay"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">泌乳天数</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['anestrousDay'].visible"
+        label="空怀天数"
+        align="center"
+        prop="anestrousDay"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">空怀天数</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['matingCounts'].visible"
+        label="配种次数"
+        align="center"
+        prop="matingCounts"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">配种次数</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['matingTotal'].visible"
+        label="累计配种次数"
+        align="center"
+        prop="matingTotal"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">累计配种次数</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['miscarriageCounts'].visible"
+        label="累计流产次数"
+        align="center"
+        prop="miscarriageCounts"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">累计流产次数</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['comment'].visible"
+        label="备注"
+        align="center"
+        prop="comment"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">备注</span>
+        </template>
+        <template #default="scope">
+          <el-tooltip :content="scope.row.comment" placement="top">
+            <span style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+              {{ scope.row.comment }}
+            </span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['controlled'].visible"
+        label="是否性控"
+        align="center"
+        prop="controlled"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">是否性控</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['body'].visible"
+        label="体况评分"
+        align="center"
+        prop="body"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">体况评分</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['breast'].visible"
+        label="乳房评分"
+        align="center"
+        prop="breast"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">乳房评分</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['source'].visible"
+        label="入群来源"
+        align="center"
+        prop="source"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">入群来源</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="columns['sourceDate'].visible"
+        label="入群日期"
+        align="center"
+        prop="sourceDate"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <span style="font-weight: bold; color: #333;">入群日期</span>
+        </template>
+        <template #default="scope">
+          <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="来源牧场"
+        align="center"
+        prop="sourceRanch"
+        width="120"
+        sortable
+      >
+        <template #header>
+          <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
+        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="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['sheep_file:sheep_file:edit']">修改</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['sheep_file:sheep_file:remove']">删除</el-button>
         </template>
       </el-table-column>
@@ -411,162 +896,88 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改羊只基本信息对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="sheep_fileRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="管理耳号" prop="manageTags">
-          <el-input v-model="form.manageTags" placeholder="请输入管理耳号" />
-        </el-form-item>
-        <el-form-item label="牧场id" prop="ranchId">
-          <el-input v-model="form.ranchId" placeholder="请输入牧场id" />
-        </el-form-item>
-        <el-form-item label="羊舍id" prop="sheepfoldId">
-          <el-input v-model="form.sheepfoldId" placeholder="请输入羊舍id" />
-        </el-form-item>
-        <el-form-item label="电子耳号" prop="electronicTags">
-          <el-input v-model="form.electronicTags" placeholder="请输入电子耳号" />
-        </el-form-item>
-        <el-form-item label="品种id" prop="varietyId">
-          <el-input v-model="form.varietyId" placeholder="请输入品种id" />
-        </el-form-item>
-        <el-form-item label="家系" prop="family">
-          <el-input v-model="form.family" placeholder="请输入家系" />
-        </el-form-item>
-        <el-form-item label="羊只类别" prop="typeId">
-          <el-input v-model="form.typeId" placeholder="请输入羊只类别" />
-        </el-form-item>
-        <el-form-item label="性别" prop="gender">
-          <el-input v-model="form.gender" placeholder="请输入性别" />
-        </el-form-item>
-        <el-form-item label="出生日期" prop="birthday">
-          <el-date-picker clearable
-            v-model="form.birthday"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择出生日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="出生体重" prop="birthWeight">
-          <el-input v-model="form.birthWeight" placeholder="请输入出生体重" />
-        </el-form-item>
-        <el-form-item label="胎次" prop="parity">
-          <el-input v-model="form.parity" placeholder="请输入胎次" />
-        </el-form-item>
-        <el-form-item label="羊只状态" prop="statusId">
-          <el-input v-model="form.statusId" placeholder="请输入羊只状态" />
-        </el-form-item>
-        <el-form-item label="断奶日期" prop="weaningDate">
-          <el-date-picker clearable
-            v-model="form.weaningDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择断奶日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="断奶体重" prop="weaningWeight">
-          <el-input v-model="form.weaningWeight" placeholder="请输入断奶体重" />
-        </el-form-item>
-        <el-form-item label="繁育状态id" prop="breedStatusId">
-          <el-input v-model="form.breedStatusId" placeholder="请输入繁育状态id" />
-        </el-form-item>
-        <el-form-item label="父号id" prop="fatherId">
-          <el-input v-model="form.fatherId" placeholder="请输入父号id" />
-        </el-form-item>
-        <el-form-item label="母号id" prop="motherId">
-          <el-input v-model="form.motherId" placeholder="请输入母号id" />
-        </el-form-item>
-        <el-form-item label="受体id" prop="receptorId">
-          <el-input v-model="form.receptorId" placeholder="请输入受体id" />
-        </el-form-item>
-        <el-form-item label="配种日期" prop="matingDate">
-          <el-date-picker clearable
-            v-model="form.matingDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择配种日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="配种类型" prop="matingTypeId">
-          <el-input v-model="form.matingTypeId" placeholder="请输入配种类型" />
-        </el-form-item>
-        <el-form-item label="孕检日期" prop="pregDate">
-          <el-date-picker clearable
-            v-model="form.pregDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择孕检日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="产羔日期" prop="lambingDate">
-          <el-date-picker clearable
-            v-model="form.lambingDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择产羔日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="产羔时怀孕天数" prop="lambingDay">
-          <el-input v-model="form.lambingDay" placeholder="请输入产羔时怀孕天数" />
-        </el-form-item>
-        <el-form-item label="预产日期" prop="expectedDate">
-          <el-date-picker clearable
-            v-model="form.expectedDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择预产日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="是否性控" prop="controlled">
-          <el-input v-model="form.controlled" placeholder="请输入是否性控" />
-        </el-form-item>
-        <el-form-item label="配种次数" prop="matingCounts">
-          <el-input v-model="form.matingCounts" placeholder="请输入配种次数" />
-        </el-form-item>
-        <el-form-item label="羊只id" prop="matingTotal">
-          <el-input v-model="form.matingTotal" placeholder="请输入羊只id" />
-        </el-form-item>
-        <el-form-item label="累计流产次数" prop="miscarriageCounts">
-          <el-input v-model="form.miscarriageCounts" placeholder="请输入累计流产次数" />
-        </el-form-item>
-        <el-form-item label="体况评分" prop="body">
-          <el-input v-model="form.body" placeholder="请输入体况评分" />
-        </el-form-item>
-        <el-form-item label="乳房评分" prop="breast">
-          <el-input v-model="form.breast" placeholder="请输入乳房评分" />
-        </el-form-item>
-        <el-form-item label="入群来源" prop="source">
-          <el-input v-model="form.source" placeholder="请输入入群来源" />
-        </el-form-item>
-        <el-form-item label="入群日期" prop="soureDate">
-          <el-date-picker clearable
-            v-model="form.soureDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择入群日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="来源牧场id" prop="sourceRanchId">
-          <el-input v-model="form.sourceRanchId" placeholder="请输入来源牧场id" />
-        </el-form-item>
-        <el-form-item label="备注" prop="comment">
-          <el-input v-model="form.comment" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="是否删除" prop="isDelete">
-          <el-input v-model="form.isDelete" placeholder="请输入是否删除" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+    <!-- 列显示设置对话框 -->
+    <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 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>
+          <el-checkbox label="gender">性别</el-checkbox>
+          <el-checkbox label="birthday">出生日期</el-checkbox>
+          <el-checkbox label="dayAge">日龄</el-checkbox>
+          <el-checkbox label="monthAge">月龄</el-checkbox>
+          <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="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="receptorManageTags">受体管理耳号</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="matingDate">配种日期</el-checkbox>
+          <el-checkbox label="matingTypeId">配种类型</el-checkbox>
+          <el-checkbox label="pregDate">孕检日期</el-checkbox>
+          <el-checkbox label="lambingDate">产羔日期</el-checkbox>
+          <el-checkbox label="lambingDay">产羔时怀孕天数</el-checkbox>
+          <el-checkbox label="matingDay">配后天数</el-checkbox>
+          <el-checkbox label="gestationDay">怀孕天数</el-checkbox>
+          <el-checkbox label="expectedDate">预产日期</el-checkbox>
+          <el-checkbox label="postLambingDay">产后天数</el-checkbox>
+          <el-checkbox label="lactationDay">泌乳天数</el-checkbox>
+          <el-checkbox label="anestrousDay">空怀天数</el-checkbox>
+          <el-checkbox label="matingCounts">配种次数</el-checkbox>
+          <el-checkbox label="matingTotal">累计配种次数</el-checkbox>
+          <el-checkbox label="miscarriageCounts">累计流产次数</el-checkbox>
+          <el-checkbox label="comment">备注</el-checkbox>
+          <el-checkbox label="controlled">是否性控</el-checkbox>
+          <el-checkbox label="body">体况评分</el-checkbox>
+          <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-group>
+      </div>
+      <div style="margin-top: 20px; display: flex; justify-content: space-between; align-items: center;">
+        <el-checkbox v-model="isAllSelected" @change="toggleAllSelection" >全选</el-checkbox>
+        <div>
+          <el-button type="primary" @click="confirmColumnSettings">提交</el-button>
+          <el-button @click="resetColumnSettings">重置</el-button>
         </div>
-      </template>
+      </div>
     </el-dialog>
   </div>
 </template>
 
 <script setup name="Sheep_file">
-import { listSheep_file, getSheep_file, delSheep_file, addSheep_file, updateSheep_file } from "@/api/sheep_file/sheep_file"
+import { listSheep_file, getSheep_file } from "@/api/sheep_file/sheep_file"
 
 const { proxy } = getCurrentInstance()
 
@@ -579,58 +990,104 @@ const single = ref(true)
 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', '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 isAllSelected = ref(false)
+const columns = reactive({
+  id: { visible: true },
+  bsManageTags: { visible: true },
+  ranchId: { visible: true },
+  drRanch: { visible: true },
+  sheepfoldId: { visible: true },
+  sheepfoldName: { visible: true },
+  electronicTags: { visible: true },
+  varietyId: { visible: true },
+  variety: { visible: true },
+  family: { visible: true },
+  name: { visible: true },
+  gender: { visible: true },
+  birthday: { visible: true },
+  dayAge: { visible: true },
+  monthAge: { visible: true },
+  parity: { visible: true },
+  birthWeight: { visible: true },
+  weaningDate: { visible: true },
+  statusId: { visible: true },
+  weaningWeight: { visible: true },
+  currentWeight: { visible: true },
+  breedStatusId: { visible: true },
+  breed: { visible: true },
+  bsFatherId: { visible: true },
+  fatherManageTags: { visible: true },
+  bsMotherId: { visible: true },
+  motherManageTags: { visible: true },
+  receptorId: { visible: true },
+  receptorManageTags: { visible: true },
+  fatherFatherId: { visible: true },
+  grandfatherManageTags: { visible: true },
+  fatherMotherId: { visible: true },
+  grandmotherManageTags: { visible: true },
+  fatherId: { visible: true },
+  maternalGrandfatherManageTags: { visible: true },
+  motherId: { visible: true },
+  maternalGrandmotherManageTags: { visible: true },
+  matingDate: { visible: true },
+  matingTypeId: { visible: true },
+  pregDate: { visible: true },
+  lambingDate: { visible: true },
+  lambingDay: { visible: true },
+  matingDay: { visible: true },
+  gestationDay: { visible: true },
+  expectedDate: { visible: true },
+  postLambingDay: { visible: true },
+  lactationDay: { visible: true },
+  anestrousDay: { visible: true },
+  matingCounts: { visible: true },
+  matingTotal: { visible: true },
+  miscarriageCounts: { visible: true },
+  comment: { visible: true },
+  controlled: { visible: true },
+  body: { visible: true },
+  breast: { visible: true },
+  source: { visible: true },
+  sourceDate: { visible: true },
+  sourceRanchId: { visible: true },
+  sourceRanch: { visible: true },
+  updateBy: { visible: true },
+  updateTime: { visible: true },
+  createBy: { visible: true },
+  createTime: { visible: true }
+})
 
 const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    manageTags: null,
-    ranchId: null,
-    sheepfoldId: null,
+    id: null,
+    bsManageTags: null,
+    drRanch: null,
     electronicTags: null,
-    varietyId: null,
-    family: null,
-    typeId: null,
+    variety: null,
+    name: null,
     gender: null,
-    birthday: null,
-    birthWeight: null,
-    parity: null,
     statusId: null,
-    weaningDate: null,
-    weaningWeight: null,
-    breedStatusId: null,
-    fatherId: null,
-    motherId: null,
-    receptorId: null,
-    matingDate: null,
-    matingTypeId: null,
-    pregDate: null,
-    lambingDate: null,
-    lambingDay: null,
-    expectedDate: null,
-    controlled: null,
-    matingCounts: null,
-    matingTotal: null,
-    miscarriageCounts: null,
-    body: null,
-    breast: null,
-    source: null,
-    soureDate: null,
-    sourceRanchId: null,
-    comment: null,
-    isDelete: null
+    breed: null,
   },
   rules: {
+    id: [
+      { required: true, message: "羊只id不能为空", trigger: "blur" }
+    ],
   }
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
-/** 查询羊只基本信息列表 */
+/** 查询羊只档案列表 */
 function getList() {
   loading.value = true
-  console.log(queryParams.value)
   listSheep_file(queryParams.value).then(response => {
     sheep_fileList.value = response.rows
     total.value = response.total
@@ -638,50 +1095,68 @@ function getList() {
   })
 }
 
-// 取消按钮
-function cancel() {
-  open.value = false
-  reset()
-}
-
 // 表单重置
 function reset() {
   form.value = {
     id: null,
-    manageTags: null,
+    bsManageTags: null,
     ranchId: null,
+    drRanch: null,
     sheepfoldId: null,
+    sheepfoldName: null,
     electronicTags: null,
     varietyId: null,
+    variety: null,
     family: null,
-    typeId: null,
+    name: null,
     gender: null,
     birthday: null,
-    birthWeight: null,
+    dayAge: null,
+    monthAge: null,
     parity: null,
-    statusId: null,
+    birthWeight: null,
     weaningDate: null,
+    statusId: null,
     weaningWeight: null,
+    currentWeight: null,
     breedStatusId: null,
-    fatherId: null,
-    motherId: null,
+    breed: null,
+    bsFatherId: null,
+    fatherManageTags: null,
+    bsMotherId: null,
+    motherManageTags: null,
     receptorId: null,
+    receptorManageTags: null,
+    fatherFatherId: null,
+    grandfatherManageTags: null,
+    fatherMotherId: null,
+    grandmotherManageTags: null,
+    fatherId: null,
+    maternalGrandfatherManageTags: null,
+    motherId: null,
+    maternalGrandmotherManageTags: null,
     matingDate: null,
     matingTypeId: null,
     pregDate: null,
     lambingDate: null,
     lambingDay: null,
+    matingDay: null,
+    gestationDay: null,
     expectedDate: null,
-    controlled: null,
+    postLambingDay: null,
+    lactationDay: null,
+    anestrousDay: null,
     matingCounts: null,
     matingTotal: null,
     miscarriageCounts: null,
+    comment: null,
+    controlled: null,
     body: null,
     breast: null,
     source: null,
-    soureDate: null,
+    sourceDate: null,
     sourceRanchId: null,
-    comment: null,
+    sourceRanch: null,
     updateBy: null,
     updateTime: null,
     createBy: null,
@@ -691,7 +1166,7 @@ function reset() {
   proxy.resetForm("sheep_fileRef")
 }
 
-/** 搜索按钮操作 */
+/** 搜索建议功能 */
 function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
@@ -710,49 +1185,10 @@ function handleSelectionChange(selection) {
   multiple.value = !selection.length
 }
 
-/** 新增按钮操作 */
-function handleAdd() {
-  reset()
-  open.value = true
-  title.value = "添加羊只基本信息"
-}
-
-/** 修改按钮操作 */
-function handleUpdate(row) {
-  reset()
-  const _id = row.id || ids.value
-  getSheep_file(_id).then(response => {
-    form.value = response.data
-    open.value = true
-    title.value = "修改羊只基本信息"
-  })
-}
-
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["sheep_fileRef"].validate(valid => {
-    if (valid) {
-      if (form.value.id != null) {
-        updateSheep_file(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addSheep_file(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
-      }
-    }
-  })
-}
-
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除羊只基本信息编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除羊只档案编号为"' + _ids + '"的数据项？').then(function() {
     return delSheep_file(_ids)
   }).then(() => {
     getList()
@@ -767,5 +1203,62 @@ function handleExport() {
   }, `sheep_file_${new Date().getTime()}.xlsx`)
 }
 
+// 打开列设置对话框
+function openColumnDialog() {
+  // 加载上次选择的状态
+  const savedColumns = localStorage.getItem('selectedColumns')
+  if (savedColumns) {
+    selectedColumns.value = JSON.parse(savedColumns)
+    Object.keys(columns).forEach(column => {
+      columns[column].visible = selectedColumns.value.includes(column)
+    })
+  }
+  columnDialogVisible.value = true
+}
+
+// 全选功能
+function toggleAllSelection() {
+  if (isAllSelected.value) {
+    selectedColumns.value = Object.keys(columns)
+  } else {
+    selectedColumns.value = []
+  }
+  updateColumnVisibility()
+}
+
+// 更新列的显示状态
+function updateColumnVisibility() {
+  Object.keys(columns).forEach(column => {
+    columns[column].visible = selectedColumns.value.includes(column)
+  })
+}
+
+// 确认列设置
+function confirmColumnSettings() {
+  updateColumnVisibility()
+  // 保存当前选择到本地存储
+  localStorage.setItem('selectedColumns', JSON.stringify(selectedColumns.value))
+  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', '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'
+  ]
+  updateColumnVisibility()
+  localStorage.setItem('selectedColumns', JSON.stringify(selectedColumns.value))
+}
+
 getList()
 </script>
+
+<style scoped>
+:deep(.el-checkbox) {
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  padding: 10px;
+  margin: 5px;
+  width: calc(30% - 20px);
+}
+</style>
\ No newline at end of file
diff --git a/src/views/sheepfold_management/sheepfold_management/index.vue b/src/views/sheepfold_management/sheepfold_management/index.vue
index cf7cc6a..1722282 100644
--- a/src/views/sheepfold_management/sheepfold_management/index.vue
+++ b/src/views/sheepfold_management/sheepfold_management/index.vue
@@ -69,7 +69,7 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="sheepfold_managementList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="sheepfold_managementList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="羊舍id" align="center" prop="id" />
       <el-table-column label="牧场" align="center" prop="ranchId">