diff --git a/package.json b/package.json
index de8e23e..158bb8c 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "axios": "0.28.1",
     "clipboard": "2.0.11",
     "echarts": "5.5.1",
-    "element-plus": "2.7.6",
+    "element-plus": "^2.7.6",
     "file-saver": "2.0.5",
     "fuse.js": "6.6.2",
     "js-beautify": "1.14.11",
diff --git a/src/api/biosafety/prescription.js b/src/api/biosafety/prescription.js
new file mode 100644
index 0000000..5c5bdab
--- /dev/null
+++ b/src/api/biosafety/prescription.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询处方列表
+export function listPrescription(query) {
+  return request({
+    url: '/biosafety/prescription/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询处方详细
+export function getPrescription(id) {
+  return request({
+    url: '/biosafety/prescription/' + id,
+    method: 'get'
+  })
+}
+
+// 新增处方
+export function addPrescription(data) {
+  return request({
+    url: '/biosafety/prescription',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改处方
+export function updatePrescription(data) {
+  return request({
+    url: '/biosafety/prescription',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除处方
+export function delPrescription(id) {
+  return request({
+    url: '/biosafety/prescription/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/biosafety/unit.js b/src/api/biosafety/unit.js
new file mode 100644
index 0000000..a2a72c4
--- /dev/null
+++ b/src/api/biosafety/unit.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询药品单位列表
+export function listUnit(query) {
+  return request({
+    url: '/biosafety/unit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询药品单位详细
+export function getUnit(id) {
+  return request({
+    url: '/biosafety/unit/' + id,
+    method: 'get'
+  })
+}
+
+// 新增药品单位
+export function addUnit(data) {
+  return request({
+    url: '/biosafety/unit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改药品单位
+export function updateUnit(data) {
+  return request({
+    url: '/biosafety/unit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除药品单位
+export function delUnit(id) {
+  return request({
+    url: '/biosafety/unit/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/biosafety/usageInfo.js b/src/api/biosafety/usageInfo.js
new file mode 100644
index 0000000..6bf9e1f
--- /dev/null
+++ b/src/api/biosafety/usageInfo.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询药品使用记录列表
+export function listUsageInfo(query) {
+  return request({
+    url: '/biosafety/usageInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询药品使用记录详细
+export function getUsageInfo(id) {
+  return request({
+    url: '/biosafety/usageInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增药品使用记录
+export function addUsageInfo(data) {
+  return request({
+    url: '/biosafety/usageInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改药品使用记录
+export function updateUsageInfo(data) {
+  return request({
+    url: '/biosafety/usageInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除药品使用记录
+export function delUsageInfo(id) {
+  return request({
+    url: '/biosafety/usageInfo/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/produce/manage_sheep/add_sheep/add_sheep.js b/src/api/produce/manage_sheep/add_sheep/add_sheep.js
new file mode 100644
index 0000000..e4644ff
--- /dev/null
+++ b/src/api/produce/manage_sheep/add_sheep/add_sheep.js
@@ -0,0 +1,20 @@
+import request from '@/utils/request';
+
+// 新增羊只
+export function addSheep(data) {
+  return request({
+    url: '/produce/manage_sheep/add_sheep', 
+    method: 'post',
+    data: data
+  });
+}
+
+//导出模板
+export function exportSheepForm(data) {
+  return request({
+    url: '/produce/manage_sheep/add_sheep/exportForm',
+    method: 'post',
+    data,
+    responseType: 'blob'
+  });
+}
\ No newline at end of file
diff --git a/src/api/produce/manage_sheep/trans_group/trans_group.js b/src/api/produce/manage_sheep/trans_group/trans_group.js
new file mode 100644
index 0000000..e29e992
--- /dev/null
+++ b/src/api/produce/manage_sheep/trans_group/trans_group.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询转群记录列表
+export function listTrans_group(query) {
+  return request({
+    url: '/produce/manage_sheep/trans_group/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询转群记录详细
+export function getTrans_group(id) {
+  return request({
+    url: '/produce/manage_sheep/trans_group/' + id,
+    method: 'get'
+  })
+}
+
+// 新增转群记录
+export function addTrans_group(data) {
+  return request({
+    url: '/produce/manage_sheep/trans_group',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改转群记录
+export function updateTrans_group(data) {
+  return request({
+    url: '/produce/manage_sheep/trans_group',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除转群记录
+export function delTrans_group(id) {
+  return request({
+    url: '/produce/manage_sheep/trans_group/' + id,
+    method: 'delete'
+  })
+}
+
+// 获取羊舍列表
+export function listSheepfold() {
+  return request({
+    url: '/produce/sheepfold/list',
+    method: 'get',
+  });
+}
diff --git a/src/api/produce/manage_sheep/transition_info/transition_info.js b/src/api/produce/manage_sheep/transition_info/transition_info.js
new file mode 100644
index 0000000..a86dbf4
--- /dev/null
+++ b/src/api/produce/manage_sheep/transition_info/transition_info.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询转场列表
+export function listTransition_info(query) {
+  return request({
+    url: 'produce/manage_sheep/transition_info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询转场详细
+export function getTransition_info(id) {
+  return request({
+    url: 'produce/manage_sheep/transition_info/' + id,
+    method: 'get'
+  })
+}
+
+// 新增转场
+export function addTransition_info(data) {
+  return request({
+    url: 'produce/manage_sheep/transition_info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改转场
+export function updateTransition_info(data) {
+  return request({
+    url: 'produce/manage_sheep/transition_info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除转场
+export function delTransition_info(id) {
+  return request({
+    url: 'produce/manage_sheep/transition_info/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/produce/castrate.js b/src/api/produce/other/castrate/castrate.js
similarity index 75%
rename from src/api/produce/castrate.js
rename to src/api/produce/other/castrate/castrate.js
index df5c6cd..cf036a2 100644
--- a/src/api/produce/castrate.js
+++ b/src/api/produce/other/castrate/castrate.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询去势列表
 export function listCastrate(query) {
   return request({
-    url: '/produce/castrate/list',
+    url: '/produce/other/castrate/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listCastrate(query) {
 // 查询去势详细
 export function getCastrate(id) {
   return request({
-    url: '/produce/castrate/' + id,
+    url: '/produce/other/castrate/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getCastrate(id) {
 // 新增去势
 export function addCastrate(data) {
   return request({
-    url: '/produce/castrate',
+    url: '/produce/other/castrate',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addCastrate(data) {
 // 修改去势
 export function updateCastrate(data) {
   return request({
-    url: '/produce/castrate',
+    url: '/produce/other/castrate',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateCastrate(data) {
 // 删除去势
 export function delCastrate(id) {
   return request({
-    url: '/produce/castrate/' + id,
+    url: '/produce/other/castrate/' + id,
     method: 'delete'
   })
 }
diff --git a/src/api/produce/other/fixHoof/fixHoof.js b/src/api/produce/other/fixHoof/fixHoof.js
new file mode 100644
index 0000000..ed0a56c
--- /dev/null
+++ b/src/api/produce/other/fixHoof/fixHoof.js
@@ -0,0 +1,49 @@
+
+import request from '@/utils/request'
+// 查询修蹄列表
+export function listFixHoof(query) {
+  return request({
+    url: '/produce/other/fixHoof/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询修蹄详细
+export function getFixHoof(id) {
+  return request({
+    url: `/produce/other/fixHoof/${id}`,
+    method: 'get'
+  })
+}
+// 新增修蹄
+export function addFixHoof(data) {
+  return request({
+    url: '/produce/other/fixHoof',
+    method: 'post',
+    data: data
+  })
+}
+// 修改修蹄
+export function updateFixHoof(data) {
+  return request({
+    url: '/produce/other/fixHoof',
+    method: 'put',
+    data: data
+  })
+}
+// 删除修蹄
+export function delFixHoof(ids) {
+  return request({
+    url: `/produce/other/fixHoof/${ids.join(',')}`,
+    method: 'delete'
+  })
+}
+//导出
+export function exportFixHoof(query) {
+  return request({
+    url: '/produce/other/fixHoof/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob' // 导出功能需要设置响应类型为blob
+  })
+}
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/settings.js b/src/settings.js
index d67ff12..c2f78c4 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -45,5 +45,5 @@ export default {
    * The default is only used in the production env
    * If you want to also use it in dev, you can pass ['production', 'development']
    */
-  errorLog: 'production'
+  errorLog: 'production',
 }
diff --git a/src/views/biosafety/medicine/unit.vue b/src/views/biosafety/medicine/unit.vue
new file mode 100644
index 0000000..518da8c
--- /dev/null
+++ b/src/views/biosafety/medicine/unit.vue
@@ -0,0 +1,187 @@
+<template>
+  <div class="app-container">
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+          v-hasPermi="['biosafety:unit:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['biosafety:unit:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['biosafety:unit:remove']">删除</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="unitList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="单位" align="center" prop="name" />
+      <el-table-column label="国际单位" align="center" prop="unit" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['biosafety:unit:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['biosafety:unit:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改药品单位对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="unitRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="单位" prop="name">
+          <el-input v-model="form.name" placeholder="请输入单位" />
+        </el-form-item>
+        <el-form-item label="国际单位" prop="name">
+          <el-input v-model="form.unit" 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>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Unit">
+import { listUnit, getUnit, delUnit, addUnit, updateUnit } from "@/api/biosafety/unit"
+
+const { proxy } = getCurrentInstance()
+
+const unitList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref("")
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询药品单位列表 */
+function getList() {
+  loading.value = true
+  listUnit(queryParams.value).then(response => {
+    unitList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    name: null
+  }
+  proxy.resetForm("unitRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加药品单位"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getUnit(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改药品单位"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["unitRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateUnit(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addUnit(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() {
+    return delUnit(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('biosafety/unit/export', {
+    ...queryParams.value
+  }, `unit_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>
diff --git a/src/views/biosafety/prescription/index.vue b/src/views/biosafety/prescription/index.vue
new file mode 100644
index 0000000..82ac02e
--- /dev/null
+++ b/src/views/biosafety/prescription/index.vue
@@ -0,0 +1,513 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索表单 -->
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="处方编号" prop="no">
+        <el-input v-model="queryParams.no" placeholder="请输入处方编号" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="处方名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入处方名称" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="类型" prop="persType">
+        <el-select v-model="queryParams.persType" placeholder="请选择类型" clearable style="width: 150px">
+          <el-option v-for="dict in pres_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 150px">
+          <el-option v-for="dict in pres_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 按钮组 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+      </el-col> -->
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="prescriptionList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="处方编号" align="center" prop="no" />
+      <el-table-column label="处方名称" align="center" prop="name" />
+      <el-table-column label="类型" align="center" prop="persType">
+        <template #default="scope">
+          <dict-tag :options="pres_type" :value="scope.row.persType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="pres_status" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center"  class-name="small-padding fixed-width" width="300px">
+        <template #default="scope">
+          <el-button link type="primary" icon="View" @click="handleView(scope.row)">详情</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link :type="scope.row.status ? 'warning' : 'primary'" @click="handleStatus(scope.row)">{{ scope.row.status?"禁用":"启用" }}</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 弹框：详情/修改 -->
+    <el-dialog :title="title" v-model="open" width="60%" append-to-body s>
+      <!-- 详情页：只读展示 -->
+      <div v-if="isView" style="padding-bottom:20px ;">
+        <el-descriptions :column="2" border>
+          <el-descriptions-item label="处方编号">{{ form.no }}</el-descriptions-item>
+          <el-descriptions-item label="处方名称">{{ form.name }}</el-descriptions-item>
+          <el-descriptions-item label="类型">
+            <dict-tag :options="pres_type" :value="form.persType" />
+          </el-descriptions-item>
+          <el-descriptions-item label="状态">
+            <dict-tag :options="pres_status" :value="form.status" />
+          </el-descriptions-item>
+          <el-descriptions-item label="备注" :span="2">
+            {{ form.comment || '无' }}
+          </el-descriptions-item>
+        </el-descriptions>
+
+        <el-divider content-position="left">处方详情</el-divider>
+
+        <el-table :data="swPresDetailList" stripe border style="width: 100%" max-height="300">
+          <el-table-column label="序号" type="index" width="60" align="center" />
+          <el-table-column label="药品" prop="mediId" align="center" :formatter="formatMedicine" />
+          <el-table-column label="用量" prop="dosage" />
+          <el-table-column label="使用方法" align="center" prop="usageId" :formatter="formatUsage" />
+          <el-table-column label="单位" prop="unitId" align="center" :formatter="formatUnit" />
+        </el-table>
+      </div>
+
+      <!-- 修改页：可编辑表单 -->
+      <div v-else>
+        <el-form ref="prescriptionRef" :model="form" :rules="rules" label-width="100px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="处方编号" prop="no">
+                <el-input v-model="form.no" placeholder="请输入处方编号" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="处方名称" prop="name">
+                <el-input v-model="form.name" placeholder="请输入处方名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="类型" prop="persType">
+                <el-select v-model="form.persType" placeholder="请选择类型" style="width: 100%">
+                  <el-option v-for="dict in pres_type" :key="dict.value" :label="dict.label"
+                    :value="parseInt(dict.value)" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-select v-model="form.status" placeholder="请选择状态" style="width: 100%">
+                  <el-option v-for="dict in pres_status" :key="dict.value" :label="dict.label"
+                    :value="parseInt(dict.value)" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="comment">
+                <el-input type="textarea" :rows="2" v-model="form.comment" placeholder="请输入备注" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-divider content-position="left">处方详情</el-divider>
+
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button type="primary" icon="Plus" @click="handleAddSwPresDetail()">添加</el-button>
+            </el-col>
+
+          </el-row>
+
+          <el-table :data="swPresDetailList" :row-class-name="rowSwPresDetailIndex"
+            @selection-change="handleSwPresDetailSelectionChange" ref="swPresDetail" border stripe>
+            <el-table-column label="序号" align="center" prop="index" width="60" />
+            <el-table-column label="药品" prop="mediId">
+              <template #default="scope">
+                <el-select v-model="scope.row.mediId" filterable placeholder="请选择药品" style="width: 100%">
+                  <el-option v-for="item in medicines" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="用量" prop="dosage">
+              <template #default="scope">
+                <el-input-number v-model="scope.row.dosage" placeholder="请输入用量" :min="0" :precision="1"
+                  controls-position="right" />
+              </template>
+            </el-table-column>
+            <el-table-column label="单位" prop="unitId">
+              <template #default="scope">
+                <el-select v-model="scope.row.unitId" placeholder="请选择单位">
+                  <el-option v-for="item in units" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="使用方法" prop="usageId">
+              <template #default="scope">
+                <el-select v-model="scope.row.usageId" placeholder="请选择使用方法">
+                  <el-option v-for="item in usages" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+              <template #default="scope">
+                <el-button link type="primary" icon="Delete" @click="deletePresDetail(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+
+      <!-- 底部按钮：仅修改页显示 -->
+      <template #footer v-if="!isView">
+        <div class="dialog-footer">
+          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Prescription">
+import { listPrescription, getPrescription, delPrescription, addPrescription, updatePrescription } from "@/api/biosafety/prescription"
+import { getCurrentInstance, ref, reactive, toRefs } from 'vue'
+import { listUnit } from "@/api/biosafety/unit"
+import { listUsage } from "@/api/biosafety/usage"
+import { listMedicine } from "@/api/biosafety/medicine"
+
+
+const { proxy } = getCurrentInstance()
+const { pres_status, pres_type } = proxy.useDict('pres_status', 'pres_type')
+
+const prescriptionList = ref([])          // 主表数据
+const swPresDetailList = ref([])          // 子表（处方详情）数据
+const open = ref(false)                   // 弹窗显隐
+const loading = ref(true)                 // 列表加载状态
+const showSearch = ref(true)              // 搜索栏显隐
+const ids = ref([])                       // 主表选中的 id 数组
+const checkedSwPresDetail = ref([])       // 子表选中的行序号数组
+const single = ref(true)                  // 是否仅选一条（控制“修改”按钮禁用）
+const multiple = ref(true)                // 是否至少选一条（控制“删除”按钮禁用）
+const total = ref(0)                      // 总条数
+const title = ref("")                     // 弹窗标题
+const isView = ref(false)                 // 当前弹窗是否为“查看详情”模式
+
+/* 响应式数据：form、queryParams、rules */
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    no: null,
+    name: null,
+    persType: null,
+    status: null,
+  },
+  rules: {}
+})
+const { queryParams, form, rules } = toRefs(data)
+
+const units = ref([])   // 单位下拉选项
+const usages = ref([]) // 使用方法下拉选项
+const medicines = ref([]) // 药品下拉选项
+
+/**
+ * 获取药品下拉数据源
+ * 将返回数据转换成 { value, label } 结构，供 el-option 使用
+ */
+function getMedicines() {
+  listMedicine().then(response => {
+    medicines.value = response.rows.map(item => ({
+      value: item.id,
+      label: item.name
+    }))
+  })
+}
+
+/**
+ * 获取单位下拉数据源（单位字典）
+ * 将返回数据转换成 { value, label } 结构，供 el-option 使用
+ */
+function getUnit() {
+  listUnit().then(response => {
+    units.value = response.rows.map(item => ({
+      value: item.id,
+      label: item.name
+    }))
+  })
+}
+
+/**
+ * 获取处方使用方法下拉数据源
+ * 将返回数据转换成 { value, label } 结构，供 el-option 使用
+ */
+function getUsageOptions() {
+  listUsage().then(response => {
+    usages.value = response.rows.map(item => ({
+      value: item.id,
+      label: item.name
+    }))
+  })
+}
+
+/**
+ * 格式化使用方法
+ * 根据 usageId 查找对应的使用方法名称
+ */
+function formatUsage(row) {
+  const usage = usages.value.find(item => item.value === row.usageId)
+  return usage ? usage.label : '未知'
+}
+/**
+ * 格式化药品
+ * 根据 mediId 查找对应的药品名称
+ */
+function formatMedicine(row) {
+  const medicine = medicines.value.find(item => item.value === row.mediId)
+  return medicine ? medicine.label : '未知'
+}
+/**
+ * 格式化单位
+ * 根据 unitId 查找对应的单位名称
+ */
+function formatUnit(row) {
+  const unit = units.value.find(item => item.value === row.unitId)
+  return unit ? unit.label : '未知'
+}
+/**
+ * 查询处方列表
+ * loading 状态开始时置 true，接口返回后更新列表数据与总数，loading 置 false
+ */
+function getList() {
+  loading.value = true
+  listPrescription(queryParams.value).then(response => {
+    prescriptionList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+/**
+ * 表单/子表重置
+ * 将 form、swPresDetailList 重置为初始状态，并清空校验提示
+ */
+function reset() {
+  form.value = {
+    id: null,
+    no: null,
+    name: null,
+    persType: null,
+    comment: null,
+    status: null
+  }
+  swPresDetailList.value = []
+  proxy.resetForm("prescriptionRef")
+  isView.value = false
+}
+
+/**
+ * 搜索按钮
+ * 将分页重置到第一页后重新拉取数据
+ */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/**
+ * 重置搜索条件
+ * 清空 queryRef 表单后重新触发查询
+ */
+function resetQuery() {
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+/**
+ * 主表多选回调
+ * 更新 ids 数组，并设置 single / multiple 按钮禁用状态
+ */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length !== 1        // 只有一条时才允许“修改”
+  multiple.value = !selection.length           // 至少一条时才允许“删除”
+}
+
+/**
+ * 新增按钮
+ * 重置表单、打开弹窗、设置标题为“添加处方”
+ */
+function handleAdd() {
+  reset()
+  form.value.no = `P${Date.now()}` // 自动生成处方编号
+  open.value = true
+  title.value = "添加处方"
+}
+
+/**
+ * 查看详情
+ * 根据 id 拉取单条记录及子表数据，弹窗只读展示
+ */
+function handleView(row) {
+  reset()
+  const _id = row.id || ids.value
+  getPrescription(_id).then(response => {
+    form.value = response.data
+    swPresDetailList.value = response.data.swPresDetailList
+    open.value = true
+    title.value = "处方详情"
+    isView.value = true
+  })
+}
+
+/**
+ * 修改按钮
+ * 与查看详情共用接口，但弹窗可编辑
+ */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getPrescription(_id).then(response => {
+    form.value = response.data
+    swPresDetailList.value = response.data.swPresDetailList
+    open.value = true
+    title.value = "修改处方"
+    isView.value = false
+  })
+}
+// 提交按钮
+function handleStatus(row) {
+  const _id = row.id || ids.value
+
+  const newStatus = row.status ? 0 : 1 // 切换状态
+  proxy.$modal.confirm(`是否确认将 ${row.name }处方${row.status ? '禁用' : '启用'}？`).then(() => {
+    return updatePrescription({ id: _id, status: newStatus })
+  }).then(() => {
+    proxy.$modal.msgSuccess(`处方${row.status ? '禁用' : '启用'}成功`)
+    getList() // 刷新列表
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+/**
+ * 提交表单（新增/修改）
+ * 先校验，再把子表数据合并到 form 中，最后根据 id 判断是新增还是更新
+ */
+function submitForm() {
+  proxy.$refs["prescriptionRef"].validate(valid => {
+    if (valid) {
+      form.value.swPresDetailList = swPresDetailList.value
+      if (form.value.id) {
+        updatePrescription(form.value).then(() => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addPrescription(form.value).then(() => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/**
+ * 删除按钮（单条/批量）
+ * 弹出确认框后调用接口删除，成功后刷新列表
+ */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal.confirm(`是否确认删除处方编号为"${_ids}"的数据项？`).then(() => {
+    return delPrescription(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  })
+}
+
+/**
+ * 子表行序号计算
+ * 通过 el-table 的 row-class-name 钩子给每一行写入 index（从 1 开始）
+ */
+function rowSwPresDetailIndex({ row, rowIndex }) {
+  row.index = rowIndex + 1
+}
+
+/**
+ * 子表“添加”按钮
+ * 往 swPresDetailList 追加一条空记录
+ */
+function handleAddSwPresDetail() {
+  swPresDetailList.value.push({ mediId: '', dosage: '', unitId: '', usageId: '' })
+}
+
+/**
+ * 子表“删除”按钮
+ * 
+ */
+function deletePresDetail(row) {
+  const index = swPresDetailList.value.findIndex(item => item.index === row.index)
+  if (index !== -1) {
+    swPresDetailList.value.splice(index, 1)
+  }
+}
+/**
+ * 子表多选回调
+ * 记录被选中的行序号数组
+ */
+function handleSwPresDetailSelectionChange(selection) {
+  checkedSwPresDetail.value = selection.map(item => item.index)
+}
+
+function cancel() {
+  open.value = false
+  reset()
+}
+
+/**
+ * 导出按钮
+ * 调用后端通用导出接口，文件名带时间戳
+ */
+function handleExport() {
+  proxy.download('biosafety/prescription/export', { ...queryParams.value }, `prescription_${Date.now()}.xlsx`)
+}
+
+// 初始化：加载列表
+getList()
+getUnit()  // 获取单位下拉数据源
+getUsageOptions() // 获取使用方法下拉数据源
+getMedicines() // 获取药品下拉数据源
+</script>
\ No newline at end of file
diff --git a/src/views/biosafety/usageInfo/index.vue b/src/views/biosafety/usageInfo/index.vue
new file mode 100644
index 0000000..eb06c75
--- /dev/null
+++ b/src/views/biosafety/usageInfo/index.vue
@@ -0,0 +1,298 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索表单 -->
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="使用名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入使用名称" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="使用类型" prop="useType">
+        <el-select v-model="queryParams.useType" placeholder="请选择使用类型" clearable style="width: 180px">
+          <el-option v-for="dict in pres_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="使用时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" />
+      </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>
+
+    <!-- 工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['biosafety:usage:export']">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
+    </el-row>
+
+    <!-- 数据表格 -->
+    <el-table v-loading="loading" :data="usageList" @selection-change="handleSelectionChange">
+      <el-table-column label="使用名称" align="center" prop="name" />
+      <el-table-column label="使用类型" align="center" prop="useType">
+        <template #default="scope">
+          <dict-tag :options="pres_type" :value="scope.row.useType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="使用时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="View" @click="handleDetail(scope.row)"
+            v-hasPermi="['biosafety:usage:query']">详情</el-button>
+          <!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['biosafety:usage:remove']">删除</el-button> -->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- ===== 美化后的详情弹窗 ===== -->
+    <el-dialog :title="title" v-model="open" width="680px" top="8vh" append-to-body :close-on-click-modal="false"
+      class="usage-detail-dialog">
+      <!-- 基础信息 -->
+      <el-card shadow="never" class="detail-card">
+        <template #header>
+          <div class="card-header">
+            <el-icon>
+              <Document />
+            </el-icon> 基本信息
+          </div>
+        </template>
+
+        <el-descriptions :column="2" border>
+          <el-descriptions-item label="使用名称">
+            {{ form.name }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="使用类型">
+            <el-tag size="small" :type="form.useType === 1 ? 'primary' : 'success'">
+              {{pres_type.find(it => it.value === form.useType)?.label || ''}}
+            </el-tag>
+          </el-descriptions-item>
+
+          <el-descriptions-item label="使用时间" :span="2">
+            {{ parseTime(form.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-card>
+
+      <!-- 药品明细 -->
+      <el-card shadow="never" class="detail-card" style="margin-top: 16px;">
+        <template #header>
+          <div class="card-header">
+            <el-icon>
+              <List />
+            </el-icon> 药品使用明细
+          </div>
+        </template>
+
+        <el-table :data="swMedicineUsageDetailsList" stripe size="small"
+          :row-class-name="rowSwMedicineUsageDetailsIndex" style="width: 100%">
+          <el-table-column label="药品" prop="mediName" show-overflow-tooltip />
+          <el-table-column label="用量" prop="dosage" width="80" />
+          <el-table-column label="单位" prop="unit" align="center" :formatter="formatUnit" />
+          <el-table-column label="使用方法" align="center" prop="usageId" :formatter="formatUsage" />
+          <el-table-column label="生产厂家" prop="manufacturer" show-overflow-tooltip />
+          <el-table-column label="生产批号" prop="batchNumber" width="120" />
+        </el-table>
+      </el-card>
+
+      <!-- 底部按钮 -->
+      <template #footer>
+        <el-button @click="cancel">关 闭</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Usage">
+import { listUsageInfo, getUsageInfo, delUsageInfo } from '@/api/biosafety/usageInfo'
+import { getCurrentInstance, reactive, ref, toRefs } from 'vue'
+import { listUnit } from "@/api/biosafety/unit"
+import { listUsage } from "@/api/biosafety/usage"
+
+const { proxy } = getCurrentInstance()
+const { pres_type } = proxy.useDict('pres_type')
+
+const usageList = ref([])
+const swMedicineUsageDetailsList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const total = ref(0)
+const title = ref('')
+const daterangeCreateTime = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    name: null,
+    useType: null,
+    createTime: null
+  },
+  rules: {}
+})
+const { queryParams, form, rules } = toRefs(data)
+
+
+const units = ref([])   // 单位下拉选项
+const usages = ref([]) // 使用方法下拉选项
+
+
+/**
+ * 获取单位下拉数据源（单位字典）
+ * 将返回数据转换成 { value, label } 结构，供 el-option 使用
+ */
+function getUnit() {
+  listUnit().then(response => {
+    units.value = response.rows.map(item => ({
+      value: item.id,
+      label: item.name
+    }))
+  })
+}
+
+/**
+ * 获取处方使用方法下拉数据源
+ * 将返回数据转换成 { value, label } 结构，供 el-option 使用
+ */
+function getUsageOptions() {
+  listUsage().then(response => {
+    usages.value = response.rows.map(item => ({
+      value: item.id,
+      label: item.name
+    }))
+    
+  })
+}
+/**
+ * 格式化使用方法
+ * 根据 usageId 查找对应的使用方法名称
+ */
+function formatUsage(row) {
+  const usage = usages.value.find(item => String(item.value) === String(row.usageId))
+  return usage?.label ?? ''
+}
+
+/**
+ * 格式化单位
+ * 根据 unit 查找对应的单位名称
+ */
+function formatUnit(row) {
+  const unit = units.value.find(item => String(item.value) === String(row.unit))
+  return unit?.label ?? ''
+}
+
+
+function getList() {
+  loading.value = true
+  queryParams.value.params = {}
+  if (daterangeCreateTime.value && daterangeCreateTime.value.length === 2) {
+    queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
+    queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
+  }
+  listUsageInfo(queryParams.value).then(res => {
+    usageList.value = res.rows
+    total.value = res.total
+    loading.value = false
+  })
+}
+
+function reset() {
+  form.value = {
+    id: null,
+    name: null,
+    useType: null,
+    createBy: null,
+    createTime: null
+  }
+  swMedicineUsageDetailsList.value = []
+}
+
+function cancel() {
+  open.value = false
+  reset()
+}
+
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+function resetQuery() {
+  daterangeCreateTime.value = []
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+function handleDetail(row) {
+  reset()
+  getUsageInfo(row.id).then(res => {
+    form.value = res.data
+    swMedicineUsageDetailsList.value = res.data.swMedicineUsageDetailsList || []
+    open.value = true
+    title.value = '药品使用记录详情'
+  })
+}
+
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal.confirm(`是否确认删除药品使用记录编号为"${_ids}"的数据项？`).then(() => {
+    return delUsageInfo(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess('删除成功')
+  })
+}
+
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+}
+
+function rowSwMedicineUsageDetailsIndex({ row, rowIndex }) {
+  row.index = rowIndex + 1
+}
+
+function handleExport() {
+  proxy.download('biosafety/usageInfo/export', { ...queryParams.value }, `usage_${new Date().getTime()}.xlsx`)
+}
+
+
+getList()
+getUnit()  // 获取单位下拉数据源
+getUsageOptions() // 获取使用方法下拉数据源
+</script>
+
+<style scoped>
+.usage-detail-dialog .detail-card {
+  border-radius: 6px;
+  margin: 0;
+}
+
+.usage-detail-dialog .card-header {
+  display: flex;
+  align-items: center;
+  font-weight: 600;
+  color: #303133;
+}
+
+.usage-detail-dialog .card-header .el-icon {
+  margin-right: 6px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/produce/manage_sheep/add_sheep/index.vue b/src/views/produce/manage_sheep/add_sheep/index.vue
new file mode 100644
index 0000000..9ac7adf
--- /dev/null
+++ b/src/views/produce/manage_sheep/add_sheep/index.vue
@@ -0,0 +1,242 @@
+<template>
+  <div class="app-container">
+    <el-button type="warning" icon="Upload" @click="handleExportForm">导出</el-button>
+    <el-button type="primary" plain icon="Plus" @click="handleImport"
+      v-hasPermi="['produce:add_sheep:import']">导入</el-button>
+    <el-form :model="form" ref="formRef" label-position="left" label-width="100px" style="margin-top:15px">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="耳号" prop="earNumber">
+            <el-input v-model="form.earNumber" placeholder="请输入羊只id" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="羊舍" prop="sheepfold">
+            <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
+              <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="父号" prop="father">
+            <el-input v-model="form.father" placeholder="请输入父号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="母号" prop="mother">
+            <el-input v-model="form.mother" placeholder="请输入母号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="出生体重" prop="bornWeight">
+            <el-input v-model="form.bornWeight" placeholder="请输入出生体重" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="出生日期" prop="birthday">
+            <el-date-picker v-model="form.birthday" type="date" placeholder="选择出生日期" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="性别" prop="gender">
+            <el-select v-model="form.gender" placeholder="请选择性别">
+              <el-option label="公" value="1" />
+              <el-option label="母" value="0" />
+              <el-option label="阉羊" value="2" />
+              <el-option label="兼性" value="3" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="胎次" prop="parity">
+            <el-input v-model="form.parity" placeholder="请输入胎次" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="品种" prop="varietyId">
+            <el-input v-model="form.varietyId" placeholder="请输入品种" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="入群日期" prop="joinDate">
+            <el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="技术员" prop="technician">
+            <el-input v-model="form.technician" placeholder="请输入技术员" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="16">
+          <el-form-item label="备注" prop="comment">
+            <el-input v-model="form.comment" type="textarea" rows="3" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">提交</el-button>
+        <el-button @click="resetForm">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+
+  <el-dialog title="导入羊只信息" v-model="importOpen" width="400px" append-to-body>
+    <el-upload ref="uploadRef" :limit="1" accept=".xlsx,.xls" :action="importUrl" :headers="headers"
+      :auto-upload="false" :on-success="handleImportSuccess" :on-error="handleImportError" drag>
+      <i class="el-icon-upload"></i>
+      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+    </el-upload>
+    <template #footer>
+      <el-button type="info" @click="downloadTemplate">下载模板</el-button>
+      <el-button type="primary" @click="submitUpload">确 定</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import { addSheep } from '@/api/produce/manage_sheep/add_sheep/add_sheep';
+import { listSheepfold_management as listSheepfold } from '@/api/sheepfold_management/sheepfold_management';
+
+const form = ref({
+  earNumber: '',
+  sheepfold: '',
+  father: '',
+  mother: '',
+  bornWeight: '',
+  birthday: '',
+  gender: '',
+  parity: '',
+  varietyId: '',
+  joinDate: '',
+  comment: '',
+  technician: '',
+});
+
+const formRef = ref(null);
+
+const rules = {
+  earNumber: [{ required: true, message: '请输入耳号', trigger: 'blur' }],
+  sheepfold: [{ required: true, message: '请输入羊舍', trigger: 'change' }],
+  father: [{ message: '请输入父号', trigger: 'blur' }],
+  mother: [{ message: '请输入母号', trigger: 'blur' }],
+  bornWeight: [{ required: true, message: '请输入出生体重', trigger: 'blur' }],
+  birthday: [{ required: true, message: '请选择出生日期', trigger: 'change' }],
+  gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
+  parity: [{ message: '请输入胎次', trigger: 'blur' }],
+  varietyId: [{ required: true, message: '请输入品种', trigger: 'blur' }],
+  joinDate: [{ message: '请选择入群日期', trigger: 'change' }],
+  technician: [{ message: '请输入技术员', trigger: 'blur' }],
+};
+
+
+//表单验证
+const submitForm = () => {
+  formRef.value.validate((valid) => {
+    console.log('表单验证结果:', valid);
+    if (valid) {
+      addSheep(form.value)
+        .then(response => {
+          console.log('后端响应:', response);
+          if (response.code === 200) {
+            alert('新增成功');
+            resetForm();
+          } else {
+            alert(response.msg || '新增失败');
+          }
+        })
+    } else {
+      alert('请填写所有必填字段');
+    }
+  });
+};
+const resetForm = () => {
+  form.value = {
+    earNumber: '',
+    sheepfold: '',
+    father: '',
+    mother: '',
+    bornWeight: '',
+    birthday: '',
+    gender: '',
+    parity: '',
+    varietyId: '',
+    joinDate: '',
+    comment: '',
+    technician: '',
+  };
+};
+
+
+//导出
+import { exportSheepForm } from '@/api/produce/manage_sheep/add_sheep/add_sheep';
+
+function handleExportForm() {
+  // 把当前表单数据直接传后端
+  exportSheepForm(form.value).then(res => {
+    // 使用 Ruoyi 自带的下载方法
+    const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+    const fileName = `羊只信息_${new Date().getTime()}.xlsx`;
+    const link = document.createElement('a');
+    link.href = URL.createObjectURL(blob);
+    link.download = fileName;
+    link.click();
+  });
+}
+
+
+//导入
+import { getToken } from '@/utils/auth';
+
+const uploadRef = ref();
+const importOpen = ref(false);
+const importUrl = ref(import.meta.env.VITE_APP_BASE_API + '/produce/manage_sheep/add_sheep/importData');
+const headers = ref({ Authorization: 'Bearer ' + getToken() });
+
+function handleImport() { importOpen.value = true; }
+function downloadTemplate() {
+  proxy.download('/produce/manage_sheep/add_sheep/importTemplate', {}, `羊只模板_${Date.now()}.xlsx`);
+}
+function submitUpload() { uploadRef.value?.submit(); }
+function handleImportSuccess(res) {
+  proxy.$modal.msgSuccess(res.msg || '导入成功');
+  importOpen.value = false;
+  uploadRef.value?.clearFiles();
+}
+function handleImportError(err) {
+  proxy.$modal.msgError(JSON.parse(err.message)?.msg || '导入失败');
+}
+
+
+/**获取羊舍数据 */
+const sheepfoldOptions = ref([]);
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows;   
+  });
+}
+onMounted(() => {
+  getSheepfoldOptions();
+});
+
+
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/produce/manage_sheep/trans_group/index.vue b/src/views/produce/manage_sheep/trans_group/index.vue
new file mode 100644
index 0000000..0102d07
--- /dev/null
+++ b/src/views/produce/manage_sheep/trans_group/index.vue
@@ -0,0 +1,382 @@
+<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="sheepId">
+        <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="转出羊舍" prop="foldFrom">
+        <el-select v-model="queryParams.foldFrom" placeholder="请选择转出羊舍" style="min-width:150px" clearable>
+          <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="转入羊舍" prop="foldTo">
+        <el-select v-model="queryParams.foldTo" placeholder="请选择转入羊舍" style="min-width:150px" clearable>
+          <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" style="width: 150px;" placeholder="请选择状态" clearable>
+          <el-option v-for="dict in status" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </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>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+          v-hasPermi="['trans_group:trans_group:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['trans_group:trans_group:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['trans_group:trans_group:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['trans_group:trans_group:export']">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="trans_groupList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
+      <el-table-column label="羊只id" align="center" prop="sheepId" />
+      <el-table-column label="转出羊舍" align="center" prop="foldFromName" />
+      <el-table-column label="转入羊舍" align="center" prop="foldToName" />
+      <el-table-column label="转群原因" align="center" prop="reason" min-width="160">
+        <template #default="scope">
+          <dict-tag :options="trans_group_reason" :value="scope.row.reason" />
+        </template>
+      </el-table-column>
+      <el-table-column label="技术员" align="center" prop="technician" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="status" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime">
+        <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" min-width="160">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
+            v-hasPermi="['trans_group:trans_group:approve']">
+            审批
+          </el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['trans_group:trans_group:remove']">
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改转群记录对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="trans_groupRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="羊只id" prop="sheepId">
+          <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+        </el-form-item>
+        <el-form-item label="转出羊舍" prop="foldFrom">
+          <el-select v-model="form.foldFrom" placeholder="请选择转出羊舍" clearable>
+            <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="转入羊舍" prop="foldTo">
+          <el-select v-model="form.foldTo" placeholder="请选择转入羊舍" clearable>
+            <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="转群原因" prop="reason">
+          <el-select v-model="form.reason" placeholder="请选择转群原因">
+            <el-option v-for="dict in trans_group_reason" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="技术员" prop="technician">
+          <el-input v-model="form.technician" placeholder="请输入技术员" />
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" 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>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+
+  <!-- 审批对话框 -->
+  <el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
+    <el-form ref="approveFormRef" :model="approveForm" label-width="120px">
+      <el-form-item label="羊只id">
+        <el-input v-model="approveForm.sheepId" disabled />
+      </el-form-item>
+      <el-form-item label="转入羊舍">
+        <el-input v-model="approveForm.foldTo" disabled />
+      </el-form-item>
+      <el-form-item label="转出羊舍">
+        <el-input v-model="approveForm.foldFrom" disabled />
+      </el-form-item>
+      <el-form-item label="转群原因">
+        <el-select v-model="approveForm.reason" disabled>
+          <el-option v-for="dict in trans_group_reason" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="技术员">
+        <el-input v-model="approveForm.technician" disabled />
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input v-model="approveForm.comment" disabled />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleApproveAgree">同意</el-button>
+        <el-button type="danger" @click="handleApproveReject">驳回</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup name="Trans_group">
+import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group } from "@/api/produce/manage_sheep/trans_group/trans_group"
+import { listSheepfold_management as listSheepfold } from '@/api/sheepfold_management/sheepfold_management';
+
+const { proxy } = getCurrentInstance()
+const { trans_group_reason, status } = proxy.useDict('trans_group_reason', 'status')
+
+const trans_groupList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref("")
+const daterangeCreateTime = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    sheepId: null,
+    foldTo: null,
+    foldFrom: null,
+    status: null,
+    createTime: null
+  },
+  rules: {
+    id: [
+      { required: true, message: "$comment不能为空", trigger: "blur" }
+    ],
+    sheepId: [
+      { required: true, message: "羊只id不能为空", trigger: "blur" }
+    ],
+    foldTo: [
+      { required: true, message: "转入羊舍不能为空", trigger: "blur" }
+    ],
+    foldFrom: [
+      { required: true, message: "转出羊舍不能为空", trigger: "blur" }
+    ],
+    reason: [
+      { required: true, message: "转群原因不能为空", trigger: "change" }
+    ],
+    technician: [
+      { required: true, message: "技术员不能为空", trigger: "blur" }
+    ],
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询转群记录列表 */
+function getList() {
+  loading.value = true
+  queryParams.value.params = {}
+  if (null != daterangeCreateTime && '' != daterangeCreateTime) {
+    queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
+    queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
+  }
+  listTrans_group(queryParams.value).then(response => {
+    trans_groupList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    foldTo: null,
+    foldFrom: null,
+    reason: null,
+    technician: null,
+    status: null,
+    comment: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("trans_groupRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  daterangeCreateTime.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加转群记录"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getTrans_group(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改转群记录"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["trans_groupRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateTrans_group(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addTrans_group(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 () {
+    return delTrans_group(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => { })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('/produce/manage_sheep/trans_group/export', {
+    ...queryParams.value
+  }, `trans_group_${new Date().getTime()}.xlsx`);
+}
+
+getList()
+
+// 审批记录的对话框
+const approveDialog = ref(false);
+const approveForm = ref({});
+
+// 审批按钮操作
+function handleApprove(row) {
+  // 打开审批对话框
+  approveForm.value = { ...row };
+  approveDialog.value = true;
+}
+
+// 同意审批
+function handleApproveAgree() {
+  approveForm.value.status = 1; // 状态设置为同意
+  updateTrans_group(approveForm.value).then(() => {
+    approveDialog.value = false;
+    proxy.$modal.msgSuccess("审批成功，状态已更新为同意");
+    getList();
+  }).catch((error) => {
+    proxy.$modal.msgError(`审批失败：${error}`);
+  });
+}
+
+// 驳回审批
+function handleApproveReject() {
+  approveForm.value.status = 2; // 状态设置为驳回
+  updateTrans_group(approveForm.value).then(() => {
+    approveDialog.value = false;
+    proxy.$modal.msgSuccess("审批成功，状态已更新为驳回");
+    getList();
+  }).catch((error) => {
+    proxy.$modal.msgError(`审批失败：${error}`);
+  });
+}
+
+//羊舍名称
+const sheepfoldOptions = ref([]);
+
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows;   // [{id, sheepfoldName}, ...]
+  });
+}
+
+onMounted(() => {
+  getList();
+  getSheepfoldOptions();
+});
+</script>
diff --git a/src/views/produce/manage_sheep/transition_info/index.vue b/src/views/produce/manage_sheep/transition_info/index.vue
new file mode 100644
index 0000000..3119219
--- /dev/null
+++ b/src/views/produce/manage_sheep/transition_info/index.vue
@@ -0,0 +1,413 @@
+<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="sheepId">
+        <el-input
+          v-model="queryParams.sheepId"
+          placeholder="请输入羊只id"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="转入牧场" prop="transTo">
+        <el-input
+          v-model="queryParams.transTo"
+          placeholder="请输入转入牧场"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="当前牧场" prop="transFrom">
+        <el-input
+          v-model="queryParams.transFrom"
+          placeholder="请输入当前牧场"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" style="width: 150px;" placeholder="请选择状态" clearable>
+          <el-option
+            v-for="dict in status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </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>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['transition_info:transition_info:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['transition_info:transition_info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['transition_info:transition_info:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['transition_info:transition_info:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="transition_infoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="" align="center" prop="id" /> -->
+      <el-table-column label="羊只id" align="center" prop="sheepId" />
+      <el-table-column label="转入牧场" align="center" prop="transTo" />
+      <el-table-column label="当前牧场" align="center" prop="transFrom" />
+      <el-table-column label="转场类型" align="center" prop="transType">
+        <template #default="scope">
+          <dict-tag :options="trans_type" :value="scope.row.transType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="技术员" align="center" prop="technician" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <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" min-width="180">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)" v-hasPermi="['transition_info:transition_info:approve']">审批</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['transition_info:transition_info:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改转场对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="transition_infoRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="羊只id" prop="sheepId">
+          <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+        </el-form-item>
+        <el-form-item label="转入牧场" prop="transTo">
+          <el-input v-model="form.transTo" placeholder="请输入转入牧场" />
+        </el-form-item>
+        <el-form-item label="当前牧场" prop="transFrom">
+          <el-input v-model="form.transFrom" placeholder="请输入当前牧场" />
+        </el-form-item>
+        <el-form-item label="转场类型" prop="transType">
+          <el-select v-model="form.transType" placeholder="请选择转场类型">
+            <el-option
+              v-for="dict in trans_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="技术员" prop="technician">
+          <el-input v-model="form.technician" placeholder="请输入技术员" />
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" 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>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+
+  <!-- 审批对话框 -->
+<el-dialog :title="'审批转场记录'" v-model="approveDialog" width="500px" append-to-body>
+  <el-form ref="approveFormRef" :model="approveForm" label-width="120px">
+    <el-form-item label="羊只id">
+      <el-input v-model="approveForm.sheepId" disabled />
+    </el-form-item>
+    <el-form-item label="转入牧场">
+      <el-input v-model="approveForm.transTo" disabled />
+    </el-form-item>
+    <el-form-item label="当前牧场">
+      <el-input v-model="approveForm.transFrom" disabled />
+    </el-form-item>
+    <el-form-item label="转场类型">
+      <el-select v-model="approveForm.transType" disabled>
+        <el-option
+          v-for="dict in trans_type"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="技术员">
+      <el-input v-model="approveForm.technician" disabled />
+    </el-form-item>
+    <el-form-item label="备注">
+      <el-input v-model="approveForm.comment" disabled />
+    </el-form-item>
+  </el-form>
+  <template #footer>
+    <div class="dialog-footer">
+      <el-button type="primary" @click="handleApproveAgree">同意</el-button>
+      <el-button type="danger" @click="handleApproveReject">驳回</el-button>
+    </div>
+  </template>
+</el-dialog>
+</template>
+
+<script setup name="Transition_info">
+import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, updateTransition_info } from "@/api/produce/manage_sheep/transition_info/transition_info"
+
+const { proxy } = getCurrentInstance()
+const { status, trans_type } = proxy.useDict('status', 'trans_type')
+
+const transition_infoList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref("")
+const daterangeCreateTime = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    sheepId: null,
+    transTo: null,
+    transFrom: null,
+    status: null,
+    createTime: null
+  },
+  rules: {
+    id: [
+      { required: true, message: "不能为空", trigger: "blur" }
+    ],
+    sheepId: [
+      { required: true, message: "羊只id不能为空", trigger: "blur" }
+    ],
+    transTo: [
+      { required: true, message: "转入牧场不能为空", trigger: "blur" }
+    ],
+    transFrom: [
+      { required: true, message: "当前牧场不能为空", trigger: "blur" }
+    ],
+    transType: [
+      { required: true, message: "转场类型不能为空", trigger: "change" }
+    ],
+    technician: [
+      { required: true, message: "技术员不能为空", trigger: "blur" }
+    ],
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询转场列表 */
+function getList() {
+  loading.value = true
+  queryParams.value.params = {}
+  if (null != daterangeCreateTime && '' != daterangeCreateTime) {
+    queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
+    queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
+  }
+  listTransition_info(queryParams.value).then(response => {
+    transition_infoList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    transTo: null,
+    transFrom: null,
+    transType: null,
+    technician: null,
+    status: null,
+    comment: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("transition_infoRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  daterangeCreateTime.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加转场"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getTransition_info(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改转场"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["transition_infoRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateTransition_info(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addTransition_info(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() {
+    return delTransition_info(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('/produce/manage_sheep/transition_info/export', {
+    ...queryParams.value
+  }, `transition_info_${new Date().getTime()}.xlsx`)
+}
+// 审批记录的对话框
+const approveDialog = ref(false);
+const approveForm = ref({});
+
+// 审批按钮操作
+function handleApprove(row) {
+  // 打开审批对话框
+  approveForm.value = { ...row };
+  approveDialog.value = true;
+}
+
+// 同意审批
+function handleApproveAgree() {
+  approveForm.value.status = 1; // 状态设置为同意
+  updateTransition_info(approveForm.value).then(() => {
+    approveDialog.value = false;
+    proxy.$modal.msgSuccess("审批成功，状态已更新为同意");
+    getList();
+  }).catch((error) => {
+    proxy.$modal.msgError(`审批失败：${error}`);
+  });
+}
+
+// 驳回审批
+function handleApproveReject() {
+  approveForm.value.status = 2; // 状态设置为驳回
+  updateTransition_info(approveForm.value).then(() => {
+    approveDialog.value = false;
+    proxy.$modal.msgSuccess("审批成功，状态已更新为驳回");
+    getList();
+  }).catch((error) => {
+    proxy.$modal.msgError(`审批失败：${error}`);
+  });
+}
+getList()
+</script>
diff --git a/src/views/produce/other/castrate/index.vue b/src/views/produce/other/castrate/index.vue
index 87bc0d3..3c6ea8b 100644
--- a/src/views/produce/other/castrate/index.vue
+++ b/src/views/produce/other/castrate/index.vue
@@ -2,30 +2,16 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="羊只id" prop="sheepId">
-        <el-input
-          v-model="queryParams.sheepId"
-          placeholder="请输入羊只id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="羊舍id" prop="sheepfold">
-        <el-input
-          v-model="queryParams.sheepfold"
-          placeholder="请输入羊舍id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+      <el-form-item label="羊舍" prop="sheepfold">
+        <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
+          <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
+        </el-select>
       </el-form-item>
       <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker
-          v-model="daterangeCreateTime"
-          value-format="YYYY-MM-DD"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -35,51 +21,29 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['produce:castrate:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+          v-hasPermi="['produce:castrate:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['produce:castrate:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['produce:castrate:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['produce:castrate:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['produce:castrate:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['produce:castrate:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['produce:castrate:export']">导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="castrateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
+      <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
       <el-table-column label="羊只id" align="center" prop="sheepId" />
-      <el-table-column label="羊舍id" align="center" prop="sheepfold" />
+      <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="技术员" align="center" prop="technician" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -89,19 +53,16 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['produce:castrate:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['produce:castrate:remove']">删除</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['produce:castrate:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['produce:castrate:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改去势对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
@@ -109,8 +70,13 @@
         <el-form-item label="羊只id" prop="sheepId">
           <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
         </el-form-item>
-        <el-form-item label="羊舍id" prop="sheepfold">
-          <el-input v-model="form.sheepfold" placeholder="请输入羊舍id" />
+        <el-form-item label="羊舍" prop="sheepfold">
+          <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
+            <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="技术员" prop="technician">
+          <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
         <el-form-item label="备注" prop="comment">
           <el-input v-model="form.comment" placeholder="请输入备注" />
@@ -126,8 +92,9 @@
   </div>
 </template>
 
-<script setup name="Castrate">
-import { listCastrate, getCastrate, delCastrate, addCastrate, updateCastrate } from "@/api/produce/castrate"
+<script setup name="castrate">
+import { listCastrate, getCastrate, delCastrate, addCastrate, updateCastrate } from "@/api/produce/other/castrate/castrate"
+import { listSheepfold_management as listSheepfold } from '@/api/sheepfold_management/sheepfold_management';
 
 const { proxy } = getCurrentInstance()
 
@@ -153,6 +120,18 @@ const data = reactive({
     createTime: null
   },
   rules: {
+    id: [
+      { required: true, message: "$comment不能为空", trigger: "blur" }
+    ],
+    sheepId: [
+      { required: true, message: "羊只id不能为空", trigger: "blur" }
+    ],
+    sheepfold: [
+      { required: true, message: "羊舍不能为空", trigger: "change" }
+    ],
+    technician: [
+      { required: true, message: "技术员不能为空", trigger: "blur" }
+    ],
   }
 })
 
@@ -255,20 +234,31 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除去势编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除去势编号为"' + _ids + '"的数据项？').then(function () {
     return delCastrate(_ids)
   }).then(() => {
     getList()
     proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+  }).catch(() => { })
 }
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download('produce/castrate/export', {
+  proxy.download('/produce/other/castrate/export', {
     ...queryParams.value
   }, `castrate_${new Date().getTime()}.xlsx`)
 }
 
+/** 加载所有羊舍 */
+const sheepfoldOptions = ref([]);
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows;   // [{id, sheepfoldName}, ...]
+  });
+}
+onMounted(() => {
+  getList();
+  getSheepfoldOptions();  
+});
 getList()
 </script>
diff --git a/src/views/produce/other/fixHoof/index.vue b/src/views/produce/other/fixHoof/index.vue
new file mode 100644
index 0000000..c11428d
--- /dev/null
+++ b/src/views/produce/other/fixHoof/index.vue
@@ -0,0 +1,269 @@
+<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="sheepId">
+        <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="羊舍" prop="sheepfold">
+        <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width: 150px;" clearable>
+          <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </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>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+          v-hasPermi="['fixHoof:fixHoof:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['fixHoof:fixHoof:export']">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="fixHoofList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
+      <el-table-column label="羊只id" align="center" prop="sheepId" />
+      <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="技术员" align="center" prop="technician" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <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">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改修蹄对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="fixHoofRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="羊只id" prop="sheepId">
+          <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+        </el-form-item>
+        <el-form-item label="羊舍" prop="sheepfold">
+          <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
+            <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="技术员" prop="technician">
+          <el-input v-model="form.technician" 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>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="FixHoof">
+import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof } from "@/api/produce/other/fixHoof/fixHoof"
+import { listSheepfold_management as listSheepfold } from '@/api/sheepfold_management/sheepfold_management';
+
+const { proxy } = getCurrentInstance()
+
+const fixHoofList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref("")
+const daterangeCreateTime = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    sheepId: null,
+    sheepfold: null,
+    technician: null,
+    createTime: null
+  },
+  rules: {
+    id: [
+      { required: true, message: "$comment不能为空", trigger: "blur" }
+    ],
+    sheepId: [
+      { required: true, message: "羊只id不能为空", trigger: "blur" }
+    ],
+    sheepfold: [
+      { required: true, message: "羊舍id不能为空", trigger: "change" }
+    ],
+    technician: [
+      { required: true, message: "技术员不能为空", trigger: "blur" }
+    ],
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询修蹄列表 */
+function getList() {
+  loading.value = true
+  // 空字符串转 null
+  const q = { ...queryParams.value }
+  if (q.sheepId === '') q.sheepId = null
+  if (q.sheepfold === '') q.sheepfold = null
+  q.params = {}
+  if (daterangeCreateTime.value?.length) {
+    q.params.beginCreateTime = daterangeCreateTime.value[0]
+    q.params.endCreateTime = daterangeCreateTime.value[1]
+  }
+  listFixHoof(q).then(res => {
+    fixHoofList.value = res.rows
+    total.value = res.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    sheepfold: null,
+    comment: null,
+    technician: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("fixHoofRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  daterangeCreateTime.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加修蹄"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getFixHoof(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改修蹄"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["fixHoofRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateFixHoof(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addFixHoof(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 () {
+    return delFixHoof(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => { })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('/produce/other/fixHoof/export', {
+    ...queryParams.value
+  }, `fixHoof_${new Date().getTime()}.xlsx`)
+}
+
+/**加载所有羊舍*/
+const sheepfoldOptions = ref([]);
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows;
+  });
+}
+onMounted(() => {
+  getList();
+  getSheepfoldOptions();
+});
+
+getList()
+</script>
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 79670ce..1722282 100644
--- a/src/views/sheepfold_management/sheepfold_management/index.vue
+++ b/src/views/sheepfold_management/sheepfold_management/index.vue
@@ -1,8 +1,8 @@
 <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="ranchId">
-        <el-select v-model="queryParams.ranchId" placeholder="请选择牧场id" clearable>
+      <el-form-item label="牧场" prop="ranchId">
+        <el-select v-model="queryParams.ranchId" placeholder="请选择牧场" style="width:200px" clearable>
           <el-option
             v-for="dict in da_ranch"
             :key="dict.value"
@@ -11,8 +11,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="羊舍类型id" prop="sheepfoldTypeId">
-        <el-select v-model="queryParams.sheepfoldTypeId" placeholder="请选择羊舍类型id" clearable>
+      <el-form-item label="羊舍类型" prop="sheepfoldTypeId">
+        <el-select v-model="queryParams.sheepfoldTypeId" placeholder="请选择羊舍类型"  style="width:200px"  clearable>
           <el-option
             v-for="dict in bas_sheepfold_type"
             :key="dict.value"
@@ -37,7 +37,7 @@
           v-hasPermi="['sheepfold_management:sheepfold_management:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -46,7 +46,7 @@
           @click="handleUpdate"
           v-hasPermi="['sheepfold_management:sheepfold_management:edit']"
         >修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -69,28 +69,27 @@
       <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="牧场id" align="center" prop="ranchId">
+      <el-table-column label="牧场" align="center" prop="ranchId">
         <template #default="scope">
           <dict-tag :options="da_ranch" :value="scope.row.ranchId"/>
         </template>
       </el-table-column>
       <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
-      <el-table-column label="羊舍类型id" align="center" prop="sheepfoldTypeId">
+      <el-table-column label="羊舍类型" align="center" prop="sheepfoldTypeId">
         <template #default="scope">
           <dict-tag :options="bas_sheepfold_type" :value="scope.row.sheepfoldTypeId"/>
         </template>
       </el-table-column>
       <el-table-column label="羊舍编号" align="center" prop="sheepfoldNo" />
       <el-table-column label="排号" align="center" prop="rowNo" />
-      <el-table-column label="栏数" align="center" prop="columns" />
+      <el-table-column label="栏号" align="center" prop="columns" />
       <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">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['sheepfold_management:sheepfold_management:edit']">修改</el-button>
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['sheepfold_management:sheepfold_management:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['sheepfold_management:sheepfold_management:remove']">删除</el-button>
         </template>
       </el-table-column>
@@ -107,8 +106,8 @@
     <!-- 添加或修改羊舍管理对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="sheepfold_managementRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="牧场id" prop="ranchId">
-          <el-select v-model="form.ranchId" placeholder="请选择牧场id">
+        <el-form-item label="牧场" prop="ranchId">
+          <el-select v-model="form.ranchId" placeholder="请选择牧场">
             <el-option
               v-for="dict in da_ranch"
               :key="dict.value"
@@ -117,10 +116,10 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="羊舍名称" prop="sheepfoldName">
+        <!-- <el-form-item label="羊舍名称" prop="sheepfoldName">
           <el-input v-model="form.sheepfoldName" placeholder="请输入羊舍名称" />
-        </el-form-item>
-        <el-form-item label="羊舍类型id" prop="sheepfoldTypeId">
+        </el-form-item> -->
+        <el-form-item label="羊舍类型" prop="sheepfoldTypeId">
           <el-select v-model="form.sheepfoldTypeId" placeholder="请选择羊舍类型id">
             <el-option
               v-for="dict in bas_sheepfold_type"
@@ -133,18 +132,49 @@
         <el-form-item label="羊舍编号" prop="sheepfoldNo">
           <el-input v-model="form.sheepfoldNo" placeholder="请输入羊舍编号" />
         </el-form-item>
-        <el-form-item label="排号" prop="rowNo">
+        <!-- <el-form-item label="排号" prop="rowNo">
           <el-input v-model="form.rowNo" placeholder="请输入排号" />
+        </el-form-item> -->
+
+        <el-form-item label="排数" prop="rowCount">
+          <el-input-number 
+            v-model="form.rowCount" 
+            :min="1" 
+            :max="10" 
+            @change="handleRowCountChange"
+            placeholder="请输入排数" 
+          />
         </el-form-item>
-        <el-form-item label="栏数" prop="columns">
+
+        <!-- <el-form-item label="栏号" prop="columns">
           <el-input v-model="form.columns" placeholder="请输入栏数" />
-        </el-form-item>
+        </el-form-item> -->
+
+
+        <!-- 动态栏位数配置 -->
+        <div v-for="(row, index) in form.rowsConfig" :key="index" class="row-config">
+          <el-form-item 
+            :label="`${String.fromCharCode(65 + index)}排栏位数`" 
+            :prop="`rowsConfig.${index}.columnCount`" 
+            :rules="{
+              required: true, 
+              message: `请填写${String.fromCharCode(65 + index)}排栏位数`, 
+              trigger: 'blur'
+            }"
+          >
+            <el-input-number 
+              v-model="row.columnCount" 
+              :min="1" 
+              :max="99" 
+              placeholder="请输入栏位数" 
+            />
+          </el-form-item>
+        </div>
+
+
         <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">
@@ -173,19 +203,58 @@ const total = ref(0)
 const title = ref("")
 
 const data = reactive({
-  form: {},
+    form: {
+    id: null,
+    ranchId: null,
+    sheepfoldName: null,
+    sheepfoldTypeId: null,
+    sheepfoldNo: null,
+    rowCount: 1, // 默认1排
+    rowsConfig: [{ columnCount: 1 }], // 默认1栏
+    comment: null
+  },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     ranchId: null,
     sheepfoldTypeId: null,
   },
-  rules: {
+   rules: {
+    rowCount: [
+      { required: true, message: "排数不能为空", trigger: "blur" },
+      { type: 'number', min: 1, max: 10, message: '排数在1-10之间', trigger: 'blur' }
+    ],
+    sheepfoldNo: [
+      { required: true, message: "羊舍编号不能为空", trigger: "blur" }
+    ],
+    ranchId: [
+      { required: true, message: "牧场不能为空", trigger: "blur" }
+    ],
+    sheepfoldTypeId: [
+      { required: true, message: "羊舍类型不能为空", trigger: "blur" }
+    ]
   }
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
+// 排数变化处理
+const handleRowCountChange = (count) => {
+  // 确保count是数字
+  count = Number(count)
+  
+  // 重置rowsConfig
+  form.value.rowsConfig = []
+  
+  // 根据排数生成配置项
+  for (let i = 0; i < count; i++) {
+    form.value.rowsConfig.push({
+      rowLetter: String.fromCharCode(65 + i), // A, B, C...
+      columnCount: 1 // 默认1栏
+    })
+  }
+}
+
 /** 查询羊舍管理列表 */
 function getList() {
   loading.value = true
@@ -210,10 +279,9 @@ function reset() {
     sheepfoldName: null,
     sheepfoldTypeId: null,
     sheepfoldNo: null,
-    rowNo: null,
-    columns: null,
-    comment: null,
-    isDelete: null
+    rowCount: 1,
+    rowsConfig: [{ columnCount: 1 }],
+    comment: null
   }
   proxy.resetForm("sheepfold_managementRef")
 }
@@ -245,14 +313,25 @@ function handleAdd() {
 }
 
 /** 修改按钮操作 */
-function handleUpdate(row) {
-  reset()
-  const _id = row.id || ids.value
-  getSheepfold_management(_id).then(response => {
-    form.value = response.data
-    open.value = true
-    title.value = "修改羊舍管理"
-  })
+// function handleUpdate(row) {
+//   reset()
+//   const _id = row.id || ids.value
+//   getSheepfold_management(_id).then(response => {
+//     form.value = response.data
+//     // 修改时不需要rowsConfig
+//     if (form.value.rowsConfig) {
+//       delete form.value.rowsConfig
+//       delete form.value.rowCount
+//     }
+//     open.value = true
+//     title.value = "修改羊舍管理"
+//   })
+// }
+/**查找字典 */
+function findDictLabelByValue(dictOptions, value) {
+  const formattedValue = String(value);
+  const foundOption = dictOptions.value.find(option => option.value === formattedValue);
+  return foundOption ? foundOption.label : '';
 }
 
 /** 提交按钮 */
@@ -260,17 +339,46 @@ function submitForm() {
   proxy.$refs["sheepfold_managementRef"].validate(valid => {
     if (valid) {
       if (form.value.id != null) {
+        // 修改操作 - 单条记录
         updateSheepfold_management(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        addSheepfold_management(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
+        // 新增操作 - 多条记录
+        const requests = []
+        const ranchName = findDictLabelByValue(da_ranch, form.value.ranchId)
+        const typeName = findDictLabelByValue(bas_sheepfold_type, form.value.sheepfoldTypeId)
+        
+        // 生成每条记录的数据
+        form.value.rowsConfig.forEach(rowConfig => {
+          for (let i = 1; i <= rowConfig.columnCount; i++) {
+            const columnNo = i.toString().padStart(2, '0') // 01, 02, 03...
+            const record = {
+              ranchId: form.value.ranchId,
+              sheepfoldTypeId: form.value.sheepfoldTypeId,
+              sheepfoldNo: form.value.sheepfoldNo,
+              rowNo: rowConfig.rowLetter,
+              columns: columnNo,
+              comment: form.value.comment,
+              // 自动生成羊舍名称：羊舍编号 + 类型 + 排号栏号
+              sheepfoldName: `${form.value.sheepfoldNo}号-${typeName}-${rowConfig.rowLetter}${columnNo}`
+            }
+            requests.push(addSheepfold_management(record))
+          }
         })
+        
+        // 执行所有新增请求
+        Promise.all(requests)
+          .then(() => {
+            proxy.$modal.msgSuccess(`新增成功，共添加${requests.length}条记录`)
+            open.value = false
+            getList()
+          })
+          .catch(error => {
+            proxy.$modal.msgError("部分记录添加失败：" + error.message)
+          })
       }
     }
   })
@@ -296,3 +404,14 @@ function handleExport() {
 
 getList()
 </script>
+
+
+<style scoped>
+.row-config {
+  margin-bottom: 15px;
+  padding: 10px;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  background-color: #f5f7fa;
+}
+</style>
\ No newline at end of file
diff --git a/vite.config.js b/vite.config.js
index d3d9b6d..2eb2f15 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,5 +1,5 @@
-import { defineConfig, loadEnv } from 'vite'
 import path from 'path'
+import { defineConfig, loadEnv } from 'vite'
 import createVitePlugins from './vite/plugins'
 
 const baseUrl = 'http://localhost:8080' // 后端接口
@@ -42,7 +42,7 @@ export default defineConfig(({ mode, command }) => {
     },
     // vite 相关配置
     server: {
-      port: 80,
+      port: 81,
       host: true,
       open: true,
       proxy: {