diff --git a/package.json b/package.json
index a50909e..bb90147 100644
--- a/package.json
+++ b/package.json
@@ -21,9 +21,11 @@
     "@vueuse/core": "10.11.0",
     "axios": "0.28.1",
     "clipboard": "2.0.11",
+    "date-fns": "^4.1.0",
     "echarts": "5.5.1",
+    "element-china-area-data": "^6.1.0",
     "element-plus": "^2.7.6",
-    "file-saver": "2.0.5",
+    "file-saver": "^2.0.5",
     "fuse.js": "6.6.2",
     "js-beautify": "1.14.11",
     "js-cookie": "3.0.5",
@@ -35,7 +37,8 @@
     "vue-cropper": "1.1.1",
     "vue-router": "4.4.0",
     "vuedraggable": "4.1.0",
-    "vuex": "^4.0.2"
+    "vuex": "^4.0.2",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "5.0.5",
diff --git a/src/api/Breeding_records/Breeding_records.js b/src/api/Breeding_records/Breeding_records.js
new file mode 100644
index 0000000..42a430a
--- /dev/null
+++ b/src/api/Breeding_records/Breeding_records.js
@@ -0,0 +1,85 @@
+import request from '@/utils/request'
+
+// 查询配种记录列表
+export function listBreeding_records(query) {
+  return request({
+    url: '/Breeding_records/Breeding_records/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询配种记录详细
+export function getBreeding_records(id) {
+  return request({
+    url: '/Breeding_records/Breeding_records/' + id,
+    method: 'get'
+  })
+}
+
+// 新增配种记录
+export function addBreeding_records(data) {
+  return request({
+    url: '/Breeding_records/Breeding_records',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改配种记录
+export function updateBreeding_records(data) {
+  return request({
+    url: '/Breeding_records/Breeding_records',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除配种记录
+export function delBreeding_records(id) {
+  return request({
+    url: '/Breeding_records/Breeding_records/' + id,
+    method: 'delete'
+  })
+}
+
+// 根据耳号查询羊只信息
+export function getSheepInfoByTags(manageTags) {
+  return request({
+    url: '/Breeding_records/Breeding_records/getSheepByTags/' + manageTags,
+    method: 'get'
+  })
+}
+
+// 根据母羊耳号获取配种计划信息
+export function getBreedPlanByEweTags(manageTags) {
+  return request({
+    url: '/Breeding_records/Breeding_records/getBreedPlan/' + manageTags,
+    method: 'get'
+  })
+}
+
+// 根据母羊耳号获取最新配种计划信息（优先从配种计划生成表获取）
+export function getLatestBreedPlanByEweTags(manageTags) {
+  return request({
+    url: '/Breeding_records/Breeding_records/getLatestBreedPlan/' + manageTags,
+    method: 'get'
+  })
+}
+
+// 同步孕检结果到配种记录
+export function syncPregnancyResult(data) {
+  return request({
+    url: '/Breeding_records/Breeding_records/syncPregnancyResult',
+    method: 'post',
+    data: data
+  })
+}
+
+// 根据羊只ID和时间范围查询配种记录
+export function getBreedRecordsByTimeRange(sheepId, startDate, endDate) {
+  return request({
+    url: `/Breeding_records/Breeding_records/getByTimeRange/${sheepId}/${startDate}/${endDate}`,
+    method: 'get'
+  })
+}
\ No newline at end of file
diff --git a/src/api/Pregnancy_Test/Pregnancy_Test.js b/src/api/Pregnancy_Test/Pregnancy_Test.js
index 8547e00..da354f4 100644
--- a/src/api/Pregnancy_Test/Pregnancy_Test.js
+++ b/src/api/Pregnancy_Test/Pregnancy_Test.js
@@ -52,4 +52,15 @@ export function getSheepByManageTags(manageTags) {
       manageTags: manageTags
     }
   })
+}
+
+// 根据耳号获取配种信息
+export function getBreedInfoByManageTags(manageTags) {
+  return request({
+    url: '/Pregnancy_Test/Pregnancy_Test/getBreedInfoByManageTags',
+    method: 'get',
+    params: {
+      manageTags: manageTags
+    }
+  })
 }
\ No newline at end of file
diff --git a/src/api/Sperm/Sperm.js b/src/api/Sperm/Sperm.js
new file mode 100644
index 0000000..f19d0d9
--- /dev/null
+++ b/src/api/Sperm/Sperm.js
@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询采精记录列表
+export function listSperm(query) {
+  return request({
+    url: '/Sperm/Sperm/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询采精记录详细
+export function getSperm(id) {
+  return request({
+    url: '/Sperm/Sperm/' + id,
+    method: 'get'
+  })
+}
+
+// 新增采精记录
+export function addSperm(data) {
+  return request({
+    url: '/Sperm/Sperm',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改采精记录
+export function updateSperm(data) {
+  return request({
+    url: '/Sperm/Sperm',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除采精记录
+export function delSperm(id) {
+  return request({
+    url: '/Sperm/Sperm/' + id,
+    method: 'delete'
+  })
+}
+
+// 根据耳号查询羊只信息
+export function getSheepByManageTags(manageTags) {
+  return request({
+    url: '/Sperm/Sperm/getSheepByManageTags/' + manageTags,
+    method: 'get'
+  })
+}
+
+// 查询羊只耳号列表（用于下拉选择）
+export function getSheepManageTagsList(query) {
+  return request({
+    url: '/Sperm/Sperm/sheepManageTagsList',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/api/breed/lambing_records.js b/src/api/breed/lambing_records.js
index d28f266..1f40c1a 100644
--- a/src/api/breed/lambing_records.js
+++ b/src/api/breed/lambing_records.js
@@ -17,6 +17,14 @@ export function getLambing_records(id) {
   })
 }
 
+// 根据母羊耳号查询最新配种记录
+export function getBreedingInfo(earNumber) {
+  return request({
+    url: '/breed/lambing_records/breeding_info/' + earNumber,
+    method: 'get'
+  })
+}
+
 // 新增产羔记录（包含羔羊信息）
 export function addLambing_records(data) {
   return request({
diff --git a/src/api/dairyProducts/parityCorrection/parityCorrection.js b/src/api/dairyProducts/parityCorrection/parityCorrection.js
index 0d2488b..98e592f 100644
--- a/src/api/dairyProducts/parityCorrection/parityCorrection.js
+++ b/src/api/dairyProducts/parityCorrection/parityCorrection.js
@@ -1,56 +1,44 @@
-// import request from '@/utils/request'
-
-// // 查询胎次校正列表
-// export function listParityCorrection(query) {
-//   return request({
-//     url: '/parityCorrection/parityCorrection/list',
-//     method: 'get',
-//     params: query
-//   })
-// }
-
-// // 查询胎次校正详细
-// export function getParityCorrection(id) {
-//   return request({
-//     url: '/parityCorrection/parityCorrection/' + id,
-//     method: 'get'
-//   })
-// }
-
-// // 新增胎次校正
-// export function addParityCorrection(data) {
-//   return request({
-//     url: '/parityCorrection/parityCorrection',
-//     method: 'post',
-//     data: data
-//   })
-// }
-
-// // 修改胎次校正
-// export function updateParityCorrection(data) {
-//   return request({
-//     url: '/parityCorrection/parityCorrection',
-//     method: 'put',
-//     data: data
-//   })
-// }
-
-// // 删除胎次校正
-// export function delParityCorrection(id) {
-//   return request({
-//     url: '/parityCorrection/parityCorrection/' + id,
-//     method: 'delete'
-//   })
-// }
-// 可以保留空文件或删除此文件
-// 因为前端不再需要调用后端API
 import request from '@/utils/request'
 
 // 查询胎次校正列表
 export function listParityCorrection(query) {
   return request({
-    url: '/parityCorrection/parityCorrection/listAll',
+    url: '/parityCorrection/parityCorrection/list',
     method: 'get',
     params: query
   })
-}
\ No newline at end of file
+}
+
+// 查询胎次校正详细
+export function getParityCorrection(id) {
+  return request({
+    url: '/parityCorrection/parityCorrection/' + id,
+    method: 'get'
+  })
+}
+
+// 新增胎次校正
+export function addParityCorrection(data) {
+  return request({
+    url: '/parityCorrection/parityCorrection',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改胎次校正
+export function updateParityCorrection(data) {
+  return request({
+    url: '/parityCorrection/parityCorrection',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除胎次校正
+export function delParityCorrection(id) {
+  return request({
+    url: '/parityCorrection/parityCorrection/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js b/src/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js
index 8e90017..03ee763 100644
--- a/src/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js
+++ b/src/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js
@@ -1,44 +1,18 @@
 import request from '@/utils/request'
 
-// 查询羊奶出入库列表
-export function listMilkInOutStore(query) {
+// 查询羊奶产量分析列表（分页 + 条件）
+export function listSheepMilkAnalysis(query) {
   return request({
-    url: '/milkInOutStore/milkInOutStore/list',
+    url: '/dairyProducts/sheepMilkAnalysis/list',
     method: 'get',
     params: query
   })
 }
 
-// 查询羊奶出入库详细
-export function getMilkInOutStore(id) {
+// 查询单个羊奶产量分析详细信息
+export function getSheepMilkAnalysis(sheepId) {
   return request({
-    url: '/milkInOutStore/milkInOutStore/' + id,
+    url: '/dairyProducts/sheepMilkAnalysis/' + sheepId,
     method: 'get'
   })
-}
-
-// 新增羊奶出入库
-export function addMilkInOutStore(data) {
-  return request({
-    url: '/milkInOutStore/milkInOutStore',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改羊奶出入库
-export function updateMilkInOutStore(data) {
-  return request({
-    url: '/milkInOutStore/milkInOutStore',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除羊奶出入库
-export function delMilkInOutStore(id) {
-  return request({
-    url: '/milkInOutStore/milkInOutStore/' + id,
-    method: 'delete'
-  })
-}
+}
\ No newline at end of file
diff --git a/src/api/feed/FeedList.js b/src/api/feed/FeedList.js
new file mode 100644
index 0000000..50e8a9d
--- /dev/null
+++ b/src/api/feed/FeedList.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询配料清单列表
+export function listFeedList(query) {
+  return request({
+    url: '/feed/FeedList/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询配料清单详细
+export function getFeedList(id) {
+  return request({
+    url: '/feed/FeedList/' + id,
+    method: 'get'
+  })
+}
+
+// 新增配料清单
+export function addFeedList(data) {
+  return request({
+    url: '/feed/FeedList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改配料清单
+export function updateFeedList(data) {
+  return request({
+    url: '/feed/FeedList',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除配料清单
+export function delFeedList(id) {
+  return request({
+    url: '/feed/FeedList/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/feed/FeedPlan.js b/src/api/feed/FeedPlan.js
new file mode 100644
index 0000000..b452daa
--- /dev/null
+++ b/src/api/feed/FeedPlan.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询饲喂计划列表
+export function listFeedPlan(query) {
+  return request({
+    url: '/feed/FeedPlan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询饲喂计划详细
+export function getFeedPlan(createDate) {
+  return request({
+    url: '/feed/FeedPlan/' + createDate,
+    method: 'get'
+  })
+}
+
+// 新增饲喂计划
+export function addFeedPlan(data) {
+  return request({
+    url: '/feed/FeedPlan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改饲喂计划
+export function updateFeedPlan(data) {
+  return request({
+    url: '/feed/FeedPlan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除饲喂计划
+export function delFeedPlan(createDate) {
+  return request({
+    url: '/feed/FeedPlan/' + createDate,
+    method: 'delete'
+  })
+}
diff --git a/src/api/feed/FeedStatistic.js b/src/api/feed/FeedStatistic.js
new file mode 100644
index 0000000..9ba9f49
--- /dev/null
+++ b/src/api/feed/FeedStatistic.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询饲喂量统计列表
+export function listFeedStatistic(query) {
+  return request({
+    url: '/feed/FeedStatistic/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询饲喂量统计详细
+export function getFeedStatistic(id) {
+  return request({
+    url: '/feed/FeedStatistic/' + id,
+    method: 'get'
+  })
+}
+
+// 新增饲喂量统计
+export function addFeedStatistic(data) {
+  return request({
+    url: '/feed/FeedStatistic',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改饲喂量统计
+export function updateFeedStatistic(data) {
+  return request({
+    url: '/feed/FeedStatistic',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除饲喂量统计
+export function delFeedStatistic(id) {
+  return request({
+    url: '/feed/FeedStatistic/' + id,
+    method: 'delete'
+  })
+}
+
+// 查询饲喂量统计列表
+export function initFeedStatistic(query) {
+  return request({
+    url: '/feed/FeedStatistic/init',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/feed/FormulaList.js b/src/api/feed/FormulaList.js
new file mode 100644
index 0000000..13621a4
--- /dev/null
+++ b/src/api/feed/FormulaList.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询配方列表列表
+export function listFormulaList(query) {
+  return request({
+    url: '/feed/FormulaList/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询配方列表详细
+export function getFormulaList(code) {
+  return request({
+    url: '/feed/FormulaList/' + code,
+    method: 'get'
+  })
+}
+
+// 新增配方列表
+export function addFormulaList(data) {
+  return request({
+    url: '/feed/FormulaList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改配方列表
+export function updateFormulaList(data) {
+  return request({
+    url: '/feed/FormulaList',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除配方列表
+export function delFormulaList(code) {
+  return request({
+    url: '/feed/FormulaList/' + code,
+    method: 'delete'
+  })
+}
diff --git a/src/api/feed/FormulaManagement.js b/src/api/feed/FormulaManagement.js
new file mode 100644
index 0000000..558673b
--- /dev/null
+++ b/src/api/feed/FormulaManagement.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询配方管理列表
+export function listFormulaManagement(query) {
+  return request({
+    url: '/feed/FormulaManagement/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询配方管理详细
+export function getFormulaManagement(formulaId) {
+  return request({
+    url: '/feed/FormulaManagement/' + formulaId,
+    method: 'get'
+  })
+}
+
+// 新增配方管理
+export function addFormulaManagement(data) {
+  return request({
+    url: '/feed/FormulaManagement',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改配方管理
+export function updateFormulaManagement(data) {
+  return request({
+    url: '/feed/FormulaManagement',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除配方管理
+export function delFormulaManagement(formulaIdAndBatchId) {
+  return request({
+    url: '/feed/FormulaManagement/' + formulaIdAndBatchId,
+    method: 'delete'
+  })
+}
diff --git a/src/api/feed/Material.js b/src/api/feed/Material.js
new file mode 100644
index 0000000..b3ec4df
--- /dev/null
+++ b/src/api/feed/Material.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询原料列表
+export function listMaterial(query) {
+  return request({
+    url: '/feed/material/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询原料详细
+export function getMaterial(materialId) {
+  return request({
+    url: '/feed/material/' + materialId,
+    method: 'get'
+  })
+}
+
+// 新增原料
+export function addMaterial(data) {
+  return request({
+    url: '/feed/material',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改原料
+export function updateMaterial(data) {
+  return request({
+    url: '/feed/material',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除原料
+export function delMaterial(materialId) {
+  return request({
+    url: '/feed/material/' + materialId,
+    method: 'delete'
+  })
+}
diff --git a/src/api/mating_plan/generate.js b/src/api/mating_plan/generate.js
index c224fbb..abee51a 100644
--- a/src/api/mating_plan/generate.js
+++ b/src/api/mating_plan/generate.js
@@ -60,11 +60,20 @@ export function updateBreedPlanGenerate(data) {
     })
 }
 
-// 审批配种计划
-export function approveBreedPlan(id) {
+// 获取审批配种计划详情
+export function getApproveBreedPlan(id) {
     return request({
         url: '/mating_plan/generate/approve/' + id,
-        method: 'put'
+        method: 'get'
+    })
+}
+
+// 确认审批配种计划
+export function confirmApproveBreedPlan(data) {
+    return request({
+        url: '/mating_plan/generate/approve/confirm',
+        method: 'put',
+        data: data
     })
 }
 
@@ -76,6 +85,24 @@ export function viewBreedPlan(id) {
     })
 }
 
+// 导出配种计划详情
+export function exportBreedPlanDetails(id) {
+    return request({
+        url: '/mating_plan/generate/export/' + id,
+        method: 'get',
+        responseType: 'blob'
+    })
+}
+
+// 修改配种计划详情
+export function updateBreedPlan(data) {
+    return request({
+        url: '/mating_plan/generate/update',
+        method: 'put',
+        data: data
+    })
+}
+
 // 删除配种计划生成
 export function delBreedPlanGenerate(id) {
     return request({
diff --git a/src/api/mating_plan/mating_plan.js b/src/api/mating_plan/mating_plan.js
index f856817..7d46169 100644
--- a/src/api/mating_plan/mating_plan.js
+++ b/src/api/mating_plan/mating_plan.js
@@ -41,4 +41,4 @@ export function delMating_plan(id) {
     url: '/mating_plan/mating_plan/' + id,
     method: 'delete'
   })
-}
+}
\ No newline at end of file
diff --git a/src/api/miscarriage/miscarriage.js b/src/api/miscarriage/miscarriage.js
new file mode 100644
index 0000000..117bba5
--- /dev/null
+++ b/src/api/miscarriage/miscarriage.js
@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 查询流产记录列表
+export function listMiscarriage(query) {
+  return request({
+    url: '/miscarriage/miscarriage/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询流产记录详细
+export function getMiscarriage(id) {
+  return request({
+    url: '/miscarriage/miscarriage/' + id,
+    method: 'get'
+  })
+}
+
+// 根据耳号查询羊只信息
+export function getSheepInfo(manageTags) {
+  return request({
+    url: '/miscarriage/miscarriage/sheep/' + manageTags,
+    method: 'get'
+  })
+}
+
+// 获取流产原因选项
+export function getReasonOptions() {
+  return request({
+    url: '/miscarriage/miscarriage/reasonOptions',
+    method: 'get'
+  })
+}
+
+// 新增流产记录
+export function addMiscarriage(data) {
+  return request({
+    url: '/miscarriage/miscarriage',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改流产记录
+export function updateMiscarriage(data) {
+  return request({
+    url: '/miscarriage/miscarriage',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除流产记录
+export function delMiscarriage(id) {
+  return request({
+    url: '/miscarriage/miscarriage/' + id,
+    method: 'delete'
+  })
+}
\ No newline at end of file
diff --git a/src/api/produce/bodyManage/body_measure.js b/src/api/produce/bodyManage/body_measure.js
index 66862eb..99226d2 100644
--- a/src/api/produce/bodyManage/body_measure.js
+++ b/src/api/produce/bodyManage/body_measure.js
@@ -42,3 +42,10 @@ export function delBody_measure(id) {
     method: 'delete'
   })
 }
+//获取羊只类别列表
+export function getSheepTypeList() {
+  return request({
+    url: '/base/base/list', 
+    method: 'get'
+  })
+}
\ No newline at end of file
diff --git a/src/api/produce/manage_sheep/trans_group.js b/src/api/produce/manage_sheep/trans_group.js
index 0f0bba6..af75f5b 100644
--- a/src/api/produce/manage_sheep/trans_group.js
+++ b/src/api/produce/manage_sheep/trans_group.js
@@ -60,3 +60,12 @@ export function approveScTransGroup(data) {
     data
   })
 }
+
+// 获取所有牧场列表
+export function listRanch() {
+  return request({
+    url: '/ranch/ranch/list',
+    method: 'get',
+    params: { pageNum: 1, pageSize: 9999 }
+  });
+}
\ No newline at end of file
diff --git a/src/api/ram_file/breed_ram_file.js b/src/api/ram_file/breed_ram_file.js
new file mode 100644
index 0000000..0784f82
--- /dev/null
+++ b/src/api/ram_file/breed_ram_file.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询种公羊档案列表
+export function listBreedRamFile(query) {
+    return request({
+        url: '/ram_file/bas_ram_file/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询种公羊档案详细
+export function getBreedRamFile(id) {
+    return request({
+        url: '/ram_file/bas_ram_file/' + id,
+        method: 'get'
+    })
+}
+
+// 新增种公羊档案
+export function addBreedRamFile(data) {
+    return request({
+        url: '/ram_file/bas_ram_file',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改种公羊档案
+export function updateBreedRamFile(data) {
+    return request({
+        url: '/ram_file/bas_ram_file',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除种公羊档案
+export function delBreedRamFile(id) {
+    return request({
+        url: '/ram_file/bas_ram_file/' + id,
+        method: 'delete'
+    })
+}
+
+// 导出种公羊档案
+export function exportBreedRamFile(query) {
+    return request({
+        url: '/ram_file/bas_ram_file/export',
+        method: 'get',
+        params: query
+    })
+}
\ No newline at end of file
diff --git a/src/api/sale/customer/customer.js b/src/api/sale/customer/customer.js
new file mode 100644
index 0000000..3fe02fd
--- /dev/null
+++ b/src/api/sale/customer/customer.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+export function listCustomer(query) {
+  return request({
+    url: '/customer/customer/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getCustomer(id) {
+  return request({
+    url: '/customer/customer/' + id,
+    method: 'get'
+  })
+}
+
+export function addCustomer(data) {
+  return request({
+    url: '/customer/customer',
+    method: 'post',
+    data: data
+  })
+}
+
+export function updateCustomer(data) {
+  return request({
+    url: '/customer/customer',
+    method: 'put',
+    data: data
+  })
+}
+
+export function delCustomer(id) {
+  return request({
+    url: '/customer/customer/' + id,
+    method: 'delete'
+  })
+}
\ No newline at end of file
diff --git a/src/api/sale/saleRecord/saleRecord.js b/src/api/sale/saleRecord/saleRecord.js
new file mode 100644
index 0000000..5eb4513
--- /dev/null
+++ b/src/api/sale/saleRecord/saleRecord.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询羊只销售记录列表
+export function listSaleRecord(query) {
+  return request({
+    url: '/saleRecord/saleRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询羊只销售记录详细
+export function getSaleRecord(id) {
+  return request({
+    url: '/saleRecord/saleRecord/' + id,
+    method: 'get'
+  })
+}
+
+// 新增羊只销售记录
+export function addSaleRecord(data) {
+  return request({
+    url: '/saleRecord/saleRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改羊只销售记录
+export function updateSaleRecord(data) {
+  return request({
+    url: '/saleRecord/saleRecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除羊只销售记录
+export function delSaleRecord(ids) {
+  return request({
+    url: '/saleRecord/saleRecord/' + ids,
+    method: 'delete'
+  })
+}
+
+// 导出羊只销售记录
+export function exportSaleRecord(query) {
+  return request({
+    url: '/saleRecord/saleRecord/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 根据耳号查询羊只信息
+export function getSheepInfo(bsManageTags) {
+  return request({
+    url: '/saleRecord/saleRecord/getSheepInfo',
+    method: 'get',
+    params: { bsManageTags }
+  })
+}
diff --git a/src/api/sheep_death/death.js b/src/api/sheep_death/death.js
new file mode 100644
index 0000000..6f85df7
--- /dev/null
+++ b/src/api/sheep_death/death.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询羊只死淘记录列表
+export function listDeath(query) {
+  return request({
+    url: '/sheep_death/death/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询羊只死淘记录详细
+export function getDeath(id) {
+  return request({
+    url: '/sheep_death/death/' + id,
+    method: 'get'
+  })
+}
+
+// 新增羊只死淘记录
+export function addDeath(data) {
+  return request({
+    url: '/sheep_death/death',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改羊只死淘记录
+export function updateDeath(data) {
+  return request({
+    url: '/sheep_death/death',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除羊只死淘记录
+export function delDeath(id) {
+  return request({
+    url: '/sheep_death/death/' + id,
+    method: 'delete'
+  })
+}
+
+// 根据管理耳号查询羊只信息
+export function getSheepInfo(manageTags) {
+  return request({
+    url: '/sheep_death/death/sheepInfo/' + manageTags,
+    method: 'get'
+  })
+}
\ No newline at end of file
diff --git a/src/api/stock/in.js b/src/api/stock/in.js
new file mode 100644
index 0000000..a16d659
--- /dev/null
+++ b/src/api/stock/in.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询入库记录列表
+export function listIn(query) {
+  return request({
+    url: '/stock/in/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询入库记录详细
+export function getIn(stockInCode) {
+  return request({
+    url: '/stock/in/' + stockInCode,
+    method: 'get'
+  })
+}
+
+// 新增入库记录
+export function addIn(data) {
+  return request({
+    url: '/stock/in',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改入库记录
+export function updateIn(data) {
+  return request({
+    url: '/stock/in',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除入库记录
+export function delIn(stockInCode) {
+  return request({
+    url: '/stock/in/' + stockInCode,
+    method: 'delete'
+  })
+}
diff --git a/src/api/stock/management.js b/src/api/stock/management.js
new file mode 100644
index 0000000..da53806
--- /dev/null
+++ b/src/api/stock/management.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询物资管理列表
+export function listManagement(query) {
+  return request({
+    url: '/stock/management/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询物资管理详细
+export function getManagement(materialManagementCode) {
+  return request({
+    url: '/stock/management/' + materialManagementCode,
+    method: 'get'
+  })
+}
+
+// 新增物资管理
+export function addManagement(data) {
+  return request({
+    url: '/stock/management',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改物资管理
+export function updateManagement(data) {
+  return request({
+    url: '/stock/management',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除物资管理
+export function delManagement(materialManagementCode) {
+  return request({
+    url: '/stock/management/' + materialManagementCode,
+    method: 'delete'
+  })
+}
diff --git a/src/api/stock/out.js b/src/api/stock/out.js
new file mode 100644
index 0000000..8f78f86
--- /dev/null
+++ b/src/api/stock/out.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询出库记录列表
+export function listOut(query) {
+  return request({
+    url: '/stock/out/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询出库记录详细
+export function getOut(stockOutCode) {
+  return request({
+    url: '/stock/out/' + stockOutCode,
+    method: 'get'
+  })
+}
+
+// 新增出库记录
+export function addOut(data) {
+  return request({
+    url: '/stock/out',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改出库记录
+export function updateOut(data) {
+  return request({
+    url: '/stock/out',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除出库记录
+export function delOut(stockOutCode) {
+  return request({
+    url: '/stock/out/' + stockOutCode,
+    method: 'delete'
+  })
+}
diff --git a/src/views/Breeding_records/Breeding_records/index.vue b/src/views/Breeding_records/Breeding_records/index.vue
new file mode 100644
index 0000000..7ca9f3e
--- /dev/null
+++ b/src/views/Breeding_records/Breeding_records/index.vue
@@ -0,0 +1,663 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="母羊耳号" prop="eweManageTags">
+        <el-input
+            v-model="queryParams.eweManageTags"
+            placeholder="请输入母羊耳号"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="公羊耳号" prop="ramManageTags">
+        <el-input
+            v-model="queryParams.ramManageTags"
+            placeholder="请输入公羊耳号"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="母羊品种" prop="eweVariety">
+        <el-input
+            v-model="queryParams.eweVariety"
+            placeholder="请输入母羊品种"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="公羊品种" prop="ramVariety">
+        <el-input
+            v-model="queryParams.ramVariety"
+            placeholder="请输入公羊品种"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="配种方式" prop="breedType">
+        <el-select v-model="queryParams.breedType" placeholder="请选择配种方式" clearable>
+          <el-option label="同期发情" value="1"></el-option>
+          <el-option label="本交" value="2"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="技术员" prop="technician">
+        <el-input
+            v-model="queryParams.technician"
+            placeholder="请输入技术员"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="孕检结果" prop="pregnancyResult">
+        <el-select v-model="queryParams.pregnancyResult" placeholder="请选择孕检结果" clearable>
+          <el-option label="怀孕" value="怀孕"></el-option>
+          <el-option label="空怀" value="空怀"></el-option>
+          <el-option label="疑似怀孕" value="疑似怀孕"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否孕检" prop="isPregnancyChecked">
+        <el-select v-model="queryParams.isPregnancyChecked" placeholder="请选择是否已孕检" clearable>
+          <el-option label="已孕检" value="1"></el-option>
+          <el-option label="未孕检" value="0"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建人" prop="createBy">
+        <el-input
+            v-model="queryParams.createBy"
+            placeholder="请输入创建人"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建日期" prop="createTime">
+        <el-date-picker clearable
+                        v-model="queryParams.createTime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        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="['Breeding_records:Breeding_records:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['Breeding_records:Breeding_records:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['Breeding_records:Breeding_records:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['Breeding_records:Breeding_records:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+        v-loading="loading"
+        :data="Breeding_recordsList"
+        @selection-change="handleSelectionChange"
+        @sort-change="handleSortChange"
+        :default-sort="{prop: 'createTime', order: 'descending'}"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- 创建日期作为第一列，支持排序 -->
+      <el-table-column
+          label="创建日期"
+          align="center"
+          prop="createTime"
+          width="180"
+          fixed="left"
+          sortable="custom"
+          sort-by="createTime"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="耳号" align="center" prop="eweManageTags" width="120" />
+      <el-table-column label="品种" align="center" prop="eweVariety" width="100" />
+      <el-table-column label="事件类型" align="center" width="100">
+        <template #default="scope">
+          <el-tag type="success">配种</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="配种公羊" align="center" prop="ramManageTags" width="120" />
+      <el-table-column label="配种公羊品种" align="center" prop="ramVariety" width="120" />
+      <el-table-column label="配种方式" align="center" prop="matingType" width="100">
+        <template #default="scope">
+          <span>{{ getBreedTypeText(scope.row.breedType) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="月龄" align="center" prop="eweMonthAge" width="80" />
+      <el-table-column label="配种时羊只类别" align="center" prop="sheepType" width="120" />
+      <el-table-column label="胎次" align="center" prop="eweParity" width="80" />
+      <el-table-column label="配次" align="center" prop="matingCount" width="80" />
+      <el-table-column label="发情后配种时间(小时)" align="center" prop="timeSincePlanning" width="140">
+        <template #default="scope">
+          <span>{{ scope.row.timeSincePlanning || 0 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="当前羊舍" align="center" prop="eweSheepfoldName" width="120" />
+      <el-table-column label="技术员" align="center" prop="technician" width="100" />
+      <el-table-column label="羊只备注" align="center" prop="eweComment" width="120" show-overflow-tooltip />
+      <el-table-column label="繁育状态" align="center" prop="eweBreedStatus" width="100" />
+      <el-table-column label="是否性控" align="center" prop="eweControlled" width="100">
+        <template #default="scope">
+          <el-tag :type="scope.row.eweControlled === 1 ? 'success' : 'info'">
+            {{ scope.row.eweControlled === 1 ? '是' : '否' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="耗精量" align="center" prop="breedDrugs" width="100" />
+
+      <!-- 孕检相关字段 -->
+      <el-table-column label="孕检状态" align="center" width="100">
+        <template #default="scope">
+          <el-tag :type="scope.row.isPregnancyChecked === 1 ? 'success' : 'warning'">
+            {{ scope.row.isPregnancyChecked === 1 ? '已孕检' : '未孕检' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="孕检日期" align="center" prop="pregnancyCheckDate" width="120">
+        <template #default="scope">
+          <span>{{ scope.row.pregnancyCheckDate ? parseTime(scope.row.pregnancyCheckDate, '{y}-{m}-{d}') : '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="孕检结果" align="center" prop="pregnancyResult" width="100">
+        <template #default="scope">
+          <el-tag v-if="scope.row.pregnancyResult"
+                  :type="getPregnancyResultType(scope.row.pregnancyResult)">
+            {{ scope.row.pregnancyResult }}
+          </el-tag>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="胎数" align="center" prop="fetusCount" width="80">
+        <template #default="scope">
+          <span>{{ scope.row.fetusCount || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="孕检方式" align="center" prop="pregnancyWay" width="100">
+        <template #default="scope">
+          <span>{{ scope.row.pregnancyWay || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="配种到孕检间隔(天)" align="center" prop="daysToPregnancyCheck" width="140">
+        <template #default="scope">
+          <span>{{ scope.row.daysToPregnancyCheck || '-' }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="创建人" align="center" prop="createBy" width="100" />
+      <el-table-column label="所在牧场" align="center" prop="ranchName" width="120" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['Breeding_records:Breeding_records:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['Breeding_records:Breeding_records: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="800px" append-to-body>
+      <el-form ref="Breeding_recordsRef" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="母羊耳号" prop="eweManageTags">
+              <el-input v-model="form.eweManageTags" placeholder="请输入母羊耳号" @blur="getEweInfoAndPlan" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公羊耳号" prop="ramManageTags">
+              <el-input v-model="form.ramManageTags" placeholder="请输入公羊耳号" @blur="getRamInfoByTags" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="配种方式" prop="breedType">
+              <el-select v-model="form.breedType" placeholder="请选择配种方式">
+                <el-option label="同期发情" :value="1"></el-option>
+                <el-option label="本交" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="技术员" prop="technician">
+              <el-input v-model="form.technician" placeholder="请输入技术员" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="耗精量" prop="breedDrugs">
+              <el-input v-model="form.breedDrugs" placeholder="请输入耗精量" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="comment">
+              <el-input v-model="form.comment" type="textarea" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 显示母羊信息区域 -->
+        <el-row v-if="eweInfo">
+          <el-col :span="24">
+            <el-divider content-position="left">母羊信息</el-divider>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="品种">
+              <el-input v-model="eweInfo.variety" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="月龄">
+              <el-input v-model="eweInfo.month_age" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="胎次">
+              <el-input v-model="eweInfo.parity" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="繁育状态">
+              <el-input v-model="eweInfo.breed_status" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="当前羊舍">
+              <el-input v-model="eweInfo.sheepfold_name" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否性控">
+              <el-input :value="eweInfo.controlled === 1 ? '是' : '否'" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 显示配种计划信息区域 -->
+        <el-row v-if="breedPlan">
+          <el-col :span="24">
+            <el-divider content-position="left">配种计划信息</el-divider>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计划公羊">
+              <el-input v-model="breedPlan.ram_manage_tags" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计划配种方式">
+              <el-input v-model="breedPlan.breed_type_name" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 显示孕检信息区域（如果已有孕检记录） -->
+        <el-row v-if="form.pregnancyResult">
+          <el-col :span="24">
+            <el-divider content-position="left">孕检信息</el-divider>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="孕检日期">
+              <el-input :value="form.pregnancyCheckDate ? parseTime(form.pregnancyCheckDate, '{y}-{m}-{d}') : ''" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="孕检结果">
+              <el-input v-model="form.pregnancyResult" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="胎数">
+              <el-input v-model="form.fetusCount" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="孕检方式">
+              <el-input v-model="form.pregnancyWay" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="孕检技术员">
+              <el-input v-model="form.pregnancyTechnician" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="配种到孕检间隔">
+              <el-input :value="form.daysToPregnancyCheck + '天'" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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="Breeding_records">
+import {
+  listBreeding_records,
+  getBreeding_records,
+  delBreeding_records,
+  addBreeding_records,
+  updateBreeding_records,
+  getSheepInfoByTags,
+  getLatestBreedPlanByEweTags
+} from "@/api/Breeding_records/Breeding_records"
+
+const {proxy} = getCurrentInstance()
+
+const Breeding_recordsList = 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 eweInfo = ref(null)
+const breedPlan = ref(null)
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    eweManageTags: null,
+    ramManageTags: null,
+    eweVariety: null,
+    ramVariety: null,
+    breedType: null,
+    technician: null,
+    createBy: null,
+    createTime: null,
+    pregnancyResult: null,
+    isPregnancyChecked: null,
+    // 添加排序参数
+    orderByColumn: 'createTime',
+    isAsc: 'desc'
+  },
+  rules: {
+    eweManageTags: [
+      {required: true, message: "母羊耳号不能为空", trigger: "blur"}
+    ],
+    ramManageTags: [
+      {required: true, message: "公羊耳号不能为空", trigger: "blur"}
+    ],
+    technician: [
+      {required: true, message: "技术员不能为空", trigger: "blur"}
+    ],
+    breedType: [
+      {required: true, message: "配种方式不能为空", trigger: "change"}
+    ]
+  }
+})
+
+const {queryParams, form, rules} = toRefs(data)
+
+/** 获取配种方式文字显示 */
+function getBreedTypeText(breedType) {
+  if (breedType === 1) return '同期发情'
+  if (breedType === 2) return '本交'
+  return '-'
+}
+
+/** 获取孕检结果标签类型 */
+function getPregnancyResultType(result) {
+  if (result === '怀孕') return 'success'
+  if (result === '空怀') return 'danger'
+  if (result === '疑似怀孕') return 'warning'
+  return 'info'
+}
+
+/** 查询配种记录列表 */
+function getList() {
+  loading.value = true
+  listBreeding_records(queryParams.value).then(response => {
+    Breeding_recordsList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 表格排序变化处理
+function handleSortChange({column, prop, order}) {
+  queryParams.value.orderByColumn = prop
+  queryParams.value.isAsc = order === 'ascending' ? 'asc' : 'desc'
+  getList()
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    ramId: null,
+    eweId: null,
+    eweManageTags: null,
+    ramManageTags: null,
+    technician: null,
+    breedDrugs: null,
+    breedType: null,
+    comment: null,
+    createBy: null,
+    createTime: null,
+    pregnancyCheckDate: null,
+    pregnancyResult: null,
+    pregnancyWay: null,
+    fetusCount: null,
+    pregnancyTechnician: null,
+    pregnancyRemark: null,
+    daysToPregnancyCheck: null
+  }
+  eweInfo.value = null
+  breedPlan.value = null
+  proxy.resetForm("Breeding_recordsRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getBreeding_records(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改配种记录"
+
+    // 如果有母羊耳号，加载母羊信息
+    if (form.value.eweManageTags) {
+      getEweInfoAndPlan()
+    }
+  })
+}
+
+/** 根据母羊耳号获取羊只信息和配种计划信息 */
+function getEweInfoAndPlan() {
+  if (form.value.eweManageTags) {
+    // 获取母羊信息
+    getSheepInfoByTags(form.value.eweManageTags).then(response => {
+      if (response.data) {
+        eweInfo.value = response.data
+        form.value.eweId = response.data.id
+      } else {
+        proxy.$modal.msgError("未找到该母羊耳号对应的羊只信息")
+        eweInfo.value = null
+      }
+    }).catch(() => {
+      proxy.$modal.msgError("查询母羊信息失败")
+      eweInfo.value = null
+    })
+
+    // 获取配种计划信息（使用最新的获取方法）
+    getLatestBreedPlanByEweTags(form.value.eweManageTags).then(response => {
+      if (response.data) {
+        breedPlan.value = response.data
+        // 自动填充公羊耳号和配种方式（但允许用户修改）
+        if (!form.value.ramManageTags) {
+          form.value.ramManageTags = response.data.ram_manage_tags
+        }
+        if (!form.value.breedType) {
+          form.value.breedType = response.data.breed_type
+        }
+
+        proxy.$modal.msgSuccess("已自动匹配配种计划信息，可手动调整")
+      } else {
+        breedPlan.value = null
+        proxy.$modal.msgWarning("未找到该母羊的配种计划，请手动输入配种信息")
+      }
+    }).catch(() => {
+      proxy.$modal.msgWarning("查询配种计划失败，请手动输入配种信息")
+      breedPlan.value = null
+    })
+  }
+}
+
+/** 根据公羊耳号获取羊只信息 */
+function getRamInfoByTags() {
+  if (form.value.ramManageTags) {
+    getSheepInfoByTags(form.value.ramManageTags).then(response => {
+      if (response.data) {
+        form.value.ramId = response.data.id
+      } else {
+        proxy.$modal.msgError("未找到该公羊耳号对应的羊只信息")
+      }
+    }).catch(() => {
+      proxy.$modal.msgError("查询公羊信息失败")
+    })
+  }
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["Breeding_recordsRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateBreeding_records(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addBreeding_records(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 delBreeding_records(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {
+  })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('Breeding_records/Breeding_records/export', {
+    ...queryParams.value
+  }, `配种记录_${new Date().getTime()}.xlsx`)
+}
+
+// 页面初始化
+onMounted(() => {
+  getList()
+})
+</script>
+
+<style scoped>
+/* 样式保持不变 */
+</style>
\ No newline at end of file
diff --git a/src/views/Pregnancy_Test/Pregnancy_Test/index.vue b/src/views/Pregnancy_Test/Pregnancy_Test/index.vue
index 9b423b9..61148e8 100644
--- a/src/views/Pregnancy_Test/Pregnancy_Test/index.vue
+++ b/src/views/Pregnancy_Test/Pregnancy_Test/index.vue
@@ -89,6 +89,12 @@
 
     <el-table v-loading="loading" :data="Pregnancy_TestList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <!-- 日期作为第一列 -->
+      <el-table-column label="孕检日期" align="center" prop="datetime" width="120" fixed="left">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="耳号" align="center" prop="manageTags" width="120" />
       <el-table-column label="品种" align="center" prop="variety" width="100" />
       <el-table-column label="事件类型" align="center" width="80">
@@ -96,12 +102,13 @@
           <span>孕检</span>
         </template>
       </el-table-column>
-      <el-table-column label="孕检日期" align="center" prop="datetime" width="120">
+      <el-table-column label="孕检结果" align="center" prop="result" width="80">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+          <el-tag :type="getResultTagType(scope.row.result)">
+            {{ scope.row.result }}
+          </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="孕检结果" align="center" prop="result" width="80" />
       <el-table-column label="配种公羊" align="center" prop="fatherManageTags" width="100" />
       <el-table-column label="配种公羊品种" align="center" prop="fatherVariety" width="120" />
       <el-table-column label="配种类型" align="center" prop="matingTypeName" width="80" />
@@ -110,6 +117,13 @@
           <span>{{ parseTime(scope.row.matingDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <!-- 新增配后天数字段 -->
+      <el-table-column label="配后天数" align="center" prop="daysAfterMating" width="80">
+        <template #default="scope">
+          <span v-if="scope.row.daysAfterMating !== null">{{ scope.row.daysAfterMating }}天</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <el-table-column label="胎儿数量" align="center" prop="fetusCount" width="80" />
       <el-table-column label="月龄" align="center" prop="monthAge" width="60" />
       <el-table-column label="孕检时羊只类别" align="center" prop="breedStatus" width="120" />
@@ -154,12 +168,13 @@
     />
 
     <!-- 添加或修改孕检记录对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="900px" append-to-body>
       <el-form ref="Pregnancy_TestRef" :model="form" :rules="rules" label-width="120px">
-        <el-row :gutter="20">
+        <!-- 基本信息 -->
+        <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="耳号" prop="manageTags">
-              <el-input v-model="form.manageTags" placeholder="请输入耳号" @blur="getSheepInfo" />
+              <el-input v-model="form.manageTags" placeholder="请输入耳号" @blur="getSheepAndBreedInfo" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -168,15 +183,17 @@
                               v-model="form.datetime"
                               type="date"
                               value-format="YYYY-MM-DD"
-                              placeholder="请选择孕检日期">
+                              placeholder="请选择孕检日期"
+                              style="width: 100%">
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+
+        <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="孕检结果" prop="result">
-              <el-select v-model="form.result" placeholder="请选择孕检结果">
+              <el-select v-model="form.result" placeholder="请选择孕检结果" @change="onResultChange" style="width: 100%">
                 <el-option label="怀孕" value="怀孕" />
                 <el-option label="未孕" value="未孕" />
                 <el-option label="流产" value="流产" />
@@ -185,11 +202,18 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="胎儿数量" prop="fetusCount">
-              <el-input-number v-model="form.fetusCount" :min="0" :max="10" placeholder="请输入胎儿数量" />
+              <el-input-number
+                  v-model="form.fetusCount"
+                  :min="0"
+                  :max="10"
+                  placeholder="请输入胎儿数量"
+                  :disabled="form.result !== '怀孕'"
+                  style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+
+        <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="技术员" prop="technician">
               <el-input v-model="form.technician" placeholder="请输入技术员" />
@@ -197,7 +221,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="孕检方式" prop="way">
-              <el-select v-model="form.way" placeholder="请选择孕检方式">
+              <el-select v-model="form.way" placeholder="请选择孕检方式" style="width: 100%">
                 <el-option label="B超" value="B超" />
                 <el-option label="试纸" value="试纸" />
                 <el-option label="血检" value="血检" />
@@ -205,48 +229,42 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+
+        <el-row :gutter="30">
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :rows="3" />
             </el-form-item>
           </el-col>
         </el-row>
 
-        <!-- 羊只信息显示 -->
-        <el-divider content-position="left">羊只信息</el-divider>
-        <el-row :gutter="20" v-if="sheepInfo.id">
+        <!-- 配种信息显示 -->
+        <el-divider content-position="left">配种信息</el-divider>
+        <el-row :gutter="30" v-if="breedInfo.manageTags">
           <el-col :span="8">
-            <el-form-item label="品种">
-              <el-input v-model="sheepInfo.variety" disabled />
+            <el-form-item label="配种类型">
+              <el-input v-model="breedInfo.matingTypeName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="月龄">
-              <el-input v-model="sheepInfo.monthAge" disabled />
+            <el-form-item label="配种公羊">
+              <el-input v-model="breedInfo.fatherManageTags" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="胎次">
-              <el-input v-model="sheepInfo.parity" disabled />
+            <el-form-item label="配种日期">
+              <el-input :value="parseTime(breedInfo.matingDate, '{y}-{m}-{d}')" disabled />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20" v-if="sheepInfo.id">
-          <el-col :span="8">
-            <el-form-item label="配次">
-              <el-input v-model="sheepInfo.matingCounts" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="当前羊舍">
-              <el-input v-model="sheepInfo.sheepfoldName" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="繁育状态">
-              <el-input v-model="sheepInfo.breedStatus" disabled />
-            </el-form-item>
+        <el-row v-if="!breedInfo.manageTags && form.manageTags">
+          <el-col :span="24">
+            <el-alert
+                title="未找到该羊只的配种信息"
+                type="warning"
+                show-icon
+                :closable="false">
+            </el-alert>
           </el-col>
         </el-row>
       </el-form>
@@ -261,7 +279,7 @@
 </template>
 
 <script setup name="Pregnancy_Test">
-import { listPregnancy_Test, getPregnancy_Test, delPregnancy_Test, addPregnancy_Test, updatePregnancy_Test, getSheepByManageTags } from "@/api/Pregnancy_Test/Pregnancy_Test"
+import { listPregnancy_Test, getPregnancy_Test, delPregnancy_Test, addPregnancy_Test, updatePregnancy_Test, getSheepByManageTags, getBreedInfoByManageTags } from "@/api/Pregnancy_Test/Pregnancy_Test"
 
 const { proxy } = getCurrentInstance()
 
@@ -274,7 +292,7 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
-const sheepInfo = ref({})
+const breedInfo = ref({})
 
 const data = reactive({
   form: {},
@@ -302,12 +320,55 @@ const data = reactive({
     ],
     way: [
       { required: true, message: "孕检方式不能为空", trigger: "change" }
+    ],
+    fetusCount: [
+      {
+        validator: (rule, value, callback) => {
+          if (form.value.result === '怀孕') {
+            if (!value || value <= 0) {
+              callback(new Error('孕检结果为怀孕时，胎儿数量必须填写且大于0'))
+            } else if (value > 10) {
+              callback(new Error('胎儿数量不能超过10个'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        },
+        trigger: 'blur'
+      }
     ]
   }
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
+/** 孕检结果标签类型 */
+function getResultTagType(result) {
+  switch (result) {
+    case '怀孕':
+      return 'success'
+    case '未孕':
+      return 'info'
+    case '流产':
+      return 'danger'
+    default:
+      return 'info'
+  }
+}
+
+/** 孕检结果变化处理 */
+function onResultChange(value) {
+  if (value === '未孕' || value === '流产') {
+    form.value.fetusCount = 0
+  } else if (value === '怀孕') {
+    if (!form.value.fetusCount || form.value.fetusCount <= 0) {
+      form.value.fetusCount = 1
+    }
+  }
+}
+
 /** 查询孕检记录列表 */
 function getList() {
   loading.value = true
@@ -318,18 +379,31 @@ function getList() {
   })
 }
 
-/** 根据耳号获取羊只信息 */
-function getSheepInfo() {
+/** 根据耳号获取羊只信息和配种信息 */
+function getSheepAndBreedInfo() {
   if (form.value.manageTags) {
+    // 获取羊只基本信息
     getSheepByManageTags(form.value.manageTags).then(response => {
       if (response.data) {
-        sheepInfo.value = response.data
         form.value.sheepId = response.data.id
       } else {
         proxy.$modal.msgError("未找到该耳号的羊只信息")
-        sheepInfo.value = {}
         form.value.sheepId = null
       }
+    }).catch(() => {
+      proxy.$modal.msgError("查询羊只信息失败")
+      form.value.sheepId = null
+    })
+
+    // 获取配种信息
+    getBreedInfoByManageTags(form.value.manageTags).then(response => {
+      if (response.data) {
+        breedInfo.value = response.data
+      } else {
+        breedInfo.value = {}
+      }
+    }).catch(() => {
+      breedInfo.value = {}
     })
   }
 }
@@ -350,12 +424,12 @@ function reset() {
     result: null,
     fetusCount: null,
     technician: null,
-    way: null,
+    way: 'B超', // 默认孕检方式为B超
     remark: null,
     createBy: null,
     createTime: null
   }
-  sheepInfo.value = {}
+  breedInfo.value = {}
   proxy.resetForm("Pregnancy_TestRef")
 }
 
@@ -392,9 +466,9 @@ function handleUpdate(row) {
   getPregnancy_Test(_id).then(response => {
     form.value = response.data
     form.value.manageTags = response.data.manageTags
-    // 获取羊只信息用于显示
+    // 获取配种信息用于显示
     if (response.data.manageTags) {
-      getSheepInfo()
+      getSheepAndBreedInfo()
     }
     open.value = true
     title.value = "修改孕检记录"
@@ -407,15 +481,34 @@ function submitForm() {
     if (valid) {
       if (form.value.id != null) {
         updatePregnancy_Test(form.value).then(response => {
+          console.log("修改成功响应", response)
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
-          getList()
+          // 强制刷新页面数据
+          setTimeout(() => {
+            getList()
+          }, 500)
+        }).catch((error) => {
+          console.error("修改失败", error)
+          proxy.$modal.msgError("修改失败")
         })
       } else {
         addPregnancy_Test(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
+          console.log("新增成功响应", response) // 查看这个日志
+          if (response && response.code === 200) {
+            proxy.$modal.msgSuccess("新增成功")
+            open.value = false
+            // 强制刷新页面数据，延迟执行确保对话框关闭
+            setTimeout(() => {
+              getList()
+            }, 500)
+          } else {
+            console.error("新增返回异常", response)
+            proxy.$modal.msgError("新增失败")
+          }
+        }).catch((error) => {
+          console.error("新增失败", error)
+          proxy.$modal.msgError("新增失败")
         })
       }
     }
@@ -447,6 +540,7 @@ getList()
 .el-table {
   font-size: 12px;
 }
+
 .el-table .cell {
   padding: 0 5px;
 }
diff --git a/src/views/Sperm/Sperm/index.vue b/src/views/Sperm/Sperm/index.vue
new file mode 100644
index 0000000..21bfb45
--- /dev/null
+++ b/src/views/Sperm/Sperm/index.vue
@@ -0,0 +1,421 @@
+<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-input
+            v-model="queryParams.manageTags"
+            placeholder="请输入耳号"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="采精日期" prop="pickDate">
+        <el-date-picker clearable
+                        v-model="queryParams.pickDate"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择采精日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="采精量" prop="amount">
+        <el-input
+            v-model="queryParams.amount"
+            placeholder="请输入采精量"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="精液密度" prop="density">
+        <el-input
+            v-model="queryParams.density"
+            placeholder="请输入精液密度"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="精液活力" prop="vitallity">
+        <el-input
+            v-model="queryParams.vitallity"
+            placeholder="请输入精液活力"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否性控" prop="controlled">
+        <el-select v-model="queryParams.controlled" placeholder="请选择是否性控" clearable>
+          <el-option label="否" value="0" />
+          <el-option label="是" value="1" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="技术员" prop="technician">
+        <el-input
+            v-model="queryParams.technician"
+            placeholder="请输入技术员"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="阴囊周长" prop="scrotumCircumference">
+        <el-input
+            v-model="queryParams.scrotumCircumference"
+            placeholder="请输入阴囊周长"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="精液品质" prop="semenQuality">
+        <el-select v-model="queryParams.semenQuality" placeholder="请选择精液品质" clearable>
+          <el-option label="A级" value="A" />
+          <el-option label="B级" value="B" />
+          <el-option label="C级" value="C" />
+          <el-option label="D级" value="D" />
+        </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"
+            v-hasPermi="['Sperm:Sperm:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['Sperm:Sperm:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['Sperm:Sperm:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['Sperm:Sperm:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="SpermList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- 日期作为第一列 -->
+      <el-table-column label="采精日期" align="center" prop="pickDate" width="120" fixed="left">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.pickDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="耳号" align="center" prop="manageTags" width="120" />
+      <el-table-column label="电子耳号" align="center" prop="electronicTags" width="120" />
+      <el-table-column label="月龄" align="center" prop="monthAge" width="80" />
+      <el-table-column label="采精量(ml)" align="center" prop="amount" width="100" />
+      <el-table-column label="精液密度" align="center" prop="density" width="100" />
+      <el-table-column label="精液活力" align="center" prop="vitallity" width="100" />
+      <el-table-column label="是否性控" align="center" prop="controlled" width="100">
+        <template #default="scope">
+          <span>{{ scope.row.controlled == 1 ? '是' : '否' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="性欲情况" align="center" prop="sexualStatus" width="100" />
+      <el-table-column label="诊疗信息" align="center" prop="info" width="120" />
+      <el-table-column label="技术员" align="center" prop="technician" width="100" />
+      <el-table-column label="采精备注" align="center" prop="comment" width="120" />
+      <el-table-column label="阴囊周长(cm)" align="center" prop="scrotumCircumference" width="120" />
+      <el-table-column label="精液品质" align="center" prop="semenQuality" width="100" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['Sperm:Sperm:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['Sperm:Sperm: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="600px" append-to-body>
+      <el-form ref="SpermRef" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="耳号" prop="manageTags">
+              <el-input v-model="form.manageTags" placeholder="请输入耳号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="采精日期" prop="pickDate">
+              <el-date-picker clearable
+                              v-model="form.pickDate"
+                              type="date"
+                              value-format="YYYY-MM-DD"
+                              placeholder="请选择采精日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="采精量" prop="amount">
+              <el-input v-model="form.amount" placeholder="请输入采精量(ml)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="精液密度" prop="density">
+              <el-input v-model="form.density" placeholder="请输入精液密度" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="精液活力" prop="vitallity">
+              <el-input v-model="form.vitallity" placeholder="请输入精液活力" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否性控" prop="controlled">
+              <el-select v-model="form.controlled" placeholder="请选择是否性控">
+                <el-option label="否" :value="0" />
+                <el-option label="是" :value="1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="性欲情况" prop="sexualStatus">
+              <el-input v-model="form.sexualStatus" placeholder="请输入性欲情况" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="技术员" prop="technician">
+              <el-input v-model="form.technician" placeholder="请输入技术员" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="阴囊周长" prop="scrotumCircumference">
+              <el-input v-model="form.scrotumCircumference" placeholder="请输入阴囊周长(cm)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="精液品质" prop="semenQuality">
+              <el-select v-model="form.semenQuality" placeholder="请选择精液品质">
+                <el-option label="A级" value="A" />
+                <el-option label="B级" value="B" />
+                <el-option label="C级" value="C" />
+                <el-option label="D级" value="D" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="诊疗信息" prop="info">
+          <el-input v-model="form.info" type="textarea" placeholder="请输入诊疗信息" />
+        </el-form-item>
+        <el-form-item label="采集备注" prop="comment">
+          <el-input v-model="form.comment" type="textarea" 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="Sperm">
+import {listSperm, getSperm, delSperm, addSperm, updateSperm} from "@/api/Sperm/Sperm"
+
+const {proxy} = getCurrentInstance()
+
+const SpermList = 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,
+    manageTags: null,
+    pickDate: null,
+    amount: null,
+    density: null,
+    vitallity: null,
+    controlled: null,
+    sexualStatus: null,
+    info: null,
+    technician: null,
+    comment: null,
+    scrotumCircumference: null,
+    semenQuality: null,
+  },
+  rules: {
+    manageTags: [
+      {required: true, message: "耳号不能为空", trigger: "blur"}
+    ],
+    pickDate: [
+      {required: true, message: "采精日期不能为空", trigger: "blur"}
+    ],
+    amount: [
+      {required: true, message: "采精量不能为空", trigger: "blur"}
+    ]
+  }
+})
+
+const {queryParams, form, rules} = toRefs(data)
+
+/** 查询采精记录列表 */
+function getList() {
+  loading.value = true
+  listSperm(queryParams.value).then(response => {
+    SpermList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    manageTags: null,
+    pickDate: null,
+    amount: null,
+    density: null,
+    vitallity: null,
+    controlled: 0,
+    sexualStatus: null,
+    info: null,
+    technician: null,
+    comment: null,
+    scrotumCircumference: null,
+    semenQuality: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("SpermRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getSperm(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改采精记录"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["SpermRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateSperm(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addSperm(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 delSperm(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {
+  })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('Sperm/Sperm/export', {
+    ...queryParams.value
+  }, `Sperm_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>
\ No newline at end of file
diff --git a/src/views/Weaning/weaning_record/index.vue b/src/views/Weaning/weaning_record/index.vue
index e65629f..8f668e7 100644
--- a/src/views/Weaning/weaning_record/index.vue
+++ b/src/views/Weaning/weaning_record/index.vue
@@ -130,14 +130,15 @@
     <!-- 数据表格 -->
     <el-table v-loading="loading" :data="weaning_recordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="耳号" align="center" prop="earNumber" width="100" />
-      <el-table-column label="品种" align="center" prop="breed" width="100" />
-      <el-table-column label="事件类型" align="center" prop="eventType" width="100" />
-      <el-table-column label="断奶日期" align="center" prop="datetime" width="120">
+      <!-- 日期作为第一列 -->
+      <el-table-column label="断奶日期" align="center" prop="datetime" width="120" fixed="left">
         <template #default="scope">
           <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="耳号" align="center" prop="earNumber" width="100" />
+      <el-table-column label="品种" align="center" prop="breed" width="100" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="100" />
       <el-table-column label="性别" align="center" prop="gender" width="80" />
       <el-table-column label="父号" align="center" prop="fatherNumber" width="100" />
       <el-table-column label="母号" align="center" prop="motherNumber" width="100" />
diff --git a/src/views/bas_ram_file/bas_ram_file/index.vue b/src/views/bas_ram_file/bas_ram_file/index.vue
new file mode 100644
index 0000000..1da76b0
--- /dev/null
+++ b/src/views/bas_ram_file/bas_ram_file/index.vue
@@ -0,0 +1,1204 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="88px">
+      <el-form-item label="普通耳号" prop="ordinaryEarNumber">
+        <el-input
+            v-model="queryParams.ordinaryEarNumber"
+            placeholder="请输入普通耳号"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="牧场名称" prop="ranchName">
+        <el-input
+            v-model="queryParams.ranchName"
+            placeholder="请输入牧场名称"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电子耳号" prop="electronicTags">
+        <el-input
+            v-model="queryParams.electronicTags"
+            placeholder="请输入电子耳号"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="品种" prop="variety">
+        <el-input
+            v-model="queryParams.variety"
+            placeholder="请输入品种"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="配种状态" prop="breedingStatus">
+        <el-select v-model="queryParams.breedingStatus" placeholder="请选择配种状态" clearable>
+          <el-option label="待配种" value="1"></el-option>
+          <el-option label="配种中" value="2"></el-option>
+          <el-option label="休息期" value="3"></el-option>
+          <el-option label="淘汰" value="4"></el-option>
+        </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"
+            v-hasPermi="['breed_ram_file:breed_ram_file:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['breed_ram_file:breed_ram_file:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['breed_ram_file:breed_ram_file:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['breed_ram_file:breed_ram_file:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <div style="margin-bottom: 10px;">
+      <el-button type="info" plain icon="Setting" @click="openColumnDialog">显示列</el-button>
+    </div>
+
+    <el-table
+        v-loading="loading"
+        :data="breedRamFileList"
+        @selection-change="handleSelectionChange"
+        style="width: 100%"
+        border
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+          v-if="columns['id'].visible"
+          label="种公羊ID"
+          align="center"
+          prop="id"
+          width="100"
+          fixed="left"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['ordinaryEarNumber'].visible"
+          label="普通耳号"
+          align="center"
+          prop="ordinaryEarNumber"
+          width="120"
+          fixed="left"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['ranchName'].visible"
+          label="牧场名称"
+          align="center"
+          prop="ranchName"
+          width="120"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['sheepfoldName'].visible"
+          label="羊舍"
+          align="center"
+          prop="sheepfoldName"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['electronicTags'].visible"
+          label="电子耳号"
+          align="center"
+          prop="electronicTags"
+          width="120"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['variety'].visible"
+          label="品种"
+          align="center"
+          prop="variety"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['sheepCategory'].visible"
+          label="羊只类别"
+          align="center"
+          prop="sheepCategory"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['currentStatus'].visible"
+          label="当前状态"
+          align="center"
+          prop="currentStatus"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['birthday'].visible"
+          label="生日"
+          align="center"
+          prop="birthday"
+          width="120"
+          sortable
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          v-if="columns['dynamicInfo'].visible"
+          label="动态"
+          align="center"
+          prop="dynamicInfo"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['monthAge'].visible"
+          label="月龄"
+          align="center"
+          prop="monthAge"
+          width="80"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['birthWeight'].visible"
+          label="出生体重"
+          align="center"
+          prop="birthWeight"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['weaningDate'].visible"
+          label="断奶日期"
+          align="center"
+          prop="weaningDate"
+          width="120"
+          sortable
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.weaningDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          v-if="columns['weaningDayAge'].visible"
+          label="断奶日龄"
+          align="center"
+          prop="weaningDayAge"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['weaningWeight'].visible"
+          label="断奶体重"
+          align="center"
+          prop="weaningWeight"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['weaningDailyGain'].visible"
+          label="断奶日增重"
+          align="center"
+          prop="weaningDailyGain"
+          width="110"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['postWeaningDailyGain'].visible"
+          label="断奶后日增重"
+          align="center"
+          prop="postWeaningDailyGain"
+          width="120"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['currentWeight'].visible"
+          label="当前体重"
+          align="center"
+          prop="currentWeight"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['currentWeightDate'].visible"
+          label="当前体重称重日期"
+          align="center"
+          prop="currentWeightDate"
+          width="140"
+          sortable
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.currentWeightDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          v-if="columns['activityLevel'].visible"
+          label="活动量"
+          align="center"
+          prop="activityLevel"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['sexualStatus'].visible"
+          label="性欲情况"
+          align="center"
+          prop="sexualStatus"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['scrotumCircumference'].visible"
+          label="阴囊周长"
+          align="center"
+          prop="scrotumCircumference"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['spermCollectionTime'].visible"
+          label="采精时间"
+          align="center"
+          prop="spermCollectionTime"
+          width="120"
+          sortable
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.spermCollectionTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          v-if="columns['spermVolume'].visible"
+          label="精液量"
+          align="center"
+          prop="spermVolume"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['spermVitality'].visible"
+          label="精液活力"
+          align="center"
+          prop="spermVitality"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['spermDensity'].visible"
+          label="精液密度"
+          align="center"
+          prop="spermDensity"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['spermQuality'].visible"
+          label="精液品质"
+          align="center"
+          prop="spermQuality"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['breedingStatus'].visible"
+          label="配种状态"
+          align="center"
+          prop="breedingStatus"
+          width="100"
+          sortable
+      >
+        <template #default="scope">
+          <dict-tag :options="breeding_status" :value="scope.row.breedingStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column
+          v-if="columns['lastPlanTime'].visible"
+          label="上次计划时间"
+          align="center"
+          prop="lastPlanTime"
+          width="120"
+          sortable
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.lastPlanTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          v-if="columns['currentPlanTime'].visible"
+          label="本次计划时间"
+          align="center"
+          prop="currentPlanTime"
+          width="120"
+          sortable
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.currentPlanTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          v-if="columns['comment'].visible"
+          label="备注"
+          align="center"
+          prop="comment"
+          width="100"
+          sortable
+      >
+        <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['proteinRateEbv'].visible"
+          label="蛋白率%EBV"
+          align="center"
+          prop="proteinRateEbv"
+          width="110"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['milkFatRateEbv'].visible"
+          label="乳脂率%EBV"
+          align="center"
+          prop="milkFatRateEbv"
+          width="110"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['scsEbv'].visible"
+          label="乳体细胞EBV"
+          align="center"
+          prop="scsEbv"
+          width="120"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['growthPerformanceEbv'].visible"
+          label="生长性能EBV"
+          align="center"
+          prop="growthPerformanceEbv"
+          width="120"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['resistanceEbv'].visible"
+          label="抗逆性EBV"
+          align="center"
+          prop="resistanceEbv"
+          width="110"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['reproductionPerformanceEbv'].visible"
+          label="繁殖性能EBV"
+          align="center"
+          prop="reproductionPerformanceEbv"
+          width="120"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['bodyTypeEbv'].visible"
+          label="体型性状EBV"
+          align="center"
+          prop="bodyTypeEbv"
+          width="120"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['comprehensiveBreedingValue'].visible"
+          label="综合育种值"
+          align="center"
+          prop="comprehensiveBreedingValue"
+          width="110"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['fatherNumber'].visible"
+          label="父号"
+          align="center"
+          prop="fatherNumber"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['motherNumber'].visible"
+          label="母号"
+          align="center"
+          prop="motherNumber"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['grandfatherNumber'].visible"
+          label="祖父"
+          align="center"
+          prop="grandfatherNumber"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['grandmotherNumber'].visible"
+          label="祖母"
+          align="center"
+          prop="grandmotherNumber"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['maternalGrandfatherNumber'].visible"
+          label="外祖父"
+          align="center"
+          prop="maternalGrandfatherNumber"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['maternalGrandmotherNumber'].visible"
+          label="外祖母"
+          align="center"
+          prop="maternalGrandmotherNumber"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['isCoreFlock'].visible"
+          label="是否核心羊群"
+          align="center"
+          prop="isCoreFlock"
+          width="120"
+          sortable
+      >
+        <template #default="scope">
+          <dict-tag :options="yes_no" :value="scope.row.isCoreFlock"/>
+        </template>
+      </el-table-column>
+      <el-table-column
+          v-if="columns['isBreedingUse'].visible"
+          label="是否种用"
+          align="center"
+          prop="isBreedingUse"
+          width="100"
+          sortable
+      >
+        <template #default="scope">
+          <dict-tag :options="yes_no" :value="scope.row.isBreedingUse"/>
+        </template>
+      </el-table-column>
+      <el-table-column
+          v-if="columns['pregnancyCheck'].visible"
+          label="孕检"
+          align="center"
+          prop="pregnancyCheck"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['totalMatedEwes'].visible"
+          label="总配母羊数"
+          align="center"
+          prop="totalMatedEwes"
+          width="110"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['naturalPregnancyCheckEwes'].visible"
+          label="本交孕检母羊数"
+          align="center"
+          prop="naturalPregnancyCheckEwes"
+          width="130"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['naturalConceptionRate'].visible"
+          label="本交受孕率%"
+          align="center"
+          prop="naturalConceptionRate"
+          width="120"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['artificialPregnancyCheckEwes'].visible"
+          label="人工孕检母羊数"
+          align="center"
+          prop="artificialPregnancyCheckEwes"
+          width="130"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['artificialConceptionRate'].visible"
+          label="人工受孕率%"
+          align="center"
+          prop="artificialConceptionRate"
+          width="120"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['ramMotherMilkVolume'].visible"
+          label="公羊母亲奶量"
+          align="center"
+          prop="ramMotherMilkVolume"
+          width="120"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['milkProductionEbv'].visible"
+          label="产奶量估计育种值"
+          align="center"
+          prop="milkProductionEbv"
+          width="140"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['accuracy'].visible"
+          label="准确性"
+          align="center"
+          prop="accuracy"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['informationCount'].visible"
+          label="信息数"
+          align="center"
+          prop="informationCount"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['isPaternityTested'].visible"
+          label="是否亲子鉴定"
+          align="center"
+          prop="isPaternityTested"
+          width="120"
+          sortable
+      >
+        <template #default="scope">
+          <dict-tag :options="yes_no" :value="scope.row.isPaternityTested"/>
+        </template>
+      </el-table-column>
+      <el-table-column
+          v-if="columns['createBy'].visible"
+          label="创建人"
+          align="center"
+          prop="createBy"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['createTime'].visible"
+          label="创建日期"
+          align="center"
+          prop="createTime"
+          width="120"
+          sortable
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          v-if="columns['updateBy'].visible"
+          label="修改人"
+          align="center"
+          prop="updateBy"
+          width="100"
+          sortable
+      />
+      <el-table-column
+          v-if="columns['updateTime'].visible"
+          label="修改日期"
+          align="center"
+          prop="updateTime"
+          width="120"
+          sortable
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          fixed="right"
+          width="160"
+      >
+        <template #default="scope">
+          <el-button link type="primary" icon="View" @click="handleDetail(scope.row)" v-hasPermi="['breed_ram_file:breed_ram_file:query']">详情</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['breed_ram_file:breed_ram_file:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['breed_ram_file:breed_ram_file: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="1200px" append-to-body>
+      <el-form ref="breedRamFileRef" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="普通耳号" prop="ordinaryEarNumber">
+              <el-input v-model="form.ordinaryEarNumber" placeholder="请输入普通耳号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="牧场名称" prop="ranchName">
+              <el-input v-model="form.ranchName" placeholder="请输入牧场名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="羊舍名称" prop="sheepfoldName">
+              <el-input v-model="form.sheepfoldName" placeholder="请输入羊舍名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电子耳号" prop="electronicTags">
+              <el-input v-model="form.electronicTags" placeholder="请输入电子耳号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="品种" prop="variety">
+              <el-input v-model="form.variety" placeholder="请输入品种" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="羊只类别" prop="sheepCategory">
+              <el-input v-model="form.sheepCategory" placeholder="请输入羊只类别" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="当前状态" prop="currentStatus">
+              <el-input v-model="form.currentStatus" placeholder="请输入当前状态" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <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-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="配种状态" prop="breedingStatus">
+              <el-select v-model="form.breedingStatus" placeholder="请选择配种状态">
+                <el-option label="待配种" value="1"></el-option>
+                <el-option label="配种中" value="2"></el-option>
+                <el-option label="休息期" value="3"></el-option>
+                <el-option label="淘汰" value="4"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否核心羊群" prop="isCoreFlock">
+              <el-radio-group v-model="form.isCoreFlock">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否种用" prop="isBreedingUse">
+              <el-radio-group v-model="form.isBreedingUse">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否亲子鉴定" prop="isPaternityTested">
+              <el-radio-group v-model="form.isPaternityTested">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="comment">
+              <el-input v-model="form.comment" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 列显示设置对话框 -->
+    <el-dialog v-model="columnDialogVisible" title="显示列设置" width="800px">
+      <div style="max-height: 400px; overflow-y: auto;">
+        <el-checkbox-group v-model="selectedColumns" style="display: grid; grid-template-columns: repeat(3, 1fr); gap: 10px;">
+          <el-checkbox label="id">种公羊ID</el-checkbox>
+          <el-checkbox label="ordinaryEarNumber">普通耳号</el-checkbox>
+          <el-checkbox label="ranchName">牧场名称</el-checkbox>
+          <el-checkbox label="sheepfoldName">羊舍</el-checkbox>
+          <el-checkbox label="electronicTags">电子耳号</el-checkbox>
+          <el-checkbox label="variety">品种</el-checkbox>
+          <el-checkbox label="sheepCategory">羊只类别</el-checkbox>
+          <el-checkbox label="currentStatus">当前状态</el-checkbox>
+          <el-checkbox label="birthday">生日</el-checkbox>
+          <el-checkbox label="dynamicInfo">动态</el-checkbox>
+          <el-checkbox label="monthAge">月龄</el-checkbox>
+          <el-checkbox label="birthWeight">出生体重</el-checkbox>
+          <el-checkbox label="weaningDate">断奶日期</el-checkbox>
+          <el-checkbox label="weaningDayAge">断奶日龄</el-checkbox>
+          <el-checkbox label="weaningWeight">断奶体重</el-checkbox>
+          <el-checkbox label="weaningDailyGain">断奶日增重</el-checkbox>
+          <el-checkbox label="postWeaningDailyGain">断奶后日增重</el-checkbox>
+          <el-checkbox label="currentWeight">当前体重</el-checkbox>
+          <el-checkbox label="currentWeightDate">当前体重称重日期</el-checkbox>
+          <el-checkbox label="activityLevel">活动量</el-checkbox>
+          <el-checkbox label="sexualStatus">性欲情况</el-checkbox>
+          <el-checkbox label="scrotumCircumference">阴囊周长</el-checkbox>
+          <el-checkbox label="spermCollectionTime">采精时间</el-checkbox>
+          <el-checkbox label="spermVolume">精液量</el-checkbox>
+          <el-checkbox label="spermVitality">精液活力</el-checkbox>
+          <el-checkbox label="spermDensity">精液密度</el-checkbox>
+          <el-checkbox label="spermQuality">精液品质</el-checkbox>
+          <el-checkbox label="breedingStatus">配种状态</el-checkbox>
+          <el-checkbox label="lastPlanTime">上次计划时间</el-checkbox>
+          <el-checkbox label="currentPlanTime">本次计划时间</el-checkbox>
+          <el-checkbox label="comment">备注</el-checkbox>
+          <el-checkbox label="proteinRateEbv">蛋白率%EBV</el-checkbox>
+          <el-checkbox label="milkFatRateEbv">乳脂率%EBV</el-checkbox>
+          <el-checkbox label="scsEbv">乳体细胞EBV</el-checkbox>
+          <el-checkbox label="growthPerformanceEbv">生长性能EBV</el-checkbox>
+          <el-checkbox label="resistanceEbv">抗逆性EBV</el-checkbox>
+          <el-checkbox label="reproductionPerformanceEbv">繁殖性能EBV</el-checkbox>
+          <el-checkbox label="bodyTypeEbv">体型性状EBV</el-checkbox>
+          <el-checkbox label="comprehensiveBreedingValue">综合育种值</el-checkbox>
+          <el-checkbox label="fatherNumber">父号</el-checkbox>
+          <el-checkbox label="motherNumber">母号</el-checkbox>
+          <el-checkbox label="grandfatherNumber">祖父</el-checkbox>
+          <el-checkbox label="grandmotherNumber">祖母</el-checkbox>
+          <el-checkbox label="maternalGrandfatherNumber">外祖父</el-checkbox>
+          <el-checkbox label="maternalGrandmotherNumber">外祖母</el-checkbox>
+          <el-checkbox label="isCoreFlock">是否核心羊群</el-checkbox>
+          <el-checkbox label="isBreedingUse">是否种用</el-checkbox>
+          <el-checkbox label="pregnancyCheck">孕检</el-checkbox>
+          <el-checkbox label="totalMatedEwes">总配母羊数</el-checkbox>
+          <el-checkbox label="naturalPregnancyCheckEwes">本交孕检母羊数</el-checkbox>
+          <el-checkbox label="naturalConceptionRate">本交受孕率%</el-checkbox>
+          <el-checkbox label="artificialPregnancyCheckEwes">人工孕检母羊数</el-checkbox>
+          <el-checkbox label="artificialConceptionRate">人工受孕率%</el-checkbox>
+          <el-checkbox label="ramMotherMilkVolume">公羊母亲奶量</el-checkbox>
+          <el-checkbox label="milkProductionEbv">产奶量估计育种值</el-checkbox>
+          <el-checkbox label="accuracy">准确性</el-checkbox>
+          <el-checkbox label="informationCount">信息数</el-checkbox>
+          <el-checkbox label="isPaternityTested">是否亲子鉴定</el-checkbox>
+          <el-checkbox label="createBy">创建人</el-checkbox>
+          <el-checkbox label="createTime">创建日期</el-checkbox>
+          <el-checkbox label="updateBy">修改人</el-checkbox>
+          <el-checkbox label="updateTime">修改日期</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>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BreedRamFile">
+import { listBreedRamFile, getBreedRamFile, delBreedRamFile, addBreedRamFile, updateBreedRamFile } from "@/api/ram_file/breed_ram_file.js"
+
+const { proxy } = getCurrentInstance()
+const { breeding_status } = proxy.useDict('breeding_status')
+const { yes_no } = proxy.useDict('yes_no')
+
+const breedRamFileList = 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 columnDialogVisible = ref(false)
+const selectedColumns = ref([
+  'id', 'ordinaryEarNumber', 'ranchName', 'sheepfoldName', 'electronicTags', 'variety', 'sheepCategory', 'currentStatus', 'birthday', 'dynamicInfo', 'monthAge', 'birthWeight', 'weaningDate', 'weaningDayAge', 'weaningWeight', 'weaningDailyGain', 'postWeaningDailyGain', 'currentWeight', 'currentWeightDate', 'activityLevel', 'sexualStatus', 'scrotumCircumference', 'spermCollectionTime', 'spermVolume', 'spermVitality', 'spermDensity', 'spermQuality', 'breedingStatus', 'lastPlanTime', 'currentPlanTime', 'comment', 'proteinRateEbv', 'milkFatRateEbv', 'scsEbv', 'growthPerformanceEbv', 'resistanceEbv', 'reproductionPerformanceEbv', 'bodyTypeEbv', 'comprehensiveBreedingValue', 'fatherNumber', 'motherNumber', 'grandfatherNumber', 'grandmotherNumber', 'maternalGrandfatherNumber', 'maternalGrandmotherNumber', 'isCoreFlock', 'isBreedingUse', 'pregnancyCheck', 'totalMatedEwes', 'naturalPregnancyCheckEwes', 'naturalConceptionRate', 'artificialPregnancyCheckEwes', 'artificialConceptionRate', 'ramMotherMilkVolume', 'milkProductionEbv', 'accuracy', 'informationCount', 'isPaternityTested', 'createBy', 'createTime', 'updateBy', 'updateTime'
+])
+const isAllSelected = ref(false)
+const columns = reactive({
+  id: { visible: true },
+  ordinaryEarNumber: { visible: true },
+  ranchName: { visible: true },
+  sheepfoldName: { visible: true },
+  electronicTags: { visible: true },
+  variety: { visible: true },
+  sheepCategory: { visible: true },
+  currentStatus: { visible: true },
+  birthday: { visible: true },
+  dynamicInfo: { visible: true },
+  monthAge: { visible: true },
+  birthWeight: { visible: true },
+  weaningDate: { visible: true },
+  weaningDayAge: { visible: true },
+  weaningWeight: { visible: true },
+  weaningDailyGain: { visible: true },
+  postWeaningDailyGain: { visible: true },
+  currentWeight: { visible: true },
+  currentWeightDate: { visible: true },
+  activityLevel: { visible: true },
+  sexualStatus: { visible: true },
+  scrotumCircumference: { visible: true },
+  spermCollectionTime: { visible: true },
+  spermVolume: { visible: true },
+  spermVitality: { visible: true },
+  spermDensity: { visible: true },
+  spermQuality: { visible: true },
+  breedingStatus: { visible: true },
+  lastPlanTime: { visible: true },
+  currentPlanTime: { visible: true },
+  comment: { visible: true },
+  proteinRateEbv: { visible: true },
+  milkFatRateEbv: { visible: true },
+  scsEbv: { visible: true },
+  growthPerformanceEbv: { visible: true },
+  resistanceEbv: { visible: true },
+  reproductionPerformanceEbv: { visible: true },
+  bodyTypeEbv: { visible: true },
+  comprehensiveBreedingValue: { visible: true },
+  fatherNumber: { visible: true },
+  motherNumber: { visible: true },
+  grandfatherNumber: { visible: true },
+  grandmotherNumber: { visible: true },
+  maternalGrandfatherNumber: { visible: true },
+  maternalGrandmotherNumber: { visible: true },
+  isCoreFlock: { visible: true },
+  isBreedingUse: { visible: true },
+  pregnancyCheck: { visible: true },
+  totalMatedEwes: { visible: true },
+  naturalPregnancyCheckEwes: { visible: true },
+  naturalConceptionRate: { visible: true },
+  artificialPregnancyCheckEwes: { visible: true },
+  artificialConceptionRate: { visible: true },
+  ramMotherMilkVolume: { visible: true },
+  milkProductionEbv: { visible: true },
+  accuracy: { visible: true },
+  informationCount: { visible: true },
+  isPaternityTested: { visible: true },
+  createBy: { visible: true },
+  createTime: { visible: true },
+  updateBy: { visible: true },
+  updateTime: { visible: true }
+})
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    ordinaryEarNumber: null,
+    ranchName: null,
+    electronicTags: null,
+    variety: null,
+    breedingStatus: null,
+  },
+  rules: {
+    ordinaryEarNumber: [
+      { required: true, message: "普通耳号不能为空", trigger: "blur" }
+    ],
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询种公羊档案列表 */
+function getList() {
+  loading.value = true
+  listBreedRamFile(queryParams.value).then(response => {
+    breedRamFileList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    ordinaryEarNumber: null,
+    ranchId: null,
+    ranchName: null,
+    sheepfoldId: null,
+    sheepfoldName: null,
+    electronicTags: null,
+    varietyId: null,
+    variety: null,
+    sheepCategory: null,
+    currentStatus: null,
+    birthday: null,
+    dynamicInfo: null,
+    monthAge: null,
+    birthWeight: null,
+    weaningDate: null,
+    weaningDayAge: null,
+    weaningWeight: null,
+    weaningDailyGain: null,
+    postWeaningDailyGain: null,
+    currentWeight: null,
+    currentWeightDate: null,
+    activityLevel: null,
+    sexualStatus: null,
+    scrotumCircumference: null,
+    spermCollectionTime: null,
+    spermVolume: null,
+    spermVitality: null,
+    spermDensity: null,
+    spermQuality: null,
+    breedingStatus: null,
+    lastPlanTime: null,
+    currentPlanTime: null,
+    comment: null,
+    proteinRateEbv: null,
+    milkFatRateEbv: null,
+    scsEbv: null,
+    growthPerformanceEbv: null,
+    resistanceEbv: null,
+    reproductionPerformanceEbv: null,
+    bodyTypeEbv: null,
+    comprehensiveBreedingValue: null,
+    fatherNumber: null,
+    motherNumber: null,
+    grandfatherNumber: null,
+    grandmotherNumber: null,
+    maternalGrandfatherNumber: null,
+    maternalGrandmotherNumber: null,
+    isCoreFlock: 0,
+    isBreedingUse: 0,
+    pregnancyCheck: null,
+    totalMatedEwes: null,
+    naturalPregnancyCheckEwes: null,
+    naturalConceptionRate: null,
+    artificialPregnancyCheckEwes: null,
+    artificialConceptionRate: null,
+    ramMotherMilkVolume: null,
+    milkProductionEbv: null,
+    accuracy: null,
+    informationCount: null,
+    isPaternityTested: 0,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    isDelete: null
+  }
+  proxy.resetForm("breedRamFileRef")
+}
+
+/** 搜索按钮操作 */
+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 handleDetail(row) {
+  reset()
+  const _id = row.id || ids.value
+  getBreedRamFile(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "种公羊档案详情"
+  })
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getBreedRamFile(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改种公羊档案"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["breedRamFileRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateBreedRamFile(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addBreedRamFile(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 取消按钮 */
+function cancel() {
+  open.value = false
+  reset()
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除种公羊档案编号为"' + _ids + '"的数据项？').then(function() {
+    return delBreedRamFile(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('bas_ram_file/bas_ram_file/export', {
+    ...queryParams.value
+  }, `bas_ram_file_${new Date().getTime()}.xlsx`)
+}
+
+// 打开列设置对话框
+function openColumnDialog() {
+  const savedColumns = localStorage.getItem('breedRamSelectedColumns')
+  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('breedRamSelectedColumns', JSON.stringify(selectedColumns.value))
+  columnDialogVisible.value = false
+}
+
+// 重置列设置
+function resetColumnSettings() {
+  selectedColumns.value = Object.keys(columns)
+  updateColumnVisibility()
+  localStorage.setItem('breedRamSelectedColumns', 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/biosafety/deworm/index.vue b/src/views/biosafety/deworm/index.vue
index 5ef0111..bda6153 100644
--- a/src/views/biosafety/deworm/index.vue
+++ b/src/views/biosafety/deworm/index.vue
@@ -2,13 +2,13 @@
   <div class="app-container">
     <!-- 1. 搜索 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
-      <el-form-item label="羊只耳号" prop="sheepNo">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
-      </el-form-item>
       <el-form-item label="驱虫日期">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
+      <el-form-item label="羊只耳号" prop="sheepNo">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
+      </el-form-item>
       <el-form-item label="技术员" prop="technical">
         <el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
       </el-form-item>
@@ -29,6 +29,9 @@
     <!-- 3. 列表 -->
     <el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="驱虫日期" align="center" prop="datetime" width="180">
+        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
+      </el-table-column>
       <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="品种" align="center" prop="variety" />
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
@@ -40,9 +43,6 @@
       <el-table-column label="月龄" align="center" prop="monthAge" />
       <el-table-column label="胎次" align="center" prop="parity" />
       <el-table-column label="繁殖状态" align="center" prop="breed" />
-      <el-table-column label="驱虫日期" align="center" prop="datetime" width="180">
-        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
-      </el-table-column>
       <el-table-column label="技术员" align="center" prop="technical" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200">
@@ -191,7 +191,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="性别">
-              <span>      <dict-tag :options="sheep_gender" :value="editForm.gender" /></span>
+              <span> <dict-tag :options="sheep_gender" :value="editForm.gender" /></span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -225,7 +225,7 @@
             </el-table-column>
             <el-table-column label="用量" width="160">
               <template #default="scope">
-                <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;"/>
+                <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;" />
               </template>
             </el-table-column>
             <el-table-column label="单位" width="120">
diff --git a/src/views/biosafety/diagnosis/add.vue b/src/views/biosafety/diagnosis/add.vue
index c5c3997..c9a1c0e 100644
--- a/src/views/biosafety/diagnosis/add.vue
+++ b/src/views/biosafety/diagnosis/add.vue
@@ -3,7 +3,7 @@
         <el-container style="height: 100vh; display: flex; flex-direction: column;">
             <el-main style="padding: 0; flex: 1; display: flex; flex-direction: column;">
                 <div class="content-wrapper">
-                    <h2 class="page-title">添加治疗记录</h2>
+                    <h2 class="page-title">羊只诊疗</h2>
 
                     <div class="treatment-container">
                         <!-- 羊只信息只读展示 -->
@@ -95,14 +95,14 @@
                                 <el-col :span="12">
                                     <el-form-item label="治疗结果" prop="result">
                                         <el-select v-model="form.result" placeholder="请选择治疗结果" style="width: 100%;">
-                                            <el-option v-for="item in diag_status" :key="item.value" :label="item.label"
+                                            <el-option v-for="item in diag_result" :key="item.value" :label="item.label"
                                                 :value="item.value" />
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="12">
-                                    <el-form-item label="转入羊舍" prop="sheepfoldId">
-                                        <el-select v-model="form.sheepfoldId" placeholder="请选择转入羊舍"
+                                    <el-form-item label="转入羊舍" >
+                                        <el-select v-model="form.sheepfoldId" placeholder="请选择转入羊舍" filterable
                                             style="width: 100%;">
                                             <el-option v-for="item in sheepfolds" :key="item.id" :label="item.name"
                                                 :value="item.id" />
@@ -139,7 +139,7 @@ import { listSheepfold_management } from "@/api/fileManagement/sheepfold_managem
 import {  addDiagnosis } from "@/api/biosafety/diagnosis"
 
 const { proxy } = getCurrentInstance()
-const { diag_status } = proxy.useDict( "diag_status")
+const { diag_result } = proxy.useDict( "diag_result")
 
 
 
diff --git a/src/views/biosafety/diagnosis/index.vue b/src/views/biosafety/diagnosis/index.vue
index f1b64c7..90db5f7 100644
--- a/src/views/biosafety/diagnosis/index.vue
+++ b/src/views/biosafety/diagnosis/index.vue
@@ -2,14 +2,13 @@
   <div class="app-container">
     <!-- 查询区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="羊只" prop="sheepId">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
-      </el-form-item>
-
-      <el-form-item label="时间日期" style="width: 308px">
+      <el-form-item label="事件日期" style="width: 308px">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
+      <el-form-item label="羊只" prop="sheepId">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
+      </el-form-item>
 
       <el-form-item label="疾病类型" prop="diseasePid">
         <el-select v-model="queryParams.diseasePid" clearable placeholder="请选择疾病类型" style="width: 120px;" filterable
@@ -68,7 +67,7 @@
     <el-table v-loading="loading" :data="diagnosisList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="耳号" align="center" prop="sheepNo" />
-      <el-table-column label="时间日期" align="center" prop="datetime" width="180">
+      <el-table-column label="事件日期" align="center" prop="datetime" width="150">
         <template #default="scope">
           <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -83,19 +82,19 @@
       <el-table-column label="诊疗结果" align="center" prop="result">
         <template #default="scope"><dict-tag :options="diag_result" :value="scope.row.result" /></template>
       </el-table-column>
-      <el-table-column label="开始时间" align="center" prop="begindate">
+      <el-table-column label="开始时间" align="center" prop="begindate" width="150">
         <template #default="scope">
           <span>{{ parseTime(scope.row.begindate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="enddate">
+      <el-table-column label="结束时间" align="center" prop="enddate" width="150">
         <template #default="scope">
           <span>{{ parseTime(scope.row.enddate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="治疗天数" align="center" prop="treatDay" />
-      <el-table-column label="羊舍" align="center" prop="sheepfold" width="100px" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100px">
+      <el-table-column label="羊舍" align="center" prop="sheepfold" width="150px" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140px">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['diagnosis:diagnosis:edit']">修改</el-button>
@@ -127,8 +126,7 @@
 
           <el-col :span="8">
             <el-form-item label="性别">
-              <span class="readonly-text"> <dict-tag :options="sheep_gender"
-                    :value="form.gender" /></span>
+              <span class="readonly-text"> <dict-tag :options="sheep_gender" :value="form.gender" /></span>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -305,6 +303,7 @@ function reset() {
     id: null,
     treatId: null,
     sheepId: null,
+    sheepNo: null,
     datetime: null,
     sheepType: null,
     gender: null,
diff --git a/src/views/biosafety/disease/index.vue b/src/views/biosafety/disease/index.vue
index 0138522..28a3979 100644
--- a/src/views/biosafety/disease/index.vue
+++ b/src/views/biosafety/disease/index.vue
@@ -82,6 +82,7 @@ const title = ref("")
 const isExpandAll = ref(true)
 const refreshTable = ref(true)
 
+
 const data = reactive({
     form: {},
     queryParams: {
@@ -99,6 +100,7 @@ const { queryParams, form, rules } = toRefs(data)
 function getList() {
     loading.value = true
     listDisease(queryParams.value).then(response => {
+
         diseaseList.value = proxy.handleTree(response.data, "id", "pid")
         loading.value = false
     })
@@ -107,10 +109,7 @@ function getList() {
 /** 查询疾病下拉树结构 */
 function getTreeselect() {
     listDisease().then(response => {
-        diseaseOptions.value = []
-        const data = { id: 0, name: '疾病', children: [] }
-        data.children = proxy.handleTree(response.data, "id", "pid")
-        diseaseOptions.value.push(data)
+        diseaseOptions.value = response.data.filter(item => item.pid === 0) 
     })
 }
 
diff --git a/src/views/biosafety/disinfect/index.vue b/src/views/biosafety/disinfect/index.vue
index 66547ac..8652be6 100644
--- a/src/views/biosafety/disinfect/index.vue
+++ b/src/views/biosafety/disinfect/index.vue
@@ -2,17 +2,26 @@
   <div class="app-container">
     <!-- 搜索栏 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="80px">
+      <el-form-item label="消毒日期">
+        <!-- 1️⃣ 改为 datetimerange -->
+        <el-date-picker v-model="daterangeDatetime" type="daterange" range-separator="-" start-placeholder="开始日期"
+          end-placeholder="结束日期" value-format="YYYY-MM-DD HH:mm" />
+      </el-form-item>
+
+      <el-form-item label="消毒方式" prop="way">
+        <el-select v-model="queryParams.way" clearable placeholder="请选择消毒方式" filterable style="width: 200px">
+          <el-option v-for="item in disinfect_type" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="药品名称" prop="mediName">
+        <el-input v-model="queryParams.mediName" placeholder="请输入药品" clearable />
+      </el-form-item>
       <el-form-item label="羊舍" prop="sheepfoldId">
         <el-select v-model="queryParams.sheepfoldId" clearable placeholder="请选择羊舍" filterable style="width: 200px">
           <el-option v-for="b in barns" :key="b.id" :label="b.sheepfoldName" :value="b.id" />
         </el-select>
       </el-form-item>
 
-      <el-form-item label="消毒日期">
-        <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
-
       <el-form-item label="技术员" prop="technician">
         <el-input v-model="queryParams.technician" placeholder="请输入技术员" clearable />
       </el-form-item>
@@ -34,13 +43,21 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="disinfectList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName"/>
       <el-table-column label="消毒日期" align="center" prop="datetime" width="180">
-        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
+        <!-- 2️⃣ 显示格式含时分 -->
+        <template #default="scope">
+          {{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}
+        </template>
       </el-table-column>
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
       <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="消毒方式" align="center" prop="way" />
+      <el-table-column label="消毒方式" align="center" prop="way">
+        <template #default="scope">
+          <dict-tag :options="disinfect_type" :value="scope.row.way" />
+        </template>
+      </el-table-column>
       <el-table-column label="比例" align="center" prop="ratio" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200">
         <template #default="scope">
@@ -66,8 +83,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <!-- 3️⃣ type=datetime -->
             <el-form-item label="消毒日期" prop="datetime">
-              <el-date-picker v-model="form.datetime" type="date" value-format="YYYY-MM-DD" style="width: 100%" />
+              <el-date-picker v-model="form.datetime" type="date" value-format="YYYY-MM-DD"
+                style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -82,7 +101,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="技术员">
+            <el-form-item label="技术员" prop="technician">
               <el-input v-model="form.technician" placeholder="请输入技术员姓名" />
             </el-form-item>
           </el-col>
@@ -90,8 +109,10 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="消毒方式">
-              <el-input v-model="form.way" placeholder="请输入消毒方式" />
+            <el-form-item label="消毒方式" prop="way">
+              <el-select v-model="form.way" clearable placeholder="请选择消毒方式" filterable>
+                <el-option v-for="item in disinfect_type" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -164,13 +185,15 @@
       <el-form ref="editFormRef" :model="editForm" :rules="rules" label-width="100px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="羊舍" >
+            <el-form-item label="羊舍">
               <span>{{ editForm.sheepfoldName }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
+           
             <el-form-item label="消毒日期" prop="datetime">
-              <el-date-picker v-model="editForm.datetime" type="date" value-format="YYYY-MM-DD" style="width: 100%" />
+              <el-date-picker v-model="editForm.datetime" type="date" value-format="YYYY-MM-DD"
+                style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -186,7 +209,9 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="消毒方式">
-              <el-input v-model="editForm.way" placeholder="请输入消毒方式" />
+              <el-select v-model="editForm.way" clearable placeholder="请选择消毒方式" filterable>
+                <el-option v-for="item in disinfect_type" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -208,20 +233,20 @@
             </el-table-column>
             <el-table-column label="用量" width="160">
               <template #default="scope">
-                <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" />
+                <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;" />
               </template>
             </el-table-column>
             <el-table-column label="单位" width="120">
               <template #default="scope">
                 <el-select v-model="scope.row.unit" placeholder="单位">
-                  <el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value" />
+                  <el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value+''" />
                 </el-select>
               </template>
             </el-table-column>
             <el-table-column label="用法" width="120">
               <template #default="scope">
                 <el-select v-model="scope.row.usageId" placeholder="用法">
-                  <el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value" />
+                  <el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value+''" />
                 </el-select>
               </template>
             </el-table-column>
@@ -267,8 +292,9 @@ import request from '@/utils/request'
 import { parseTime } from '@/utils/ruoyi'
 
 const { proxy } = getCurrentInstance()
+const { disinfect_type } = proxy.useDict('disinfect_type')
 
-/* ------------------ 列表 ------------------ */
+/* ---------- 列表 ---------- */
 const loading = ref(true)
 const showSearch = ref(true)
 const total = ref(0)
@@ -318,13 +344,15 @@ function resetQuery() {
   handleQuery()
 }
 
-/* ------------------ 新增弹窗 ------------------ */
+/* ---------- 新增弹窗 ---------- */
 const openAdd = ref(false)
 const titleAdd = ref('新增消毒记录')
+
+
 const form = reactive({
   id: null,
   technician: '',
-  datetime: new Date().toISOString().split('T')[0],
+  datetime: new Date().toISOString().slice(0, 10),
   way: '',
   ratio: '',
   comment: '',
@@ -337,7 +365,7 @@ function resetAdd() {
   Object.assign(form, {
     id: null,
     technician: '',
-    datetime: new Date().toISOString().split('T')[0],
+    datetime: new Date().toISOString().slice(0, 10),
     way: '',
     ratio: '',
     comment: '',
@@ -372,13 +400,13 @@ function submitAdd() {
   })
 }
 
-/* ------------------ 修改弹窗 ------------------ */
+/* ---------- 修改弹窗 ---------- */
 const openEdit = ref(false)
 const titleEdit = ref('修改消毒记录')
 const editForm = reactive({
   id: null,
   technician: '',
-  datetime: new Date().toISOString().split('T')[0],
+  datetime:  new Date().toISOString().slice(0, 10),
   way: '',
   ratio: '',
   comment: '',
@@ -391,7 +419,7 @@ function resetEdit() {
   Object.assign(editForm, {
     id: null,
     technician: '',
-    datetime: new Date().toISOString().split('T')[0],
+    datetime:  new Date().toISOString().slice(0, 10),
     way: '',
     ratio: '',
     comment: '',
@@ -405,6 +433,8 @@ function handleUpdate(row) {
   resetEdit()
   const id = row.id || ids.value[0]
   getDisinfect(id).then(res => {
+    // 后端返回的是时间戳，转成 YYYY-MM-DD HH:mm 字符串方便 el-date-picker 回显
+    editForm.datetime = parseTime(res.data.datetime, '{y}-{m}-{d} {h}:{i}')
     Object.assign(editForm, res.data)
     editDetails.value = res.data.usageDetails || []
     openEdit.value = true
@@ -431,7 +461,7 @@ function submitEdit() {
   })
 }
 
-/* ------------------ 功能 ------------------ */
+/* ---------- 功能 ---------- */
 function handleDelete(row) {
   const _ids = row.id || ids.value
   proxy.$modal.confirm('是否确认删除选中的数据？').then(() => delDisinfect(_ids)).then(() => {
@@ -441,10 +471,10 @@ function handleDelete(row) {
 }
 
 function handleExport() {
-  proxy.download('biosafety/disinfect/export', { ...queryParams }, `disinfect_${Date.now()}.xlsx`)
+  proxy.download('biosafety/disinfect/export', { ...queryParams }, `消毒_${Date.now()}.xlsx`)
 }
 
-/* ------------------ 下拉数据 ------------------ */
+/* ---------- 下拉数据 ---------- */
 const barns = ref([])
 const presOptions = ref([])
 const units = ref([])
@@ -454,10 +484,12 @@ const medicines = ref([])
 /* 校验规则 */
 const rules = {
   sheepfoldIds: [{ required: true, message: '请选择羊舍', trigger: 'change' }],
+  technician: [{ required: true, message: '请输入技术员', trigger: 'blur' }],
+  way: [{ required: true, message: '请选择消毒方式', trigger: 'change' }],
   datetime: [{ required: true, message: '请选择日期', trigger: 'change' }]
 }
 
-/* 处方选择事件 - 新增 */
+/* 处方选择事件 */
 function handleSelectPrescription(id) {
   if (!id) return
   getPrescription(id).then(res => {
@@ -469,8 +501,6 @@ function handleSelectPrescription(id) {
     })) || []
   })
 }
-
-/* 处方选择事件 - 修改 */
 function handleSelectPrescriptionEdit(id) {
   if (!id) return
   getPrescription(id).then(res => {
@@ -483,24 +513,22 @@ function handleSelectPrescriptionEdit(id) {
   })
 }
 
-/* 明细添加行 - 新增 */
+/* 明细添加行 */
 function handleAddDetail() {
   usageDetails.value.push({ mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: null, batchNumber: null })
 }
-
-/* 明细添加行 - 修改 */
 function handleAddDetailEdit() {
   editDetails.value.push({ mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: null, batchNumber: null })
 }
 
-/* ------------------ 初始加载 ------------------ */
+/* ---------- 初始加载 ---------- */
 onMounted(() => {
   getList()
-  /* 加载本地羊舍 */
+  /* 本地羊舍下拉 */
   request({ url: '/sheepfold_management/sheepfold_management/list', method: 'get' }).then(res => {
     barns.value = res.rows
   })
-  listPrescription({ status: 1, persType: 1 }).then(res => {
+  listPrescription({ status: 1, persType: 3 }).then(res => {
     presOptions.value = res.rows.map(item => ({ id: item.id, label: item.name }))
   })
   listUnit().then(res => {
diff --git a/src/views/biosafety/health/index.vue b/src/views/biosafety/health/index.vue
index 8cdf7b3..00b5021 100644
--- a/src/views/biosafety/health/index.vue
+++ b/src/views/biosafety/health/index.vue
@@ -2,13 +2,13 @@
   <div class="app-container">
     <!-- 1. 搜索 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
-      <el-form-item label="羊只耳号" prop="sheepNo">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
-      </el-form-item>
       <el-form-item label="保健日期">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
+      <el-form-item label="羊只耳号" prop="sheepNo">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
+      </el-form-item>
       <el-form-item label="技术员" prop="technical">
         <el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
       </el-form-item>
@@ -29,6 +29,9 @@
     <!-- 3. 列表 -->
     <el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="保健日期" align="center" prop="datetime" width="180">
+        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
+      </el-table-column>
       <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="品种" align="center" prop="variety" />
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
@@ -40,9 +43,7 @@
       <el-table-column label="月龄" align="center" prop="monthAge" />
       <el-table-column label="胎次" align="center" prop="parity" />
       <el-table-column label="繁殖状态" align="center" prop="breed" />
-      <el-table-column label="保健日期" align="center" prop="datetime" width="180">
-        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
-      </el-table-column>
+
       <el-table-column label="技术员" align="center" prop="technical" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200">
@@ -122,7 +123,7 @@
             </el-table-column>
             <el-table-column label="用量" width="160">
               <template #default="scope">
-                <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" />
+                <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;" />
               </template>
             </el-table-column>
             <el-table-column label="单位" width="120">
@@ -489,7 +490,7 @@ function handleDelete(row) {
 }
 
 function handleExport() {
-  proxy.download('biosafety/deworm/export', { ...queryParams }, `deworm_${Date.now()}.xlsx`)
+  proxy.download('biosafety/health/export', { ...queryParams }, `保健_${Date.now()}.xlsx`)
 }
 
 /* ------------------ 药品/处方/下拉 ------------------ */
diff --git a/src/views/biosafety/immunity/index.vue b/src/views/biosafety/immunity/index.vue
index dffa551..2a9b430 100644
--- a/src/views/biosafety/immunity/index.vue
+++ b/src/views/biosafety/immunity/index.vue
@@ -2,13 +2,13 @@
   <div class="app-container">
     <!-- 1. 搜索 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
-      <el-form-item label="羊只耳号" prop="sheepNo">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
-      </el-form-item>
       <el-form-item label="免疫日期">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
+      <el-form-item label="羊只耳号" prop="sheepNo">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
+      </el-form-item>
       <el-form-item label="技术员" prop="technical">
         <el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
       </el-form-item>
@@ -29,6 +29,9 @@
     <!-- 3. 列表 -->
     <el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="免疫日期" align="center" prop="datetime" width="180">
+        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
+      </el-table-column>
       <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="品种" align="center" prop="variety" />
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
@@ -40,9 +43,6 @@
       <el-table-column label="月龄" align="center" prop="monthAge" />
       <el-table-column label="胎次" align="center" prop="parity" />
       <el-table-column label="繁殖状态" align="center" prop="breed" />
-      <el-table-column label="免疫日期" align="center" prop="datetime" width="180">
-        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
-      </el-table-column>
       <el-table-column label="技术员" align="center" prop="technical" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200">
@@ -489,7 +489,7 @@ function handleDelete(row) {
 }
 
 function handleExport() {
-  proxy.download('biosafety/deworm/export', { ...queryParams }, `deworm_${Date.now()}.xlsx`)
+  proxy.download('biosafety/immunity/export', { ...queryParams }, `免疫_${Date.now()}.xlsx`)
 }
 
 /* ------------------ 药品/处方/下拉 ------------------ */
diff --git a/src/views/biosafety/medicine/index.vue b/src/views/biosafety/medicine/index.vue
index 7eb0e21..1c1657d 100644
--- a/src/views/biosafety/medicine/index.vue
+++ b/src/views/biosafety/medicine/index.vue
@@ -12,7 +12,7 @@
           <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="使用方法" prop="medicType">
+      <el-form-item label="使用方法" prop="usageId">
         <el-select v-model="queryParams.usageId" placeholder="请选择药品使用方法" clearable style="width: 180px">
           <el-option v-for="item in usageOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
@@ -25,8 +25,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd"
-          v-hasPermi="['system:medicine:add']">新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:medicine:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
@@ -36,16 +35,15 @@
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['system:medicine:remove']">删除</el-button>
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
 
     <el-table v-loading="loading" :data="medicineList" @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="medica" />
       <el-table-column label="药品名称" align="center" prop="name" />
-      <el-table-column label="药品类型" align="center" prop="medicType" :formatter="formatType"></el-table-column>
-      <el-table-column label="使用方法" align="center" prop="usage" :formatter="formatUsage"></el-table-column>
+      <el-table-column label="药品类型" align="center" prop="medicType" :formatter="formatType" />
+      <el-table-column label="使用方法" align="center" prop="usageId" :formatter="formatUsage" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -58,7 +56,7 @@
     </el-table>
 
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" />
+                v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改药品对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
@@ -74,13 +72,11 @@
             <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
-        <el-form-item label="使用方法" prop="medicType">
+        <el-form-item label="使用方法" prop="usageId">
           <el-select v-model="form.usageId" placeholder="请选择药品使用方法">
             <el-option v-for="item in usageOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
-
-
         <el-form-item label="备注" prop="comment">
           <el-input v-model="form.comment" placeholder="请输入备注" :rows="3" type="textarea" />
         </el-form-item>
@@ -97,8 +93,9 @@
 
 <script setup name="Medicine">
 import { listMedicine, getMedicine, delMedicine, addMedicine, updateMedicine } from "@/api/biosafety/medicine"
-import {listType} from "@/api/biosafety/type"
-import {listUsage} from "@/api/biosafety/usage"
+import { listType } from "@/api/biosafety/type"
+import { listUsage } from "@/api/biosafety/usage"
+import { ref, reactive, toRefs, getCurrentInstance } from 'vue'
 
 const { proxy } = getCurrentInstance()
 
@@ -122,59 +119,41 @@ const data = reactive({
     medicType: null,
     usageId: null,
   },
-  rules: {
-  }
+  rules: {}
 })
 
 const { queryParams, form, rules } = toRefs(data)
-// 定义药品类型
-const typeOptions = ref()
-// 定义药品使用方法
-const usageOptions = ref()
-
 
+// ✅ 默认为空数组，避免 undefined
+const typeOptions = ref([])
+const usageOptions = ref([])
 
 /* 查询药品类型 */
 function getTypeOptions() {
   listType().then(response => {
-    typeOptions.value = response.rows.map(item => ({
+    typeOptions.value = response.rows?.map(item => ({
       value: item.id,
       label: item.name
-    }))
+    })) || []
   })
 }
+
 /* 查询药品使用方法 */
 function getUsageOptions() {
   listUsage().then(response => {
-    usageOptions.value = response.rows.map(item => ({
+    usageOptions.value = response.rows?.map(item => ({
       value: item.id,
       label: item.name
-
-    }))
+    })) || []
   })
 }
-const formatType = (row) => {
-  let result = ''
-  for (const item of typeOptions.value) {
-    if (item.value === row.medicType) {
-      result = item.label
-      break
-    }
-  }
-  return result
-}
 
-const formatUsage = (row) => {
-  let result = ''
-  for (const item of usageOptions.value) {
-    if (item.value === row.usageId) {
-      result = item.label
-      break
-    }
-  }
-  return result
-}
+/* ✅ 安全的 formatter */
+const formatType = (row) =>
+  (typeOptions.value || []).find(item => item.value === row.medicType)?.label ?? row.medicType
 
+const formatUsage = (row) =>
+  (usageOptions.value || []).find(item => item.value === row.usageId)?.label ?? row.usageId
 
 /** 查询药品列表 */
 function getList() {
@@ -185,52 +164,39 @@ function getList() {
     loading.value = false
   })
 }
-// 取消按钮
+
 function cancel() {
   open.value = false
   reset()
 }
 
-// 表单重置
 function reset() {
-  form.value = {
-    id: null,
-    medica: null,
-    name: null,
-    medicType: null,
-    usage: null,
-    comment: null
-  }
+  form.value = { id: null, medica: null, name: null, medicType: null, usageId: null, comment: null }
   proxy.resetForm("medicineRef")
 }
 
-/** 搜索按钮操作 */
 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
+  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
@@ -241,18 +207,17 @@ function handleUpdate(row) {
   })
 }
 
-/** 提交按钮 */
 function submitForm() {
   proxy.$refs["medicineRef"].validate(valid => {
     if (valid) {
       if (form.value.id != null) {
-        updateMedicine(form.value).then(response => {
+        updateMedicine(form.value).then(() => {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        addMedicine(form.value).then(response => {
+        addMedicine(form.value).then(() => {
           proxy.$modal.msgSuccess("新增成功")
           open.value = false
           getList()
@@ -262,25 +227,21 @@ function submitForm() {
   })
 }
 
-/** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除药品编号为"' + _ids + '"的数据项？').then(function () {
-    return delMedicine(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => { })
+  proxy.$modal.confirm('是否确认删除药品编号为"' + _ids + '"的数据项？')
+    .then(() => delMedicine(_ids))
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+    })
 }
 
-/** 导出按钮操作 */
 function handleExport() {
-  proxy.download('system/medicine/export', {
-    ...queryParams.value
-  }, `medicine_${new Date().getTime()}.xlsx`)
+  proxy.download('system/medicine/export', { ...queryParams.value }, `药品_${new Date().getTime()}.xlsx`)
 }
 
 getList()
 getTypeOptions()
 getUsageOptions()
-</script>
+</script>
\ No newline at end of file
diff --git a/src/views/biosafety/medicine/type.vue b/src/views/biosafety/medicine/type.vue
index 2471e59..90ecb32 100644
--- a/src/views/biosafety/medicine/type.vue
+++ b/src/views/biosafety/medicine/type.vue
@@ -220,7 +220,7 @@ function handleDelete(row) {
 function handleExport() {
   proxy.download('biosafety/type/export', {
     ...queryParams.value
-  }, `type_${new Date().getTime()}.xlsx`)
+  }, `药品类型_${new Date().getTime()}.xlsx`)
 }
 
 getList()
diff --git a/src/views/biosafety/medicine/unit.vue b/src/views/biosafety/medicine/unit.vue
index 518da8c..9830cbc 100644
--- a/src/views/biosafety/medicine/unit.vue
+++ b/src/views/biosafety/medicine/unit.vue
@@ -180,7 +180,7 @@ function handleDelete(row) {
 function handleExport() {
   proxy.download('biosafety/unit/export', {
     ...queryParams.value
-  }, `unit_${new Date().getTime()}.xlsx`)
+  }, `药品计量单位_${new Date().getTime()}.xlsx`)
 }
 
 getList()
diff --git a/src/views/biosafety/medicine/usage.vue b/src/views/biosafety/medicine/usage.vue
index fd62de7..222016b 100644
--- a/src/views/biosafety/medicine/usage.vue
+++ b/src/views/biosafety/medicine/usage.vue
@@ -220,7 +220,7 @@ function handleDelete(row) {
 function handleExport() {
   proxy.download('biosafety/usage/export', {
     ...queryParams.value
-  }, `usage_${new Date().getTime()}.xlsx`)
+  }, `药品使用方法_${new Date().getTime()}.xlsx`)
 }
 
 getList()
diff --git a/src/views/biosafety/prescription/index.vue b/src/views/biosafety/prescription/index.vue
index 82ac02e..24699d4 100644
--- a/src/views/biosafety/prescription/index.vue
+++ b/src/views/biosafety/prescription/index.vue
@@ -51,17 +51,19 @@
           <dict-tag :options="pres_type" :value="scope.row.persType" />
         </template>
       </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <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">
+      <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="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>
@@ -502,7 +504,7 @@ function cancel() {
  * 调用后端通用导出接口，文件名带时间戳
  */
 function handleExport() {
-  proxy.download('biosafety/prescription/export', { ...queryParams.value }, `prescription_${Date.now()}.xlsx`)
+  proxy.download('biosafety/prescription/export', { ...queryParams.value }, `处方_${Date.now()}.xlsx`)
 }
 
 // 初始化：加载列表
diff --git a/src/views/biosafety/quarantine/index.vue b/src/views/biosafety/quarantine/index.vue
index 5afd0c5..f789d5f 100644
--- a/src/views/biosafety/quarantine/index.vue
+++ b/src/views/biosafety/quarantine/index.vue
@@ -2,13 +2,37 @@
   <div class="app-container">
     <!-- 查询表单 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
-      <el-form-item label="羊只" prop="sheepId">
-        <el-input v-model="queryParams.sheepId" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
-      </el-form-item>
       <el-form-item label="检疫日期">
         <el-date-picker v-model="daterangeDatetime" type="daterange" range-separator="-" start-placeholder="开始日期"
           end-placeholder="结束日期" value-format="YYYY-MM-DD" />
       </el-form-item>
+
+      <el-form-item label="检疫项目" prop="quarItem">
+        <el-select v-model="queryParams.quarItem" placeholder="请选择" filterable clearable style="width: 150px">
+          <el-option v-for="i in quarantineItems" :key="i.value" :label="i.label" :value="i.value" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="采样员" prop="sampler">
+        <el-input v-model="queryParams.sampler" placeholder="请输入采样员名字" clearable @keyup.enter="getList" />
+      </el-form-item>
+
+      <el-form-item label="检疫员" prop="quarOfficer">
+        <el-input v-model="queryParams.quarOfficer" placeholder="请输入检疫员名字" clearable @keyup.enter="getList" />
+      </el-form-item>
+
+      <el-form-item label="羊只类型" prop="sheepType">
+        <el-select v-model="queryParams.sheepType" placeholder="请选择" filterable clearable style="width: 150px">
+          <el-option v-for="i in sheepTypes" :key="i.value" :label="i.makeLabelFormatter" :value="i.label" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="样品类型" prop="sampleType">
+        <el-select v-model="queryParams.sampleType" placeholder="请选择" filterable clearable style="width: 150px">
+          <el-option v-for="i in sampleTypes" :key="i.value" :label="i.label" :value="i.value" />
+        </el-select>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="Search" @click="getList">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -31,11 +55,13 @@
     <!-- 表格 -->
     <el-table v-loading="loading" :data="quarantineList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="检疫日期" align="center" prop="datetime" width="180"
         :formatter="(_, __, v) => parseTime(v, '{y}-{m}-{d}')" />
-      <el-table-column label="羊只性别" align="center" prop="gender" >
-         <template #default="scope"><dict-tag :options="sheep_gender" :value="scope.row.gender" /></template>
+      <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
+      <el-table-column label="羊只性别" align="center" prop="gender">
+        <template #default="scope">
+          <dict-tag :options="sheep_gender" :value="scope.row.gender" />
+        </template>
       </el-table-column>
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
       <el-table-column label="月龄" align="center" prop="monthAge" />
@@ -45,19 +71,22 @@
       <el-table-column label="采样员" align="center" prop="sampler" />
       <el-table-column label="检疫员" align="center" prop="quarOfficer" />
       <el-table-column label="检疫结果" align="center" prop="result">
-        <template #default="scope"><dict-tag :options="quar_result" :value="scope.row.result" /></template>
+        <template #default="scope">
+          <dict-tag :options="quar_result" :value="scope.row.result" />
+        </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
-        <template #default="scope"><dict-tag :options="quar_status" :value="scope.row.status" /></template>
+        <template #default="scope">
+          <dict-tag :options="quar_status" :value="scope.row.status" />
+        </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200" fixed="right">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['bisosafety:quarantine:edit']">检疫</el-button>
-          <el-button v-if="String(scope.row.result) === '1'" link type="success" @click="gotoTreatment(scope.row)">
-            治疗
-          </el-button>
+          <el-button v-if="String(scope.row.result) === '1'" link type="success"
+            @click="gotoTreatment(scope.row)">治疗</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['bisosafety:quarantine:remove']">删除</el-button>
         </template>
@@ -70,20 +99,25 @@
     <!-- 新增弹窗 -->
     <el-dialog title="新增检疫记录" v-model="addOpen" width="700px" append-to-body>
       <el-form ref="addQuarantineRef" :model="addForm" :rules="addRules" label-width="100px">
-        <el-form-item label="羊只耳号" prop="sheepIds" required>
+        <el-form-item label="羊只耳号" prop="sheepList" required>
           <el-input v-model="addForm.sheepIdInput" placeholder="输入耳号后回车验证" @keyup.enter="validateSheepId">
             <template #suffix>
-              <div style="display: flex; align-items: center; height: 100%; margin-left: 8px;">
-                <span v-if="invalidSheepId" style="color: red; font-size: 12px;">耳号不存在</span>
-                <span v-else-if="validSheepId" style="color: green; font-size: 12px;">已添加</span>
-                <span v-else-if="alreadySelected" style="color: orange; font-size: 12px;">该羊只已选择</span>
+              <div style="
+                  display: flex;
+                  align-items: center;
+                  height: 100%;
+                  margin-left: 8px;
+                ">
+                <span v-if="invalidSheepId" style="color: red; font-size: 12px">耳号不存在</span>
+                <span v-else-if="validSheepId" style="color: green; font-size: 12px">已添加</span>
+                <span v-else-if="alreadySelected" style="color: orange; font-size: 12px">该羊只已选择</span>
               </div>
             </template>
           </el-input>
 
-          <el-tag v-for="(id, i) in addForm.sheepIds" :key="i" closable @close="addForm.sheepIds.splice(i, 1)"
+          <el-tag v-for="(item, i) in addForm.sheepList" :key="item.id" closable @close="addForm.sheepList.splice(i, 1)"
             style="margin: 5px 5px 0 0">
-            {{ id }}
+            {{ item.ear }}
           </el-tag>
         </el-form-item>
 
@@ -121,22 +155,27 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="采样员" prop="sampler"><el-input v-model="addForm.sampler" /></el-form-item>
+            <el-form-item label="采样员" prop="sampler">
+              <el-input v-model="addForm.sampler" />
+            </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="检疫员" prop="quarOfficer"><el-input v-model="addForm.quarOfficer" /></el-form-item>
+            <el-form-item label="检疫员" prop="quarOfficer">
+              <el-input v-model="addForm.quarOfficer" />
+            </el-form-item>
           </el-col>
         </el-row>
+
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="检疫结果" prop="result">
-              <el-select v-model="editForm.result" placeholder="检疫结果">
+              <el-select v-model="addForm.result" placeholder="检疫结果">
                 <el-option v-for="i in quar_result" :key="i.value" :label="i.label" :value="i.value" />
               </el-select>
             </el-form-item>
           </el-col>
-
         </el-row>
+
         <el-row :gutter="20">
           <el-col :span="22">
             <el-form-item label="备注" prop="comment">
@@ -153,11 +192,10 @@
       </template>
     </el-dialog>
 
+    <!-- 修改弹窗 -->
     <el-dialog title="修改检疫记录" v-model="editOpen" width="560px" append-to-body :lock-scroll="false">
-
-      <!-- 2. 表单主体 -->
       <el-form ref="editQuarantineRef" :model="editForm" :rules="editRules" label-width="72px" size="default">
-        <!-- 1. 羊只基本信息（只读） -->
+        <!-- 羊只基本信息（只读） -->
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item label="羊只耳号">
@@ -176,7 +214,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="月龄">
-              <span>{{ editForm.monthAge }} </span>
+              <span>{{ editForm.monthAge }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -243,7 +281,13 @@
 </template>
 
 <script setup name="Quarantine">
-import { listQuarantine, getQuarantine, delQuarantine, addQuarantine, updateQuarantine } from '@/api/biosafety/quarantine'
+import {
+  listQuarantine,
+  getQuarantine,
+  delQuarantine,
+  addQuarantine,
+  updateQuarantine
+} from '@/api/biosafety/quarantine'
 import { listItems } from '@/api/biosafety/items'
 import { listSample } from '@/api/biosafety/sample'
 import request from '@/utils/request'
@@ -251,7 +295,11 @@ import { parseTime } from '@/utils/ruoyi'
 import { useRouter } from 'vue-router'
 
 const { proxy } = getCurrentInstance()
-const { quar_result, quar_status,sheep_gender} = proxy.useDict('quar_result', 'quar_status',"sheep_gender")
+const { quar_result, quar_status, sheep_gender } = proxy.useDict(
+  'quar_result',
+  'quar_status',
+  'sheep_gender'
+)
 const router = useRouter()
 
 /* 基础数据 */
@@ -281,19 +329,31 @@ function handleSelectionChange(sel) {
 /* 下拉数据 */
 const quarantineItems = ref([])
 const sampleTypes = ref([])
+const sheepTypes = ref([])
 const barns = ref([])
 
 /* 获取基础下拉 */
 function getItems() {
-  listItems().then(res => quarantineItems.value = res.rows.map(i => ({ label: i.name, value: i.id })))
+  listItems().then(res =>
+    (quarantineItems.value = res.rows.map(i => ({ label: i.name, value: i.id })))
+  )
 }
 function getSample() {
-  listSample().then(res => sampleTypes.value = res.rows.map(i => ({ label: i.name, value: i.id })))
+  listSample().then(res =>
+    (sampleTypes.value = res.rows.map(i => ({ label: i.name, value: i.id })))
+  )
 }
 function getBarns() {
-  request.get('/sheepfold_management/sheepfold_management/list').then(res =>
-    barns.value = res.rows.map(b => ({ label: b.sheepfoldName, value: b.id }))
-  )
+  request
+    .get('/sheepfold_management/sheepfold_management/list')
+    .then(res =>
+      (barns.value = res.rows.map(b => ({ label: b.sheepfoldName, value: b.id })))
+    )
+}
+function getSheepType() {
+  request.get('/base/base/list').then(res => {
+    sheepTypes.value = res.rows.map(i => ({ label: i.name, value: i.id }))
+  })
 }
 
 /* 列表查询 */
@@ -320,7 +380,7 @@ function resetQuery() {
 const addOpen = ref(false)
 const addForm = ref({})
 const addRules = {
-  sheepIds: [{ required: true, message: '请至少添加一个耳号', trigger: 'blur' }],
+  sheepList: [{ required: true, message: '请至少添加一个耳号', trigger: 'blur' }],
   datetime: [{ required: true, message: '请选择日期', trigger: 'change' }],
   quarItem: [{ required: true, message: '请选择项目', trigger: 'change' }],
   sampleType: [{ required: true, message: '请选择样品类型', trigger: 'change' }]
@@ -329,7 +389,6 @@ const addRules = {
 const invalidSheepId = ref(false)
 const validSheepId = ref(false)
 const alreadySelected = ref(false)
-
 const barnSheepMap = reactive({})
 
 function handleBarnChange(selectedBarnIds) {
@@ -341,12 +400,8 @@ function handleBarnChange(selectedBarnIds) {
     if (!newBarnIds.includes(barnId)) {
       const { tags = [], ids = [] } = barnSheepMap[barnId] || {}
       tags.forEach(tag => {
-        const index = addForm.value.sheepIds.indexOf(tag)
-        if (index !== -1) addForm.value.sheepIds.splice(index, 1)
-      })
-      ids.forEach(id => {
-        const index = addForm.value.ids.indexOf(id)
-        if (index !== -1) addForm.value.ids.splice(index, 1)
+        const index = addForm.value.sheepList.findIndex(s => s.ear === tag)
+        if (index !== -1) addForm.value.sheepList.splice(index, 1)
       })
       delete barnSheepMap[barnId]
     }
@@ -355,23 +410,23 @@ function handleBarnChange(selectedBarnIds) {
   // 添加新羊舍的耳号和ID
   newBarnIds.forEach(barnId => {
     if (!barnSheepMap[barnId]) {
-      request.get('/sheepfold_management/sheepfold_management/getSheepById', { params: { id: barnId } })
+      request
+        .get('/sheepfold_management/sheepfold_management/getSheepById', {
+          params: { id: barnId }
+        })
         .then(res => {
           const sheepList = res.data || []
-          const tags = sheepList.map(s => s.manageTags)
-          const ids = sheepList.map(s => s.id)
+          barnSheepMap[barnId] = {
+            tags: sheepList.map(s => s.manageTags),
+            ids: sheepList.map(s => s.id)
+          }
 
-          barnSheepMap[barnId] = { tags, ids }
-
-          tags.forEach(tag => {
-            if (tag && !addForm.value.sheepIds.includes(tag)) {
-              addForm.value.sheepIds.push(tag)
-            }
-          })
-
-          ids.forEach(id => {
-            if (id && !addForm.value.ids.includes(id)) {
-              addForm.value.ids.push(id)
+          sheepList.forEach(s => {
+            if (
+              s.manageTags &&
+              !addForm.value.sheepList.some(item => item.id === s.id)
+            ) {
+              addForm.value.sheepList.push({ id: s.id, ear: s.manageTags })
             }
           })
         })
@@ -380,22 +435,22 @@ function handleBarnChange(selectedBarnIds) {
 }
 
 function validateSheepId() {
-  const id = addForm.value.sheepIdInput.trim()
-  if (!id) return
+  const ear = addForm.value.sheepIdInput.trim()
+  if (!ear) return
 
   invalidSheepId.value = false
   validSheepId.value = false
   alreadySelected.value = false
 
-  if (addForm.value.sheepIds.includes(id)) {
+  if (addForm.value.sheepList.some(s => s.ear === ear)) {
     alreadySelected.value = true
     addForm.value.sheepIdInput = ''
     return
   }
 
-  request.get(`/sheep/sheep/byManageTags/${id}`).then(res => {
+  request.get(`/sheep/sheep/byManageTags/${ear}`).then(res => {
     if (res.data) {
-      addForm.value.sheepIds.push(id)
+      addForm.value.sheepList.push({ id: res.data.id, ear })
       validSheepId.value = true
     } else {
       invalidSheepId.value = true
@@ -405,27 +460,26 @@ function validateSheepId() {
 }
 
 function submitAddForm() {
-
-    addQuarantine(addForm.value).then(() => {
-      proxy.$modal.msgSuccess('新增成功')
-      addOpen.value = false
-      getList()
-    })
-
+  addForm.value.ids = addForm.value.sheepList.map(s => s.id)
+  addQuarantine(addForm.value).then(() => {
+    proxy.$modal.msgSuccess('新增成功')
+    addOpen.value = false
+    getList()
+  })
 }
 
 function handleAdd() {
   Object.assign(addForm.value, {
-    sheepIds: [],
-    ids:[],
+    sheepList: [],
     sheepIdInput: '',
     datetime: new Date().toISOString().slice(0, 10),
-    quarItems: '',
+    quarItem: '',
     sampleType: '',
     sampler: '',
     quarOfficer: '',
-    result: '',}
-  )
+    result: '',
+    barnIds: []
+  })
   Object.keys(barnSheepMap).forEach(k => delete barnSheepMap[k])
   invalidSheepId.value = false
   validSheepId.value = false
@@ -441,8 +495,9 @@ const editRules = {
   quarantineType: [{ required: true, message: '请选择类型', trigger: 'change' }]
 }
 const editQuarantineRef = ref(null)
+
 function handleUpdate(row) {
-  Object.assign(editForm.value, row)  
+  Object.assign(editForm.value, row)
   editOpen.value = true
 }
 
@@ -460,7 +515,8 @@ function submitEditForm() {
 /* 删除 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm(`是否确认删除记录编号为"${_ids}"的数据？`)
+  proxy
+    .$modal.confirm(`是否确认删除记录编号为"${_ids}"的数据？`)
     .then(() => delQuarantine(_ids))
     .then(() => {
       getList()
@@ -470,12 +526,19 @@ function handleDelete(row) {
 
 /* 导出 */
 function handleExport() {
-  proxy.download('bisosafety/quarantine/export', queryParams, `quarantine_${Date.now()}.xlsx`)
+  proxy.download(
+    '/biosafety/quarantine/export',
+    queryParams,
+    `检疫_${Date.now()}.xlsx`
+  )
 }
 
 /* 跳转治疗 */
 function gotoTreatment(row) {
-  router.push({ path: '/biosafety/treatment/add', query: { qId: row.id, sId: row.sheepId } })
+  router.push({
+    path: '/biosafety/treatment/add',
+    query: { qId: row.id, sId: row.sheepId }
+  })
 }
 
 /* 初始化 */
@@ -483,4 +546,5 @@ getList()
 getItems()
 getSample()
 getBarns()
+getSheepType()
 </script>
\ No newline at end of file
diff --git a/src/views/biosafety/treatment/add.vue b/src/views/biosafety/treatment/add.vue
index 1fd2571..c10d79d 100644
--- a/src/views/biosafety/treatment/add.vue
+++ b/src/views/biosafety/treatment/add.vue
@@ -147,7 +147,17 @@
                       </el-select>
                     </template>
                   </el-table-column>
-
+                           <el-table-column label="使用时间" >
+           <template #default="scope">
+               <el-date-picker
+                v-model="scope.row.usetime"
+                type="date"
+                placeholder="选择日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                style="width: 100%;"/>
+            </template>
+          </el-table-column>
                   <el-table-column label="生产厂家" prop="manufacturer">
                     <template #default="scope">
                       <el-input v-model="scope.row.manufacturer" placeholder="请输入生产厂家" style="width:100%" />
@@ -175,6 +185,13 @@
                     <el-input v-model="form.veterinarian" placeholder="请输入兽医姓名" />
                   </el-form-item>
                 </el-col>
+                 <el-col :span="12">
+            <el-form-item label="治疗状态">
+                <el-select v-model="form.status" placeholder="请选择治疗状态">
+                <el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
               </el-row>
 
               <el-form-item label="备注">
@@ -209,6 +226,7 @@ import { ElMessage } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 
 const { proxy } = getCurrentInstance()
+const { treat_status } = proxy.useDict("treat_status")
 
 const route = useRoute()
 const router = useRouter()
@@ -346,11 +364,11 @@ const rules = {
 }
 
 const swPresDetailList = ref([
-  { mediId: null, dosage: 0, unitId: null, usageId: null, manufacturer: '', batchNumber: '' }
+  { mediId: null, dosage: 0, unitId: null, usageId: null, usetime: new Date(),manufacturer: '', batchNumber: '' }
 ])
 
 const handleAddSwPresDetail = () => {
-  swPresDetailList.value.push({ mediId: null, dosage: 0, unitId: null, usageId: null, manufacturer: '', batchNumber: '' })
+  swPresDetailList.value.push({ mediId: null, dosage: 0, unitId: null, usageId: null,usetime: new Date(), manufacturer: '', batchNumber: '' })
 }
 
 const deletePresDetail = (row) => {
@@ -380,6 +398,8 @@ function submitForm() {
       dosage: item.dosage,
       unit: item.unitId,
       usageId: item.usageId,
+      usetime: item.usetime ? new Date(item.usetime).getTime() : null,
+    
       manufacturer: item.manufacturer,
       batchNumber: item.batchNumber
     }))
diff --git a/src/views/biosafety/treatment/index.vue b/src/views/biosafety/treatment/index.vue
index 54fe254..e5bce04 100644
--- a/src/views/biosafety/treatment/index.vue
+++ b/src/views/biosafety/treatment/index.vue
@@ -2,13 +2,18 @@
   <div class="app-container">
     <!-- 搜索栏 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="羊只耳号" prop="sheepNo">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
-      </el-form-item>
       <el-form-item label="治疗日期" style="width: 308px">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
+      <el-form-item label="羊只耳号" prop="sheepNo">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
+      </el-form-item>
+      <el-form-item label="治疗状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择治疗状态" style="width: 120px;">
+          <el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="兽医" prop="veterinary">
         <el-input v-model="queryParams.veterinary" placeholder="请输入兽医" clearable />
       </el-form-item>
@@ -26,6 +31,10 @@
       <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="info" plain icon="DocumentAdd" @click="handleAddDiagnosis" :disabled="multiple">诊疗</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
       </el-col>
@@ -38,6 +47,11 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="treatmentList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="治疗日期" align="center" prop="datetime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="品种" align="center" prop="variety" />
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
@@ -49,18 +63,17 @@
       <el-table-column label="繁殖状态" align="center" prop="breed" />
       <el-table-column label="泌乳天数" align="center" prop="lactDay" />
       <el-table-column label="怀孕天数" align="center" prop="gestDay" />
-      <el-table-column label="治疗日期" align="center" prop="datetime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="疾病类型" align="center" prop="diseaseName" />
+      <el-table-column label="治疗状态" align="center" prop="treatmentPlan">
+        <template #default="scope"><dict-tag :options="treat_status" :value="scope.row.status" /></template>
+      </el-table-column>
       <el-table-column label="兽医" align="center" prop="veterinary" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200" fixed="right">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
-          <el-button link type="primary" @click="gotDiag(scope.row)">诊断</el-button>
+          <el-button link type="primary" @click="gotDiag(scope.row)"
+            v-if="scope.row.status == 0 || scope.row.status == 1">诊断</el-button>
           <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
@@ -70,8 +83,8 @@
       v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 新增弹窗 -->
-    <el-dialog title="添加治疗记录" v-model="addDialog" width="65%" top="5vh" append-to-body destroy-on-close>
-      <el-form ref="addFormRef" :model="addForm" :rules="rules" label-width="140px" size="large">
+    <el-dialog title="添加治疗记录" v-model="addDialog" width="70%" top="5vh" append-to-body destroy-on-close>
+      <el-form ref="addFormRef" :model="addForm" :rules="rules" label-width="80px" size="large">
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="羊只耳号" required>
@@ -133,16 +146,16 @@
           <el-table-column label="序号" width="60">
             <template #default="scope">{{ scope.$index + 1 }}</template>
           </el-table-column>
-          <el-table-column label="药品">
+          <el-table-column label="药品" width="160px">
             <template #default="scope">
               <el-select v-model="scope.row.mediId" filterable placeholder="请选择药品">
                 <el-option v-for="m in medicines" :key="m.value" :label="m.label" :value="m.value" />
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="用量">
+          <el-table-column label="用量" width="160px">
             <template #default="scope">
-              <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" />
+              <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;"/>
             </template>
           </el-table-column>
           <el-table-column label="单位">
@@ -159,12 +172,18 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="生产厂家">
+          <el-table-column label="使用时间" width="160px">
+            <template #default="scope">
+              <el-date-picker v-model="scope.row.usetime" type="date" placeholder="选择日期" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" style="width:100%;" />
+            </template>
+          </el-table-column>
+          <el-table-column label="生产厂家" width="160px">
             <template #default="scope">
               <el-input v-model="scope.row.manufacturer" placeholder="生产厂家" />
             </template>
           </el-table-column>
-          <el-table-column label="生产批号">
+          <el-table-column label="生产批号" width="160px">
             <template #default="scope">
               <el-input v-model="scope.row.batchNumber" placeholder="批号" />
             </template>
@@ -182,6 +201,13 @@
               <el-input v-model="addForm.veterinarian" placeholder="请输入兽医姓名" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="治疗状态">
+              <el-select v-model="addForm.status" placeholder="请选择治疗状态">
+                <el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-form-item label="备注">
@@ -199,7 +225,7 @@
 
     <!-- 修改弹窗 -->
     <el-dialog title="修改治疗记录" v-model="editDialog" width="70%" top="5vh" append-to-body destroy-on-close>
-      <el-form ref="editFormRef" :model="editForm" :rules="rules" label-width="140px" size="large">
+      <el-form ref="editFormRef" :model="editForm" :rules="rules" label-width="80px" size="large">
         <!-- 羊只基本信息展示（只读） -->
         <el-row :gutter="20">
           <el-col :span="6">
@@ -261,14 +287,14 @@
               <el-date-picker v-model="editForm.datetime" type="date" style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="处方">
               <el-select v-model="selectedPresId" filterable clearable placeholder="请选择处方" style="width: 100%"
                 @change="handleSelectPrescription">
                 <el-option v-for="item in presOptions" :key="item.id" :label="item.label" :value="item.id" />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
 
         <el-row :gutter="20">
@@ -313,23 +339,29 @@
           <el-table-column label="单位">
             <template #default="scope">
               <el-select v-model="scope.row.unit" placeholder="单位">
-                <el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value" />
+                <el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value + ''" />
               </el-select>
             </template>
           </el-table-column>
           <el-table-column label="使用方法">
             <template #default="scope">
               <el-select v-model="scope.row.usageId" placeholder="用法">
-                <el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value" />
+                <el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value + ''" />
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="生产厂家">
+          <el-table-column label="使用时间" width="160px">
+            <template #default="scope">
+              <el-date-picker v-model="scope.row.usetime" type="date" placeholder="选择日期" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" style="width: 100%;" />
+            </template>
+          </el-table-column>
+          <el-table-column label="生产厂家" width="160px">
             <template #default="scope">
               <el-input v-model="scope.row.manufacturer" placeholder="生产厂家" />
             </template>
           </el-table-column>
-          <el-table-column label="生产批号">
+          <el-table-column label="生产批号" width="160px">
             <template #default="scope">
               <el-input v-model="scope.row.batchNumber" placeholder="批号" />
             </template>
@@ -347,6 +379,13 @@
               <el-input v-model="editForm.veterinarian" placeholder="请输入兽医姓名" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="治疗状态">
+              <el-select v-model="editForm.status" placeholder="请选择治疗状态">
+                <el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value + ''" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-form-item label="备注">
@@ -354,6 +393,7 @@
         </el-form-item>
       </el-form>
 
+
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="editDialog = false">取 消</el-button>
@@ -361,6 +401,32 @@
         </div>
       </template>
     </el-dialog>
+    <!-- 新增诊疗弹窗 -->
+    <el-dialog title="新增诊疗记录" v-model="diagnosisDialog" width="50%" append-to-body destroy-on-close>
+      <el-form label-width="120px">
+        <el-form-item label="选中羊只">
+          <el-tag v-for="no in selectedSheepNos" :key="no" style="margin-right: 5px">{{ no }}</el-tag>
+        </el-form-item>
+        <el-form-item label="治疗日期" prop="datetime">
+          <el-date-picker v-model="addDia.datetime" type="date" style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="诊疗结果" prop="result">
+          <el-select v-model="addDia.result" placeholder="请选择治疗结果" style="width: 100%;">
+            <el-option v-for="item in diag_result" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="转入羊舍" prop="sheepfoldId">
+          <el-select v-model="addDia.sheepfoldId" filterable placeholder="请选择转入羊舍" style="width: 100%;">
+            <el-option v-for="item in sheepfolds" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <el-button @click="diagnosisDialog = false">取消</el-button>
+        <el-button type="primary" @click="submitDiagnosis">确认</el-button>
+      </template>
+    </el-dialog>
 
   </div>
 </template>
@@ -369,6 +435,7 @@
 import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
 import { listTreatment, getTreatment, delTreatment, addTreatment, updateTreatment } from '@/api/biosafety/treatment'
 import { listDisease } from '@/api/biosafety/disease'
+import { listSheepfold_management } from "@/api/fileManagement/sheepfold_management"
 import { listPrescription, getPrescription } from '@/api/biosafety/prescription'
 import { listUnit } from '@/api/biosafety/unit'
 import { listUsage } from '@/api/biosafety/usage'
@@ -379,7 +446,8 @@ import { useRouter } from 'vue-router'
 const router = useRouter()
 
 const { proxy } = getCurrentInstance()
-const { sheep_gender } = proxy.useDict("sheep_gender")
+const { sheep_gender, diag_result, treat_status } = proxy.useDict("sheep_gender", "diag_result", "treat_status")
+
 
 /* ---------- 列表区域 ---------- */
 const treatmentList = ref([])
@@ -390,6 +458,7 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const daterangeDatetime = ref([])
+const sheepfolds = ref([])
 
 const queryParams = reactive({
   pageNum: 1,
@@ -421,6 +490,7 @@ const addForm = reactive({
   diseasePid: null,
   diseaseId: null,
   veterinarian: '',
+  stats: '',
   comment: ''
 })
 
@@ -438,6 +508,7 @@ const editForm = reactive({
   sheepType: '',
   monthAge: '',
   gender: '',
+  status: '',
   parity: '',
   breed: '',
   lactDay: '',
@@ -451,9 +522,44 @@ const rules = {
 }
 
 const swPresDetailList = ref([
-  { mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: '', batchNumber: '' }
+  { mediId: null, dosage: 0, unit: null, usageId: null, usetime: new Date().toISOString().slice(0, 10), manufacturer: '', batchNumber: '' }
 ])
 
+/* ---------- 新增诊疗 ---------- */
+const diagnosisDialog = ref(false)
+const selectedSheepNos = ref([])
+const addDia = reactive({
+  sheepfoldId: null,
+  result: null,
+  datetime: new Date().toISOString().slice(0, 10)
+})
+
+
+function handleAddDiagnosis() {
+  if (!ids.value.length) {
+    proxy.$modal.msgWarning('请至少选择一条治疗记录')
+    return
+  }
+  selectedSheepNos.value = treatmentList.value
+    .filter(item => ids.value.includes(item.id))
+    .map(item => item.sheepNo)
+  diagnosisDialog.value = true
+}
+
+function submitDiagnosis() {
+  const data = {
+    treatIds: ids.value,
+    result: addDia.result,
+    datetime: addDia.datetime,
+    sheepfoldId: addDia.sheepfoldId
+  }
+  request.post('/diagnosis/diagnosis/adds', data).then(() => {
+    proxy.$modal.msgSuccess('诊疗成功')
+    diagnosisDialog.value = false
+    getList()
+  })
+}
+
 /* ---------- 列表查询 ---------- */
 function getList() {
   loading.value = true
@@ -498,7 +604,15 @@ function handleSelectPrescription(id) {
 
 /* ---------- 药品明细 ---------- */
 function handleAddSwPresDetail() {
-  swPresDetailList.value.push({ mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: '', batchNumber: '' })
+  swPresDetailList.value.push({
+    mediId: null,
+    dosage: 0,
+    unit: null,
+    usageId: null,
+    usetime: new Date().toISOString().slice(0, 10),
+    manufacturer: '',
+    batchNumber: ''
+  })
 }
 function deletePresDetail(row) {
   swPresDetailList.value.splice(swPresDetailList.value.indexOf(row), 1)
@@ -572,6 +686,7 @@ function handleUpdate(row) {
       gender: res.data.gender,
       parity: res.data.parity,
       breed: res.data.breed,
+      status: res.data.status,
       lactDay: res.data.lactDay,
       gestDay: res.data.gestDay
     })
@@ -614,7 +729,7 @@ function handleDelete(row) {
     .then(() => { getList(); proxy.$modal.msgSuccess('删除成功') })
 }
 function handleExport() {
-  proxy.download('treatment/treatment/export', { ...queryParams }, `treatment_${Date.now()}.xlsx`)
+  proxy.download('treatment/treatment/export', { ...queryParams }, `治疗记录_${Date.now()}.xlsx`)
 }
 function resetForm(formObj) {
   Object.assign(formObj, {
@@ -668,6 +783,8 @@ onMounted(() => {
   listMedicine().then(res => {
     medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
   })
+  listSheepfold_management().then(res => {
+    sheepfolds.value = res.rows.map(item => ({ id: item.id, name: item.sheepfoldName }))
+  })
 })
 </script>
-
diff --git a/src/views/biosafety/usageInfo/index.vue b/src/views/biosafety/usageInfo/index.vue
index 2798caf..ddb9c8d 100644
--- a/src/views/biosafety/usageInfo/index.vue
+++ b/src/views/biosafety/usageInfo/index.vue
@@ -1,117 +1,217 @@
 <template>
   <div class="app-container">
     <!-- 搜索表单 -->
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      ref="queryRef"
+      :model="queryParams"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <!-- 使用日期（新增） -->
+      <el-form-item label="使用日期" style="width: 308px">
+        <el-date-picker
+          v-model="daterangeUseTime"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="YYYY-MM-DD"
+        />
+      </el-form-item>
+
+      <!-- 创建日期（原有） -->
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="YYYY-MM-DD"
+        />
+      </el-form-item>
+
+      <el-form-item label="羊只耳号" prop="sheepNo">
+        <el-input
+          v-model="queryParams.sheepNo"
+          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-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
+          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-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
+      v-loading="loading"
+      :data="usageList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        label="使用时间"
+        align="center"
+        prop="datetime"
+        width="180"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="使用名称" align="center" prop="name" />
+      <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
       <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">
+      <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>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+
+      <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> -->
+          <el-button
+            link
+            type="primary"
+            icon="View"
+            @click="handleDetail(scope.row)"
+            v-hasPermi="['biosafety:usage:query']"
+          >
+            详情
+          </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="680px" top="8vh" append-to-body :close-on-click-modal="false"
-      class="usage-detail-dialog">
+    <!-- 详情弹窗（保持不变） -->
+    <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> 基本信息
+            <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="使用名称">{{ 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
+              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}') }}
+            {{ parseTime(form.createTime, '{y}-{m}-{d} {h}:{i}') }}
           </el-descriptions-item>
         </el-descriptions>
       </el-card>
 
       <!-- 药品明细 -->
-      <el-card shadow="never" class="detail-card" style="margin-top: 16px;">
+      <el-card shadow="never" class="detail-card" style="margin-top: 16px">
         <template #header>
           <div class="card-header">
-            <el-icon>
-              <List />
-            </el-icon> 药品使用明细
+            <el-icon><List /></el-icon> 药品使用明细
           </div>
         </template>
-
-        <el-table :data="swMedicineUsageDetailsList" stripe size="small"
-          :row-class-name="rowSwMedicineUsageDetailsIndex" style="width: 100%">
+        <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 v-if="form.useType==4" label="使用时间" align="center" prop="useTime" width="120">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.usetime, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
           <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>
@@ -120,10 +220,10 @@
 </template>
 
 <script setup name="Usage">
-import { listUsageInfo, getUsageInfo, delUsageInfo } from '@/api/biosafety/usageInfo'
+import { listUsageInfo, getUsageInfo } from '@/api/biosafety/usageInfo'
+import { listUnit } from '@/api/biosafety/unit'
+import { listUsage } from '@/api/biosafety/usage'
 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')
@@ -133,10 +233,10 @@ 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 daterangeUseTime = ref([]) // 新增
 
 const data = reactive({
   form: {},
@@ -151,63 +251,46 @@ const data = reactive({
 })
 const { queryParams, form, rules } = toRefs(data)
 
+const units = ref([])
+const usages = ref([])
 
-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
-    }))
+  listUnit().then(res => {
+    units.value = res.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
-    }))
-    
+  listUsage().then(res => {
+    usages.value = res.rows.map(item => ({ value: item.id, label: item.name }))
   })
 }
-/**
- * 格式化使用方法
- * 根据 usageId 查找对应的使用方法名称
- */
+/* 格式化单位 */
+function formatUnit(row) {
+  const unit = units.value.find(u => String(u.value) === String(row.unit))
+  return unit?.label ?? ''
+}
+/* 格式化使用方法 */
 function formatUsage(row) {
-  const usage = usages.value.find(item => String(item.value) === String(row.usageId))
+  const usage = usages.value.find(u => String(u.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]
   }
+  if (daterangeUseTime.value && daterangeUseTime.value.length === 2) {
+    queryParams.value.params.beginUseTime = daterangeUseTime.value[0]
+    queryParams.value.params.endUseTime = daterangeUseTime.value[1]
+  }
+
   listUsageInfo(queryParams.value).then(res => {
     usageList.value = res.rows
     total.value = res.total
@@ -225,19 +308,17 @@ function reset() {
   }
   swMedicineUsageDetailsList.value = []
 }
-
 function cancel() {
   open.value = false
   reset()
 }
-
 function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
-
 function resetQuery() {
   daterangeCreateTime.value = []
+  daterangeUseTime.value = [] // 新增
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -251,33 +332,24 @@ function handleDetail(row) {
     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 rowSwMedicineUsageDetailsIndex({ rowIndex }) {
+  return `row-${rowIndex}`
 }
-
 function handleExport() {
-  proxy.download('biosafety/usageInfo/export', { ...queryParams.value }, `usage_${new Date().getTime()}.xlsx`)
+  proxy.download(
+    'biosafety/usageInfo/export',
+    { ...queryParams.value },
+    `药品使用记录_${new Date().getTime()}.xlsx`
+  )
 }
 
-
+/* 初始化 */
 getList()
-getUnit()  // 获取单位下拉数据源
-getUsageOptions() // 获取使用方法下拉数据源
+getUnit()
+getUsageOptions()
 </script>
 
 <style scoped>
@@ -285,14 +357,12 @@ getUsageOptions() // 获取使用方法下拉数据源
   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;
 }
diff --git a/src/views/breed/lambing_records/index.vue b/src/views/breed/lambing_records/index.vue
index 02e84e0..19b5cf6 100644
--- a/src/views/breed/lambing_records/index.vue
+++ b/src/views/breed/lambing_records/index.vue
@@ -155,17 +155,46 @@
     />
 
     <!-- 添加或修改产羔记录对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="900px" append-to-body>
       <el-form ref="lambing_recordsRef" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="羊只id" prop="sheepId">
-              <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+            <el-form-item label="母羊耳号" prop="femaleEarNumber">
+              <el-input
+                  v-model="form.femaleEarNumber"
+                  placeholder="请输入母羊耳号"
+                  @blur="handleEarNumberBlur"
+                  @input="handleEarNumberInput"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="胎次" prop="parity">
-              <el-input v-model="form.parity" placeholder="请输入胎次" />
+              <el-input v-model="form.parity" placeholder="请输入胎次" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="公羊耳号" prop="maleEarNumber">
+              <el-input v-model="form.maleEarNumber" placeholder="公羊耳号" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="配种日期" prop="breedingDate">
+              <el-input v-model="form.breedingDate" placeholder="配种日期" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="怀孕天数" prop="pregnancyDays">
+              <el-input v-model="form.pregnancyDays" placeholder="怀孕天数" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="技术员" prop="technician">
+              <el-input v-model="form.technician" placeholder="请输入技术员" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -187,32 +216,27 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="技术员" prop="technician">
-              <el-input v-model="form.technician" placeholder="请输入技术员" />
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="产羔评分" prop="score">
               <el-input v-model.number="form.score" placeholder="请输入产羔评分" type="number" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="创建日期" prop="createTime">
+            <el-form-item label="产羔日期" prop="createTime">
               <el-date-picker
                   clearable
                   v-model="form.createTime"
                   type="date"
                   value-format="YYYY-MM-DD"
-                  placeholder="请选择创建日期">
+                  placeholder="请选择产羔日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
             <el-form-item label="备注" prop="comment">
-              <el-input v-model="form.comment" placeholder="请输入备注" />
+              <el-input v-model="form.comment" type="textarea" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -351,7 +375,7 @@
 </template>
 
 <script setup name="Lambing_records">
-import { listLambing_records, getLambing_records, delLambing_records, addLambing_records, updateLambing_records, getLambDetail, getVarietyList } from "@/api/breed/lambing_records"
+import { listLambing_records, getLambing_records, delLambing_records, addLambing_records, updateLambing_records, getLambDetail, getVarietyList, getBreedingInfo } from "@/api/breed/lambing_records"
 
 const { proxy } = getCurrentInstance()
 
@@ -391,8 +415,8 @@ const data = reactive({
     breedingDate: []
   },
   rules: {
-    sheepId: [
-      { required: true, message: "羊只id不能为空", trigger: "blur" }
+    femaleEarNumber: [
+      { required: true, message: "母羊耳号不能为空", trigger: "blur" }
     ],
     lambsBorn: [
       { required: true, message: "产羔数量不能为空", trigger: "blur" }
@@ -405,10 +429,9 @@ const { queryParams, form, rules } = toRefs(data)
 /** 获取品种列表 */
 function getVarietyData() {
   return getVarietyList().then(response => {
-    console.log('品种列表数据:', response) // 调试日志
+    console.log('品种列表数据:', response)
     varietyList.value = response.rows || []
-    console.log('处理后的品种列表:', varietyList.value) // 调试日志
-    console.log('第一个品种数据结构:', varietyList.value[0]) // 查看字段结构
+    console.log('处理后的品种列表:', varietyList.value)
   }).catch(error => {
     console.error('获取品种列表失败:', error)
     varietyList.value = []
@@ -418,24 +441,21 @@ function getVarietyData() {
 /** 根据品种ID获取品种名称 */
 function getVarietyName(varietyId) {
   if (!varietyId) return '-'
-
-  // 确保varietyId是数字类型
   const id = typeof varietyId === 'string' ? parseInt(varietyId) : varietyId
-
   const variety = varietyList.value.find(item => item.id === id)
-  return variety ? variety.variety : `未知品种(${varietyId})`  // 使用 variety 字段
+  return variety ? variety.variety : `未知品种(${varietyId})`
 }
 
 /** 性别转换函数 - 前端显示转后端数值 */
 function genderToNumber(gender) {
-  if (gender === 'male') return 0
-  if (gender === 'female') return 1
+  if (gender === 'male') return 1
+  if (gender === 'female') return 0
   return gender
 }
 
 /** 性别显示函数 - 后端数值转前端显示 */
 function getGenderDisplay(gender) {
-  if (gender === 0 || gender === 'male') {
+  if (gender === 2 || gender === 'male') {
     return { label: '公', type: 'primary' }
   } else if (gender === 1 || gender === 'female') {
     return { label: '母', type: 'success' }
@@ -443,6 +463,53 @@ function getGenderDisplay(gender) {
   return { label: '未知', type: 'info' }
 }
 
+/** 母羊耳号输入处理 */
+function handleEarNumberInput() {
+  // 清空相关联动字段
+  form.value.sheepId = null
+  form.value.parity = null
+  form.value.maleEarNumber = null
+  form.value.breedingDate = null
+  form.value.pregnancyDays = null
+  form.value.technician = null
+}
+
+/** 母羊耳号失焦处理 - 自动查询配种信息 */
+function handleEarNumberBlur() {
+  const earNumber = form.value.femaleEarNumber
+  if (!earNumber || earNumber.trim() === '') {
+    return
+  }
+
+  // 调用API查询配种信息
+  getBreedingInfo(earNumber.trim()).then(response => {
+    if (response.code === 200 && response.data) {
+      const breedingData = response.data
+
+      // 填充表单数据
+      form.value.sheepId = breedingData.sheep_id
+      form.value.parity = breedingData.parity
+      form.value.maleEarNumber = breedingData.male_ear_number || '未找到公羊'
+      form.value.breedingDate = breedingData.breeding_date
+      form.value.pregnancyDays = breedingData.pregnancy_days
+      form.value.technician = breedingData.technician || ''
+
+      proxy.$modal.msgSuccess("已自动填充配种信息")
+    } else {
+      proxy.$modal.msgWarning(response.msg || "未找到该母羊的配种记录")
+      // 清空相关字段
+      form.value.sheepId = null
+      form.value.parity = null
+      form.value.maleEarNumber = null
+      form.value.breedingDate = null
+      form.value.pregnancyDays = null
+    }
+  }).catch(error => {
+    console.error('查询配种信息失败:', error)
+    proxy.$modal.msgError("查询配种信息失败")
+  })
+}
+
 /** 查询产羔记录列表 */
 function getList() {
   loading.value = true
@@ -463,8 +530,12 @@ function cancel() {
 function reset() {
   form.value = {
     id: null,
+    femaleEarNumber: null,
     sheepId: null,
     parity: null,
+    maleEarNumber: null,
+    breedingDate: null,
+    pregnancyDays: null,
     lambsBorn: null,
     survival: null,
     technician: null,
@@ -523,13 +594,13 @@ function handleLambsBornChange() {
   if (count > 0 && count <= 10) { // 限制最大数量
     showLambForms.value = true
     lambForms.value = Array.from({ length: count }, (_, index) => ({
-      lambEarNumber: '',    // 对应ScLambDetail.lambEarNumber
-      gender: '',          // 对应ScLambDetail.gender
-      isRetained: false,   // 对应ScLambDetail.isRetained
-      birthWeight: null,   // 对应ScLambDetail.birthWeight
-      lambBreed: null,     // 对应ScLambDetail.lambBreed（品种ID，设置为null显示placeholder）
-      lineage: '',         // 对应ScLambDetail.lineage
-      birthday: ''         // 对应ScLambDetail.birthday
+      lambEarNumber: '',
+      gender: '',
+      isRetained: false,
+      birthWeight: null,
+      lambBreed: null,
+      lineage: '',
+      birthday: ''
     }))
   } else {
     showLambForms.value = false
@@ -542,7 +613,6 @@ function handleLambDetail(row) {
   detailData.value = row
   // 调用API获取羔羊详情列表
   getLambDetail(row.id).then(response => {
-    // 后端返回的是ScLambDetail对象列表，字段名称已经匹配
     lambDetailList.value = response.data || []
     detailOpen.value = true
   })
@@ -577,7 +647,7 @@ function submitForm() {
           if (lamb.birthWeight && typeof lamb.birthWeight === 'string') {
             lamb.birthWeight = parseFloat(lamb.birthWeight)
           }
-          // 性别转换：'male' -> 0, 'female' -> 1
+          // 性别转换：'male' -> 1, 'female' -> 0
           lamb.gender = genderToNumber(lamb.gender)
           // 品种ID已经是数字，无需转换
         })
@@ -602,7 +672,6 @@ function submitForm() {
   })
 }
 
-
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
diff --git a/src/views/dairyProducts/dryMatterCorrection/index.vue b/src/views/dairyProducts/dryMatterCorrection/index.vue
index 8d2e6f3..b689612 100644
--- a/src/views/dairyProducts/dryMatterCorrection/index.vue
+++ b/src/views/dairyProducts/dryMatterCorrection/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <!-- 搜索表单 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="年月" prop="datetime">
         <el-date-picker clearable
@@ -25,6 +26,7 @@
       </el-form-item>
     </el-form>
 
+    <!-- 操作按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -67,7 +69,7 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <!-- 修改表格列宽设置 -->
+    <!-- 数据表格 -->
     <el-table 
       v-loading="loading" 
       :data="dryMatterCorrectionList" 
@@ -88,7 +90,8 @@
       <el-table-column label="干物质标准" align="center" prop="standard" />
       <el-table-column label="干物质系数" align="center" prop="coefficient">
         <template #default="scope">
-          <span>{{ scope.row.coefficient != null ? scope.row.coefficient.toFixed(4) : '' }}</span>
+          <!-- 修复：确保显示两位小数 -->
+          <span>{{ formatCoefficient(scope.row.coefficient) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
@@ -99,6 +102,7 @@
       </el-table-column>
     </el-table>
     
+    <!-- 分页组件 -->
     <pagination
       v-show="total>0"
       :total="total"
@@ -107,7 +111,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改干物质校正对话框 -->
+    <!-- 添加/修改对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="dryMatterCorrectionRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="年月" prop="datetime">
@@ -136,7 +140,8 @@
           <el-input v-model="form.standard" placeholder="请输入干物质标准" @input="calculateCoefficient" />
         </el-form-item>
         <el-form-item label="干物质系数">
-          <el-input :value="form.coefficient != null ? form.coefficient.toFixed(4) : ''" placeholder="自动计算" readonly>
+          <!-- 修复：确保显示两位小数 -->
+          <el-input :value="formatCoefficient(form.coefficient)" placeholder="自动计算" readonly>
           </el-input>
         </el-form-item>
       </el-form>
@@ -151,6 +156,7 @@
 </template>
 
 <script setup name="DryMatterCorrection">
+// 导入API方法
 import { 
   listDryMatterCorrection, 
   getDryMatterCorrection, 
@@ -162,6 +168,7 @@ import {
 const { proxy } = getCurrentInstance()
 const { da_ranch } = proxy.useDict('da_ranch')
 
+// 响应式数据
 const dryMatterCorrectionList = ref([])
 const open = ref(false)
 const loading = ref(true)
@@ -172,9 +179,11 @@ const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
 
+// 使用reactive创建响应式对象
 const data = reactive({
   form: {
-    coefficient: null
+    coefficient: null,
+    standard: 18 // 设置默认值为18
   },
   queryParams: {
     pageNum: 1,
@@ -183,8 +192,16 @@ const data = reactive({
     factory: null,
   },
   rules: {
-    datetime: [{ required: true, message: "年月不能为空", trigger: "blur" }],
-    factory: [{ required: true, message: "厂区不能为空", trigger: "blur" }],
+    datetime: [{ 
+      required: true, 
+      message: "年月不能为空", 
+      trigger: "blur" 
+    }],
+    factory: [{ 
+      required: true, 
+      message: "厂区不能为空", 
+      trigger: "blur" 
+    }],
     content: [
       { required: true, message: "干物质含量不能为空", trigger: "blur" },
       { pattern: /^\d+(\.\d+)?$/, message: "请输入有效数字", trigger: "blur" }
@@ -205,10 +222,20 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data)
 
-/** 计算干物质系数 */
+/** 格式化系数显示，保留两位小数 */
+function formatCoefficient(value) {
+  if (value === null || value === undefined) return '';
+  // 确保是数字类型，然后保留两位小数
+  const num = typeof value === 'string' ? parseFloat(value) : value;
+  return !isNaN(num) ? num.toFixed(2) : '';
+}
+
+/** 计算干物质系数 - 保留两位小数 */
 function calculateCoefficient() {
   if (form.value.content && form.value.standard && form.value.standard != 0) {
-    form.value.coefficient = parseFloat(form.value.content) / parseFloat(form.value.standard);
+    const content = parseFloat(form.value.content);
+    const standard = parseFloat(form.value.standard);
+    form.value.coefficient = Math.round((content / standard) * 100) / 100;
   } else {
     form.value.coefficient = null;
   }
@@ -237,12 +264,13 @@ function reset() {
     datetime: null,
     factory: null,
     content: null,
-    standard: null,
+    standard: 18, // 重置时也设置默认值为18
     coefficient: null
   }
   proxy.resetForm("dryMatterCorrectionRef")
 }
 
+
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1
@@ -294,7 +322,9 @@ function submitForm() {
     if (valid) {
       // 确保系数已计算
       if (form.value.content && form.value.standard && form.value.standard != 0) {
-        form.value.coefficient = form.value.content / form.value.standard;
+        const content = parseFloat(form.value.content);
+        const standard = parseFloat(form.value.standard);
+        form.value.coefficient = Math.round((content / standard) * 100) / 100;
       }
       
       if (form.value.id != null) {
@@ -302,12 +332,26 @@ function submitForm() {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
+        }).catch(error => {
+          // 捕获重复记录的错误
+          if (error.message && error.message.includes("已存在记录")) {
+            proxy.$modal.msgError(error.message);
+          } else {
+            proxy.$modal.msgError("修改失败：" + (error.message || "未知错误"));
+          }
         })
       } else {
         addDryMatterCorrection(form.value).then(response => {
           proxy.$modal.msgSuccess("新增成功")
           open.value = false
           getList()
+        }).catch(error => {
+          // 捕获重复记录的错误
+          if (error.message && error.message.includes("已存在记录")) {
+            proxy.$modal.msgError(error.message);
+          } else {
+            proxy.$modal.msgError("新增失败：" + (error.message || "未知错误"));
+          }
         })
       }
     }
diff --git a/src/views/dairyProducts/freshMilkTest/freshMilkTest/index.vue b/src/views/dairyProducts/freshMilkTest/freshMilkTest/index.vue
index 4db694e..073ab7d 100644
--- a/src/views/dairyProducts/freshMilkTest/freshMilkTest/index.vue
+++ b/src/views/dairyProducts/freshMilkTest/freshMilkTest/index.vue
@@ -291,6 +291,9 @@
 import { ref, reactive, onMounted } from 'vue';
 import { listFreshMilkTest, getFreshMilkTest, delFreshMilkTest, addFreshMilkTest, updateFreshMilkTest } from "@/api/dairyProducts/freshMilkTest/freshMilkTest.js";
 import { ElMessage, ElMessageBox } from 'element-plus';
+// 导入xlsx库和file-saver
+import * as XLSX from 'xlsx';
+import { saveAs } from 'file-saver';
 
 const freshMilkTestList = ref([]);
 const open = ref(false);
@@ -304,6 +307,27 @@ const title = ref("");
 const columnShowDialogVisible = ref(false);
 const freshMilkTestRef = ref(null);
 
+// 列配置映射
+const columnConfig = [
+  { prop: 'source', label: '来源' },
+  { prop: 'datetime', label: '检测日期' },
+  { prop: 'fat', label: '脂肪g/100g' },
+  { prop: 'protein', label: '蛋白质g/100g' },
+  { prop: 'nonFat', label: '非脂g/100g' },
+  { prop: 'acidity', label: '酸度oT' },
+  { prop: 'bacterialColony1', label: '菌落总数1' },
+  { prop: 'bacterialColony2', label: '菌落总数2' },
+  { prop: 'bacterialColony3', label: '菌落总数3' },
+  { prop: 'bacterialColony4', label: '菌落总数4' },
+  { prop: 'bacterialColony5', label: '菌落总数5' },
+  { prop: 'coli', label: '大肠菌群(CFU/ml)' },
+  { prop: 'lactoferrin', label: '乳铁蛋白(mg/L)' },
+  { prop: 'ig', label: '免疫球蛋白(mg/L)' },
+  { prop: 'commnet', label: '备注' },
+  { prop: 'createBy', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' }
+];
+
 // 默认显示的列
 const selectedColumns = ref([
   'source', 'datetime', 'fat', 'protein', 'nonFat', 'acidity', 
@@ -545,17 +569,42 @@ function handleDelete(row) {
   });
 }
 
-/** 导出按钮操作 */
+/** 导出按钮操作 - 前端实现 */
 function handleExport() {
-  const params = new URLSearchParams();
-  for (const key in queryParams) {
-    if (queryParams[key] !== null && queryParams[key] !== undefined) {
-      params.append(key, queryParams[key]);
-    }
-  }
+  // 获取当前显示的列配置
+  const visibleColumnsConfig = columnConfig.filter(
+    col => selectedColumns.value.includes(col.prop)
+  );
   
-  const url = `/freshMilkTest/freshMilkTest/export?${params.toString()}`;
-  window.location.href = url;
+  // 准备导出数据
+  const exportData = freshMilkTestList.value.map(item => {
+    const rowData = {};
+    visibleColumnsConfig.forEach(col => {
+      // 特殊处理日期字段
+      if (col.prop === 'datetime') {
+        rowData[col.label] = formatDate(item[col.prop]);
+      } else if (col.prop === 'createTime') {
+        rowData[col.label] = formatDateTime(item[col.prop]);
+      } else {
+        rowData[col.label] = item[col.prop];
+      }
+    });
+    return rowData;
+  });
+  
+  // 创建工作簿和工作表
+  const worksheet = XLSX.utils.json_to_sheet(exportData);
+  const workbook = XLSX.utils.book_new();
+  XLSX.utils.book_append_sheet(workbook, worksheet, '鲜奶检验记录');
+  
+  // 生成Excel文件并下载
+  const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
+  const blob = new Blob([excelBuffer], { 
+    type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' 
+  });
+  
+  // 使用file-saver保存文件
+  saveAs(blob, `鲜奶检验记录_${new Date().getTime()}.xlsx`);
 }
 
 // 初始化加载
diff --git a/src/views/dairyProducts/milkProdclasses/milkProdclasses/index.vue b/src/views/dairyProducts/milkProdclasses/milkProdclasses/index.vue
index ec8acd0..bd6527f 100644
--- a/src/views/dairyProducts/milkProdclasses/milkProdclasses/index.vue
+++ b/src/views/dairyProducts/milkProdclasses/milkProdclasses/index.vue
@@ -1,16 +1,24 @@
-<!-- index.vue (前端视图，修改 resetQuery 以匹配正确字段) -->
+<!-- index.vue (前端视图，仅保留单日查询功能) -->
 <template>
   <div class="app-container">
     <el-form ref="queryRef" :model="queryParams" inline label-width="80px">
-      <el-form-item label="日期范围">
-        <el-date-picker v-model="dateRange" type="daterange" range-separator="至"
-          start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" />
+      <!-- 单日查询 -->
+      <el-form-item label="查询日期">
+        <el-date-picker 
+          v-model="queryDate" 
+          type="date" 
+          placeholder="选择查询日期" 
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+          clearable />
       </el-form-item>
-      <!-- 管理耳号变成输入框 -->
+      
+      <!-- 管理耳号输入框 -->
       <el-form-item label="管理耳号">
         <el-input v-model="queryParams.manageEarNo" placeholder="请输入管理耳号" clearable />
       </el-form-item>
-       <!-- 厂区下拉框，数据源来自字典 da_ranch -->
+      
+      <!-- 厂区下拉框 -->
       <el-form-item label="厂区">
         <el-select v-model="queryParams.factory" clearable placeholder="请选择">
           <el-option
@@ -20,13 +28,15 @@
             :value="d.value" />
         </el-select>
       </el-form-item>
-      <!-- 班次只有 1、2 -->
+      
+      <!-- 班次下拉框 -->
       <el-form-item label="班次">
         <el-select v-model="queryParams.classes" clearable placeholder="请选择">
           <el-option :value="1" label="1" />
           <el-option :value="2" label="2" />
         </el-select>
       </el-form-item>
+      
       <el-form-item>
         <el-button type="primary" @click="getList">查询</el-button>
         <el-button @click="resetQuery">重置</el-button>
@@ -49,8 +59,16 @@
       <el-table-column prop="parity" label="胎次" />
       <el-table-column prop="factory" label="厂区" />
       <el-table-column prop="classes" label="班次" />
-      <el-table-column prop="milk" label="班次产奶量" />
-      <el-table-column prop="correctedMilk" label="班次校正奶量" />
+      <el-table-column prop="milk" label="班次产奶量" >
+        <template #default="{ row }">
+          {{ row.milk ? Number(row.milk).toFixed(2) : '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="correctedMilk" label="班次校正奶量" >
+        <template #default="{ row }">
+          {{ row.correctedMilk ? Number(row.correctedMilk).toFixed(2) : '-' }}
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination v-show="total>0" :total="total"
@@ -74,6 +92,7 @@ import { ref, reactive, onMounted } from 'vue'
 import { listMilkProdclasses, importMilkProdclasses, exportMilkProdclasses } from '@/api/dairyProducts/milkProdclasses/milkProdclasses'
 import { getToken } from '@/utils/auth'
 import { getRanchList } from '@/api/dairyProducts/ranch/ranch.js'
+import { ElMessage } from 'element-plus'
 import { Upload, Download, UploadFilled } from '@element-plus/icons-vue';
 
 const ranchOptions = ref([])
@@ -92,25 +111,36 @@ onMounted(() => {
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
-  manageEarNo: '',   // 管理耳号
-  factory: null,
-  classes: null
+  datetimeStart: null,  // 开始日期
+  datetimeEnd: null,    // 结束日期
+  manageEarNo: '',      // 管理耳号
+  factory: null,        // 厂区
+  classes: null         // 班次
 })
-const dateRange = ref([])
-const tableData = ref([])
-const total = ref(0)
-const loading = ref(false)
-const openImport = ref(false)
+const queryDate = ref(null)     // 查询日期
+const tableData = ref([])       // 表格数据
+const total = ref(0)            // 总数据条数
+const loading = ref(false)      // 加载状态
+const openImport = ref(false)   // 导入弹窗显示状态
 
 const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/milkProdclasses/milkProdclasses/import';
 const headers = { Authorization: 'Bearer ' + getToken() };
 
 function getList() {
   loading.value = true
-  const [start, end] = dateRange.value || []
+  
+  // 设置查询参数
+  if (queryDate.value) {
+    queryParams.datetimeStart = queryDate.value;
+    queryParams.datetimeEnd = queryDate.value;
+  } else {
+    queryParams.datetimeStart = null;
+    queryParams.datetimeEnd = null;
+  }
+  
   listMilkProdclasses({
-    datetimeStart: start,
-    datetimeEnd: end,
+    datetimeStart: queryParams.datetimeStart,
+    datetimeEnd: queryParams.datetimeEnd,
     manageEarNo: queryParams.manageEarNo,
     factory: queryParams.factory,
     classes: queryParams.classes,
@@ -127,8 +157,15 @@ function getList() {
 }
 
 function resetQuery() {
-  Object.assign(queryParams, { pageNum: 1, manageEarNo: '', factory: null, classes: null });
-  dateRange.value = [];
+  Object.assign(queryParams, { 
+    pageNum: 1, 
+    datetimeStart: null,
+    datetimeEnd: null,
+    manageEarNo: '', 
+    factory: null, 
+    classes: null 
+  });
+  queryDate.value = null;
   getList();
 }
 
@@ -140,22 +177,59 @@ function uploadSuccess(response) {
   console.log('上传成功:', response);
   openImport.value = false;
   getList();
+  ElMessage.success('导入成功');
 }
 
 function uploadError(err) {
   console.error('上传失败:', err);
+  ElMessage.error('导入失败');
 }
 
 function handleExport() {
-  const [start, end] = dateRange.value || [];
+  // 设置查询参数
+  if (queryDate.value) {
+    queryParams.datetimeStart = queryDate.value;
+    queryParams.datetimeEnd = queryDate.value;
+  } else {
+    queryParams.datetimeStart = null;
+    queryParams.datetimeEnd = null;
+  }
+  
   exportMilkProdclasses({
-    datetimeStart: start,
-    datetimeEnd: end,
-    manageEarNo: queryParams.manageEarNo,  // 与后台参数统一
+    datetimeStart: queryParams.datetimeStart,
+    datetimeEnd: queryParams.datetimeEnd,
+    manageEarNo: queryParams.manageEarNo,
     factory: queryParams.factory,
     classes: queryParams.classes
+  }).then(response => {
+    // 创建Blob对象，用于文件下载
+    const blob = new Blob([response], { 
+      type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' 
+    });
+    
+    // 创建下载链接
+    const downloadElement = document.createElement('a');
+    const href = window.URL.createObjectURL(blob);
+    downloadElement.href = href;
+    
+    // 设置下载文件名，包含当前日期
+    const now = new Date();
+    const dateStr = `${now.getFullYear()}${(now.getMonth()+1).toString().padStart(2, '0')}${now.getDate().toString().padStart(2, '0')}`;
+    downloadElement.download = `班次产奶数据_${dateStr}.xlsx`;
+    
+    document.body.appendChild(downloadElement);
+    // 触发点击下载
+    downloadElement.click();
+    // 释放URL对象
+    document.body.removeChild(downloadElement);
+    window.URL.revokeObjectURL(href);
+    
+    ElMessage.success('导出成功');
+  }).catch(error => {
+    console.error('导出失败:', error);
+    ElMessage.error('导出失败: ' + (error.message || '未知错误'));
   });
 }
 
 getList();
-</script>
+</script>
\ No newline at end of file
diff --git a/src/views/dairyProducts/parityCorrection/index.vue b/src/views/dairyProducts/parityCorrection/index.vue
index 201d3ea..a074422 100644
--- a/src/views/dairyProducts/parityCorrection/index.vue
+++ b/src/views/dairyProducts/parityCorrection/index.vue
@@ -1,41 +1,217 @@
 <template>
   <div class="app-container">
-    <el-table
-      v-loading="loading"
-      :data="parityCorrectionList"
-      style="width: 100%"
-      border
-      stripe
-    >
-      <el-table-column label="胎次" align="center" prop="parity" width="120" />
-      <el-table-column label="系数" align="center" prop="coef" width="120" />
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <!-- 搜索条件 只保留胎次 -->
+      <el-form-item label="胎次" prop="parity">
+        <el-input
+          v-model="queryParams.parity"
+          placeholder="请输入胎次"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['parityCorrection:parityCorrection:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['parityCorrection:parityCorrection:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['parityCorrection:parityCorrection:remove']"
+        >删除</el-button>
+      </el-col>
+      <!-- 去掉导出按钮 -->
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="parityCorrectionList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- 去掉 ${comment} -->
+      <el-table-column label="胎次" align="center" prop="parity" />
+      <el-table-column label="系数" align="center" prop="coef" />
+      <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="['parityCorrection:parityCorrection:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['parityCorrection:parityCorrection: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="parityCorrectionRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="胎次" prop="parity">
+          <el-input v-model="form.parity" placeholder="请输入胎次" />
+        </el-form-item>
+        <el-form-item label="系数" prop="coef">
+          <el-input v-model="form.coef" 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="ParityCorrection">
-import { listParityCorrection } from '@/api/dairyProducts/parityCorrection/parityCorrection.js'
-import { ref, onMounted } from 'vue'
+import { listParityCorrection, getParityCorrection, delParityCorrection, addParityCorrection, updateParityCorrection } from "@/api/dairyProducts/parityCorrection/parityCorrection"
+
+const { proxy } = getCurrentInstance()
 
-const loading = ref(false)
 const parityCorrectionList = 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,
+    parity: null  // ✅ 只保留胎次
+  },
+  rules: {}
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询胎次校正列表 */
 function getList() {
   loading.value = true
-  listParityCorrection().then(res => {
-    parityCorrectionList.value = res.rows || res.data || []   // 兼容两种返回风格
-  }).finally(() => {
+  listParityCorrection(queryParams.value).then(response => {
+    parityCorrectionList.value = response.rows
+    total.value = response.total
     loading.value = false
   })
 }
 
-onMounted(() => {
-  getList()
-})
-</script>
-
-<style scoped>
-.app-container {
-  padding: 20px;
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
 }
-</style>
\ No newline at end of file
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    parity: null,
+    coef: null
+  }
+  proxy.resetForm("parityCorrectionRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getParityCorrection(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改胎次校正"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["parityCorrectionRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateParityCorrection(form.value).then(() => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addParityCorrection(form.value).then(() => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除胎次校正编号为"' + _ids + '"的数据项？').then(function() {
+    return delParityCorrection(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+getList()
+</script>
diff --git a/src/views/dairyProducts/rawMilkTest/rawMilkTest/index.vue b/src/views/dairyProducts/rawMilkTest/rawMilkTest/index.vue
index cc368f9..f37b226 100644
--- a/src/views/dairyProducts/rawMilkTest/rawMilkTest/index.vue
+++ b/src/views/dairyProducts/rawMilkTest/rawMilkTest/index.vue
@@ -236,6 +236,10 @@
 </template>
 
 <script setup name="RawMilkTest">
+// 导入xlsx库
+import * as XLSX from 'xlsx';
+// 导入file-saver用于文件下载
+import { saveAs } from 'file-saver';
 import { listRawMilkTest, getRawMilkTest, delRawMilkTest, addRawMilkTest, updateRawMilkTest } from "@/api/dairyProducts/rawMilkTest/rawMilkTest.js"
 import { getCurrentInstance, ref, reactive, toRefs, onMounted } from 'vue'
 import { parseTime } from '@/utils/ruoyi'
@@ -496,9 +500,38 @@ function handleDelete(row) {
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download('rawMilkTest/rawMilkTest/export', {
-    ...queryParams.value
-  }, `rawMilkTest_${new Date().getTime()}.xlsx`)
+  // 获取当前显示的列配置
+  const visibleColumnsConfig = allColumns.value.filter(
+    col => visibleColumns.value[col.prop]
+  );
+  
+  // 准备导出数据
+  const exportData = rawMilkTestList.value.map(item => {
+    const rowData = {};
+    visibleColumnsConfig.forEach(col => {
+      // 特殊处理日期字段
+      if (col.prop === 'datetime' || col.prop === 'createTime') {
+        rowData[col.label] = parseTime(item[col.prop]);
+      } else {
+        rowData[col.label] = item[col.prop];
+      }
+    });
+    return rowData;
+  });
+  
+  // 创建工作簿和工作表
+  const worksheet = XLSX.utils.json_to_sheet(exportData);
+  const workbook = XLSX.utils.book_new();
+  XLSX.utils.book_append_sheet(workbook, worksheet, '生乳检验记录');
+  
+  // 生成Excel文件并下载
+  const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
+  const blob = new Blob([excelBuffer], { 
+    type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' 
+  });
+  
+  // 使用file-saver保存文件
+  saveAs(blob, `生乳检验记录_${new Date().getTime()}.xlsx`);
 }
 
 onMounted(() => {
diff --git a/src/views/dairyProducts/sheepMilkAnalysis/index.vue b/src/views/dairyProducts/sheepMilkAnalysis/index.vue
index 64bc19b..84997da 100644
--- a/src/views/dairyProducts/sheepMilkAnalysis/index.vue
+++ b/src/views/dairyProducts/sheepMilkAnalysis/index.vue
@@ -6,7 +6,7 @@
         <el-input v-model="queryParams.manageEarTag" placeholder="请输入耳号" />
       </el-form-item>
       <el-form-item label="筛选天数">
-        <el-input-number v-model="queryParams.screenDays" :min="0" placeholder="请输入天数" />
+        <el-input-number v-model="queryParams.screenDays" :min="1" placeholder="请输入天数" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleQuery">查询</el-button>
@@ -16,36 +16,27 @@
 
     <!-- 操作按钮行 -->
     <div class="button-group">
+      <el-popover placement="bottom" width="400" trigger="click">
+        <el-checkbox-group v-model="selectedFields" class="checkbox-columns">
+            <!-- 使用 :value 替代 :label -->
+            <el-checkbox v-for="col in allColumns" :key="col.prop" :value="col.prop">{{ col.label }}</el-checkbox>
+        </el-checkbox-group>
+        <template #reference>
+            <el-button type="info">展示列</el-button>
+        </template>
+      </el-popover>
       <el-button type="success" @click="handleExport">导出</el-button>
-
-      <el-popover
-        placement="bottom"
-        width="400"
-        trigger="click"
-        >
-            <el-checkbox-group v-model="selectedFields" class="checkbox-columns">
-                <el-checkbox
-                    v-for="col in allColumns"
-                    :key="col.prop"
-                    :label="col.prop"
-                >{{ col.label }}</el-checkbox>
-            </el-checkbox-group>
-
-            <template #reference>
-                <el-button type="info">展示列</el-button>
-            </template>
-        </el-popover>
-
     </div>
 
     <!-- 数据表格 -->
-    <el-table :data="list" border style="width: 100%" v-loading="loading" :row-key="row => row.id">
+    <el-table :data="list" border style="width: 100%" v-loading="loading" :row-key="row => row.sheepId">
       <el-table-column
         v-for="col in visibleColumns"
         :key="col.prop"
         :label="col.label"
         :prop="col.prop"
         :min-width="col.minWidth || 120"
+        :formatter="col.formatter || undefined"
       />
     </el-table>
 
@@ -64,7 +55,9 @@
 </template>
 
 <script>
-import { listSheepMilkAnalysis, exportSheepMilkAnalysis } from "@/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js";
+import { listSheepMilkAnalysis } from "@/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js";
+import { format } from 'date-fns';
+import * as XLSX from 'xlsx'; // 导入xlsx库
 
 export default {
   name: "SheepMilkAnalysis",
@@ -77,47 +70,47 @@ export default {
         pageNum: 1,
         pageSize: 10,
         manageEarTag: null,
-        screenDays: null
+        screenDays: 100 // 默认筛选天数
       },
       selectedFields: [],
       allColumns: [
         { label: "耳号", prop: "manageEarTag" },
         { label: "品种", prop: "variety" },
-        { label: "挤奶时间", prop: "milkingDate" },
-        { label: "干奶时间", prop: "dryDate" },
-        { label: "筛选天数", prop: "screeningDays" },
+        { label: "挤奶开始时间", prop: "milkingStartTime", formatter: row => row.milkingStartTime ? format(new Date(row.milkingStartTime),'yyyy-MM-dd') : '' },
+        { label: "干奶时间", prop: "dryEndTime", formatter: row => row.dryEndTime ? format(new Date(row.dryEndTime),'yyyy-MM-dd') : '' },
+        { label: "筛选天数", prop: "screenDays" },
         { label: "挤奶天数", prop: "milkingDays" },
-        { label: "校正后最大胎次", prop: "maxCorrectedParity" },
-        { label: "系统奶量之合计", prop: "systemMilkTotal" },
-        { label: "校正奶量之合计", prop: "correctedMilkTotal" },
-        { label: "校正日平均奶量", prop: "avgDailyCorrectedMilk" },
-        { label: "胎次1的总产奶量", prop: "parity1TotalMilk" },
-        { label: "胎次2的总产奶量", prop: "parity2TotalMilk" },
-        { label: "胎次3的总产奶量", prop: "parity3TotalMilk" },
-        { label: "胎次4的总产奶量", prop: "parity4TotalMilk" },
-        { label: "胎次1的日平均产量", prop: "parity1AvgDailyMilk" },
-        { label: "胎次2的日平均产量", prop: "parity2AvgDailyMilk" },
-        { label: "胎次3的日平均产量", prop: "parity3AvgDailyMilk" },
-        { label: "胎次4的日平均产量", prop: "parity4AvgDailyMilk" },
+        { label: "校正后最大胎次", prop: "maxParity" },
+        { label: "系统奶量之合计", prop: "sumSystemMilk" },
+        { label: "校正奶量之合计", prop: "sumCorrectedMilk" },
+        { label: "校正日平均奶量", prop: "avgCorrectedDaily" },
+        { label: "胎次1的总奶量", prop: "sumParity1Milk" },
+        { label: "胎次2的总奶量", prop: "sumParity2Milk" },
+        { label: "胎次3的总奶量", prop: "sumParity3Milk" },
+        { label: "胎次4的总奶量", prop: "sumParity4Milk" },
+        { label: "胎次1日平均", prop: "avgParity1Daily" },
+        { label: "胎次2日平均", prop: "avgParity2Daily" },
+        { label: "胎次3日平均", prop: "avgParity3Daily" },
+        { label: "胎次4日平均", prop: "avgParity4Daily" },
         { label: "泌乳天数", prop: "lactationDays" },
-        { label: "过去7日日平均奶量", prop: "past7DaysAvgMilk" },
-        { label: "校正过去7日日平均奶量", prop: "past7DaysAvgCorrectedMilk" },
-        { label: "过去14日日平均奶量", prop: "past14DaysAvgMilk" },
-        { label: "过去30日日平均奶量", prop: "past30DaysAvgMilk" },
-        { label: "羊只类型", prop: "sheepType" },
-        { label: "生日", prop: "birthDate" },
-        { label: "当前胎次", prop: "currentParity" },
-        { label: "月龄", prop: "ageMonths" },
+        { label: "过去7日均奶量", prop: "avgLast7Milk" },
+        { label: "校正过去7日均", prop: "avgLast7Corrected" },
+        { label: "过去14日均奶量", prop: "avgLast14Milk" },
+        { label: "过去30日均奶量", prop: "avgLast30Milk" },
+        { label: "羊只类别", prop: "sheepCategory" },
+        { label: "生日", prop: "birthday", formatter: row => row.birthday ? format(new Date(row.birthday),'yyyy-MM-dd') : '' },
+        { label: "当前胎次", prop: "parity" },
+        { label: "月龄", prop: "monthAge" },
         { label: "当前体重", prop: "currentWeight" },
         { label: "繁育状态", prop: "breedStatus" },
-        { label: "父号", prop: "fatherTag" },
-        { label: "母号", prop: "motherTag" },
-        { label: "牧场名称", prop: "ranchName" },
-        { label: "家系", prop: "familyLine" },
+        { label: "父号", prop: "fatherManageTags" },
+        { label: "母号", prop: "motherManageTags" },
+        { label: "牧场", prop: "ranchName" },
+        { label: "家系", prop: "family" },
         { label: "母亲挤奶天数", prop: "motherMilkingDays" },
-        { label: "母亲校正奶量之合计", prop: "motherCorrectedMilkTotal" },
-        { label: "母亲校正后最大胎次", prop: "motherMaxCorrectedParity" },
-        { label: "母亲校正日平均奶量", prop: "motherAvgDailyCorrectedMilk" }
+        { label: "母亲校正奶量之合计", prop: "motherSumCorrected" },
+        { label: "母亲校正后最大胎次", prop: "motherMaxParity" },
+        { label: "母亲校正日平均奶量", prop: "motherAvgCorrectedDaily" }
       ]
     };
   },
@@ -134,10 +127,11 @@ export default {
     getList() {
       this.loading = true;
       listSheepMilkAnalysis(this.queryParams).then(response => {
-        this.list = response.rows;
-        this.total = response.total;
+        const res = response && response.data ? response.data : response;
+        this.list = res.rows || res;
+        this.total = res.total || (Array.isArray(this.list) ? this.list.length : 0);
         this.loading = false;
-      });
+      }).catch(()=>{ this.loading = false; });
     },
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -148,7 +142,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         manageEarTag: null,
-        screenDays: null
+        screenDays: 100
       };
       this.selectedFields = this.allColumns.map(c => c.prop);
       this.getList();
@@ -161,17 +155,33 @@ export default {
       this.queryParams.pageSize = pageSize;
       this.getList();
     },
+    // 前端导出方法
     handleExport() {
-      exportSheepMilkAnalysis(this.queryParams).then(response => {
-        const blob = new Blob([response], { type: 'application/vnd.ms-excel' });
-        const url = window.URL.createObjectURL(blob);
-        const link = document.createElement('a');
-        link.href = url;
-        link.setAttribute('download', '羊奶分析数据.xlsx');
-        document.body.appendChild(link);
-        link.click();
-        document.body.removeChild(link);
+      // 准备导出数据
+      const exportData = this.list.map(item => {
+        const row = {};
+        this.visibleColumns.forEach(col => {
+          let value = item[col.prop];
+          // 处理日期格式化
+          if (col.formatter && typeof col.formatter === 'function') {
+            value = col.formatter(item);
+          } else if (value instanceof Date) {
+            value = format(new Date(value), 'yyyy-MM-dd');
+          }
+          row[col.label] = value;
+        });
+        return row;
       });
+      
+      // 创建工作簿和工作表
+      const worksheet = XLSX.utils.json_to_sheet(exportData);
+      const workbook = XLSX.utils.book_new();
+      XLSX.utils.book_append_sheet(workbook, worksheet, "羊奶产量分析");
+      
+      // 生成Excel文件并下载
+      XLSX.writeFile(workbook, "羊奶产量分析数据.xlsx");
+      
+      this.$message.success('导出成功');
     }
   }
 };
@@ -191,4 +201,4 @@ export default {
   max-height: 300px;
   overflow-y: auto;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/dairyProducts/weightCorrection/index.vue b/src/views/dairyProducts/weightCorrection/index.vue
index 94737ef..b46fba1 100644
--- a/src/views/dairyProducts/weightCorrection/index.vue
+++ b/src/views/dairyProducts/weightCorrection/index.vue
@@ -83,7 +83,7 @@
       <el-table-column label="系统奶量" align="center" prop="systemMilk" /> <!-- 修改这里 -->
       <el-table-column label="称重系数" align="center" prop="coefficient">
         <template #default="scope">
-          <span>{{ scope.row.coefficient.toFixed(4) }}</span>
+          <span>{{ scope.row.coefficient.toFixed(2) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -245,25 +245,31 @@ function handleUpdate(row) {
   })
 }
 
-/** 提交按钮 */
+/* 提交按钮 */
 function submitForm() {
   proxy.$refs["weightCorrectionRef"].validate(valid => {
     if (valid) {
       // 确保数值类型正确
       form.value.actual = parseFloat(form.value.actual)
-      form.value.systemMilk = parseFloat(form.value.systemMilk) // 修改这里
+      form.value.systemMilk = parseFloat(form.value.systemMilk)
       
       if (form.value.id != null) {
         updateWeightCorrection(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
+        }).catch(error => {
+          // 捕获后端返回的错误信息并显示
+          proxy.$modal.msgError(error.response.data.msg || "修改失败")
         })
       } else {
         addWeightCorrection(form.value).then(response => {
           proxy.$modal.msgSuccess("新增成功")
           open.value = false
           getList()
+        }).catch(error => {
+          // 捕获后端返回的错误信息并显示
+          proxy.$modal.msgError(error.response.data.msg || "新增失败")
         })
       }
     }
diff --git a/src/views/dairyProducts/yogurtTest/yogurtTest/index.vue b/src/views/dairyProducts/yogurtTest/yogurtTest/index.vue
index 39f3898..41137a7 100644
--- a/src/views/dairyProducts/yogurtTest/yogurtTest/index.vue
+++ b/src/views/dairyProducts/yogurtTest/yogurtTest/index.vue
@@ -287,6 +287,9 @@
 import { ref, reactive, onMounted } from 'vue';
 import { listYogurtTest, getYogurtTest, delYogurtTest, addYogurtTest, updateYogurtTest } from "@/api/dairyProducts/yogurtTest/yogurtTest.js";
 import { ElMessage, ElMessageBox } from 'element-plus';
+// 导入xlsx库和file-saver
+import * as XLSX from 'xlsx';
+import { saveAs } from 'file-saver';
 
 // 响应式数据
 const yogurtTestList = ref([]);
@@ -301,6 +304,27 @@ const title = ref("");
 const columnShowDialogVisible = ref(false);
 const yogurtTestRef = ref(null);
 
+// 列配置映射
+const columnConfig = [
+  { prop: 'source', label: '来源' },
+  { prop: 'datetime', label: '检测日期' },
+  { prop: 'fat', label: '脂肪g/100g' },
+  { prop: 'protein', label: '蛋白质g/100g' },
+  { prop: 'nonFat', label: '非脂g/100g' },
+  { prop: 'acidity', label: '酸度oT' },
+  { prop: 'bacterialColony1', label: '菌落总数1' },
+  { prop: 'bacterialClony2', label: '菌落总数2' },
+  { prop: 'bacterialClony3', label: '菌落总数3' },
+  { prop: 'bacterialClony4', label: '菌落总数4' },
+  { prop: 'bacterialClony5', label: '菌落总数5' },
+  { prop: 'yeast', label: '酵母菌(CFU/g)' },
+  { prop: 'mould', label: '霉菌(CFU/g)' },
+  { prop: 'lacto', label: '乳酸菌(CFU/g)' },
+  { prop: 'comment', label: '备注' },
+  { prop: 'createBy', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' }
+];
+
 // 默认显示的列
 const selectedColumns = ref([
   'source', 'datetime', 'fat', 'protein', 'nonFat', 'acidity', 
@@ -543,17 +567,42 @@ function handleDelete(row) {
   });
 }
 
-/** 导出按钮操作 */
+/** 导出按钮操作 - 前端实现 */
 function handleExport() {
-  const params = new URLSearchParams();
-  for (const key in queryParams) {
-    if (queryParams[key] !== null && queryParams[key] !== undefined) {
-      params.append(key, queryParams[key]);
-    }
-  }
+  // 获取当前显示的列配置
+  const visibleColumnsConfig = columnConfig.filter(
+    col => selectedColumns.value.includes(col.prop)
+  );
   
-  const url = `/yogurtTest/yogurtTest/export?${params.toString()}`;
-  window.location.href = url;
+  // 准备导出数据
+  const exportData = yogurtTestList.value.map(item => {
+    const rowData = {};
+    visibleColumnsConfig.forEach(col => {
+      // 特殊处理日期字段
+      if (col.prop === 'datetime') {
+        rowData[col.label] = formatDate(item[col.prop]);
+      } else if (col.prop === 'createTime') {
+        rowData[col.label] = formatDateTime(item[col.prop]);
+      } else {
+        rowData[col.label] = item[col.prop];
+      }
+    });
+    return rowData;
+  });
+  
+  // 创建工作簿和工作表
+  const worksheet = XLSX.utils.json_to_sheet(exportData);
+  const workbook = XLSX.utils.book_new();
+  XLSX.utils.book_append_sheet(workbook, worksheet, '酸奶检疫记录');
+  
+  // 生成Excel文件并下载
+  const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
+  const blob = new Blob([excelBuffer], { 
+    type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' 
+  });
+  
+  // 使用file-saver保存文件
+  saveAs(blob, `酸奶检疫记录_${new Date().getTime()}.xlsx`);
 }
 
 // 初始化加载
diff --git a/src/views/drymilk/drymilk/index.vue b/src/views/drymilk/drymilk/index.vue
index 004f40b..419b816 100644
--- a/src/views/drymilk/drymilk/index.vue
+++ b/src/views/drymilk/drymilk/index.vue
@@ -99,14 +99,15 @@
 
     <el-table v-loading="loading" :data="drymilkList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="耳号" align="center" prop="manageTags" />
-      <el-table-column label="品种" align="center" prop="variety" />
-      <el-table-column label="事件类型" align="center" prop="eventType" />
-      <el-table-column label="干奶日期" align="center" prop="datetime" width="180">
+      <!-- 日期作为第一列 -->
+      <el-table-column label="干奶日期" align="center" prop="datetime" width="180" fixed="left">
         <template #default="scope">
           <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="耳号" align="center" prop="manageTags" />
+      <el-table-column label="品种" align="center" prop="variety" />
+      <el-table-column label="事件类型" align="center" prop="eventType" />
       <el-table-column label="是否使用乳头封闭剂" align="center" prop="status">
         <template #default="scope">
           <span>{{ scope.row.status === 1 ? '是' : '否' }}</span>
diff --git a/src/views/feed/FeedList/index.vue b/src/views/feed/FeedList/index.vue
new file mode 100644
index 0000000..3c86ff0
--- /dev/null
+++ b/src/views/feed/FeedList/index.vue
@@ -0,0 +1,299 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="配方编号" prop="formulaId">
+        <el-input v-model="queryParams.formulaId" placeholder="请输入配方编号" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="饲草班人员" prop="zookeeper">
+        <el-input v-model="queryParams.zookeeper" placeholder="请输入饲草班人员" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="配料日期" prop="deployDate">
+        <el-date-picker clearable v-model="queryParams.deployDate" type="date" value-format="YYYY-MM-DD"
+          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="['feed:FeedList:add']">新增</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['feed:FeedList:edit']">修改</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['feed:FeedList:remove']">删除</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['feed:FeedList:export']">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="FeedListList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="序号" type="index" width="60" align="center" prop="id" /> -->
+      <el-table-column label="配方编号" align="center" prop="formulaId" />
+      <el-table-column label="配方批号" align="center" prop="formulaBatchId" />
+      <el-table-column label="饲草班人员" align="center" prop="zookeeper" />
+      <el-table-column label="计划日期" align="center" prop="rootPlan.planDate" width="180">
+        <template #default="scope">
+          <!-- <span>{{ parseTime(scope.row.rootPlan.planDate, '{y}-{m}-{d}') }}</span> -->
+          <span>{{ scope.row.rootPlan ? parseTime(scope.row.rootPlan.planDate, '{y}-{m}-{d}') : '' }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="配料日期" align="center" prop="deployDate" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.deployDate, '{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="View" @click="handleView(scope.row)">详情</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['feed:FeedList:edit']">修改</el-button>
+          <!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['feed:FeedList: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
+      v-if="openModel === 'add' || openModel === 'edit'">
+      <el-form ref="FeedListRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="饲草班人员" prop="zookeeper">
+          <el-input v-model="form.zookeeper" placeholder="请输入饲草班人员名称" />
+        </el-form-item>
+        <!-- <el-form-item label="配料日期" prop="deployDate">
+          <el-date-picker clearable v-model="form.deployDate" type="date" value-format="YYYY-MM-DD"
+            placeholder="请选择配料日期">
+          </el-date-picker>
+        </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="title" v-model="open" width="60%" append-to-body  v-if="openModel === 'view'">
+    <!-- 详情页：只读展示 -->
+    <div style="padding-bottom:20px ;">
+      <el-descriptions :column="2" border>
+        <el-descriptions-item label="配方编号">{{ showFeedList.formulaId }}</el-descriptions-item>
+        <el-descriptions-item label="配方批号">{{ showFeedList.formulaBatchId }}</el-descriptions-item>
+        <el-descriptions-item label="饲养阶段">{{ showFeedList.rootFormula.feedStage }}</el-descriptions-item>
+      </el-descriptions>
+
+      <el-divider content-position="left">配料列表</el-divider>
+
+      <el-table :data="showFeedList.rootFormula.sgFormulaList" stripe border style="width: 100%" max-height="300">
+        <el-table-column label="序号" type="index" width="60" align="center" />
+        <!-- <el-table-column label="原料编号" prop="materialId" align="center" /> -->
+        <el-table-column label="原料" align="center">
+          <el-table-column label="名称" prop="materialName" align="center" />
+          <el-table-column label="类型" align="center" prop="isGranular">
+            <template #default="scope">
+              <dict-tag :options="material_type" :value="scope.row.isGranular" />
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="配量" align="center" prop="ratio">
+          <el-table-column label="上午" align="center" prop="ratio">
+            <template #default="scope">
+              {{ (scope.row.ratio / 100 * showFeedList.rootPlan.planMorningSize).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="中午" align="center" prop="ratio">
+            <template #default="scope">
+              {{ (scope.row.ratio / 100 * showFeedList.rootPlan.planNoonSize).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="下午" align="center" prop="ratio">
+            <template #default="scope">
+              {{ (scope.row.ratio / 100 * showFeedList.rootPlan.planAfternoonSize).toFixed(2) }}
+            </template>
+          </el-table-column>
+        </el-table-column>
+
+        <el-table-column label="类型" prop="isSupplement" align="center">
+          <template #default="scope">
+            <dict-tag :options="materialType" :value="scope.row.isSupplement" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </el-dialog>
+</template>
+
+<script setup name="FeedList">
+  import { listFeedList, getFeedList, delFeedList, addFeedList, updateFeedList } from "@/api/feed/FeedList"
+
+  const { proxy } = getCurrentInstance()
+
+  const FeedListList = 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,
+      formulaId: null,
+      zookeeper: null,
+      deployDate: null
+    },
+    rules: {
+    }
+  })
+
+  const { queryParams, form, rules } = toRefs(data)
+
+  const showFeedList = ref({})
+  const openModel = ref("")
+  // 原料类型字典
+  const { material_type } = proxy.useDict('material_type')
+  // 原料类型
+  const materialType = [
+    { value: '1', label: '补饲原料' },
+    { value: '0', label: '原料' }
+  ]
+  function handleView(row) {
+    showFeedList.value = row
+    open.value = true
+    openModel.value = "view"
+    title.value = "配料清单详情"
+    console.log("查看配料清单", row)
+    console.log("HandView", showFeedList.value)
+  }
+
+  /** 查询配料清单列表 */
+  function getList() {
+    loading.value = true
+    listFeedList(queryParams.value).then(response => {
+      FeedListList.value = response.rows
+      total.value = response.total
+      loading.value = false
+    })
+  }
+
+  // 取消按钮
+  function cancel() {
+    open.value = false
+    reset()
+  }
+
+  // 表单重置
+  function reset() {
+    form.value = {
+      id: null,
+      formulaId: null,
+      formulaBatchId: null,
+      zookeeper: null,
+      deployDate: null
+    }
+    proxy.resetForm("FeedListRef")
+  }
+
+  /** 搜索按钮操作 */
+  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
+    console.log("HandleUpdate => 配料清单ID =>", _id)
+    getFeedList(_id).then(response => {
+      form.value = response.data
+      open.value = true
+      openModel.value = "edit"
+      title.value = "修改配料清单"
+    })
+  }
+
+  /** 提交按钮 */
+  function submitForm() {
+    proxy.$refs["FeedListRef"].validate(valid => {
+      if (valid) {
+        if (form.value.id != null) {
+          updateFeedList(form.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功")
+            open.value = false
+            getList()
+          })
+        } else {
+          addFeedList(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 delFeedList(_ids)
+    }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+    }).catch(() => { })
+  }
+
+  /** 导出按钮操作 */
+  function handleExport() {
+    proxy.download('feed/FeedList/export', {
+      ...queryParams.value
+    }, `FeedList_${new Date().getTime()}.xlsx`)
+  }
+
+  getList()
+</script>
diff --git a/src/views/feed/FeedPlan/index.vue b/src/views/feed/FeedPlan/index.vue
new file mode 100644
index 0000000..aee8781
--- /dev/null
+++ b/src/views/feed/FeedPlan/index.vue
@@ -0,0 +1,419 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="配方编码" prop="formulaId">
+        <el-input v-model="queryParams.formulaId" placeholder="请输入配方编码" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="羊舍" prop="sheepHouseId">
+        <el-input v-model="queryParams.sheepHouseId" placeholder="请输入羊舍" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['feed:FeedPlan:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['feed:FeedPlan:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['feed:FeedPlan:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['feed:FeedPlan:export']">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="FeedPlanList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="创建日期" align="center" prop="createDate" />
+      <el-table-column label="配方编码" align="center" prop="formulaId" />
+      <el-table-column label="批号" align="center" prop="batchId" />
+      <el-table-column label="羊舍" align="center" prop="sheepHouseId">
+        <template #default="scope">
+          {{ getSheepHouseName(scope.row.sheepHouseId) }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="羊只数量" align="center" prop="sheepCount" />
+      <el-table-column label="日均计划量" align="center" prop="planDailySize" />
+      <el-table-column label="上午" prop="materialId" align="center">
+        <el-table-column label="计划量" align="center" prop="planMorningSize">
+          <template #default="{ row }">
+            {{ row.planMorningSize ? row.planMorningSize.toFixed(2) : '0.00' }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="计划总量" align="center" prop="planMorningTotal" /> -->
+        <el-table-column label="实际量" align="center" prop="actualMorningSize" />
+      </el-table-column>
+      <el-table-column label="中午" prop="materialId" align="center">
+        <el-table-column label="计划量" align="center" prop="planNoonSize">
+          <template #default="{ row }">
+            {{ row.planNoonSize ? row.planNoonSize.toFixed(2) : '0.00' }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="计划总量" align="center" prop="planNoonTotal" /> -->
+        <el-table-column label="实际量" align="center" prop="actualNoonSize" />
+      </el-table-column>
+      <el-table-column label="下午" prop="materialId" align="center">
+        <el-table-column label="计划量" align="center" prop="planAfternoonSize">
+          <template #default="{ row }">
+            {{ row.planAfternoonSize ? row.planAfternoonSize.toFixed(2) : '0.00' }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="计划总量" align="center" prop="planAfternoonTotal" /> -->
+        <el-table-column label="实际量" align="center" prop="actualAfternoonSize" />
+      </el-table-column>
+      <el-table-column label="饲喂比例(%)" align="center" prop="ratioTotal">
+        <el-table-column label="上午" align="center" prop="ratioMorning" />
+        <el-table-column label="中午" align="center" prop="ratioNoon" />
+        <el-table-column label="下午" align="center" prop="ratioAfternoon" />
+      </el-table-column>
+
+      <el-table-column label="计划饲喂总量" align="center" prop="planFeedTotal" />
+      <el-table-column label="饲草班人员" align="center" prop="zookeeper" />
+      <el-table-column label="饲喂计划日期" align="center" prop="planDate" width="180">
+        <template #default="scope">
+          <!-- <span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span> -->
+            <span>{{ scope.row.planDate ? parseTime(scope.row.planDate, '{y}-{m}-{d}') : '' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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="['feed:FeedPlan:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['feed:FeedPlan: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="FeedPlanRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="配方编码" prop="formulaId">
+          <!-- <el-input v-model="form.formulaId" placeholder="请输入配方编码" /> -->
+          <el-select v-model="form.formulaId" filterable placeholder="请选择配方编码" style="width: 100%"
+            @change="handleFormulaIdChange(form, $event)">
+            <el-option v-for="item in formulaIdDict" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="批号" prop="batchId">
+          <!-- <el-input v-model="form.batchId" placeholder="请输入批号" /> -->
+          <el-select v-model="form.batchId" filterable placeholder="请选择配方批号" style="width: 100%">
+            <el-option v-for="item in formulaBatchDict" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="羊舍" prop="sheepHouseId">
+          <!-- <el-input v-model="form.sheepHouseId" placeholder="请输入羊舍" /> -->
+          <el-select v-model="form.sheepHouseId" filterable placeholder="请选择羊舍" style="width: 100%">
+            <el-option v-for="item in sheepFolderDict" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="日均计划量" prop="planDailySize">
+          <el-input v-model="form.planDailySize" placeholder="请输入日均计划量" />
+        </el-form-item>
+        <el-form-item label="比例 (%)">
+          <div style="display: flex; gap: 10px;">
+            <el-input v-model="form.ratioMorning" placeholder="早上比例" style="width: 100px;" />
+            <el-input v-model="form.ratioNoon" placeholder="中午比例" style="width: 100px;" />
+            <el-input v-model="form.ratioAfternoon" placeholder="下午比例" style="width: 100px;" />
+          </div>
+        </el-form-item>
+        <el-form-item label="饲草班人员" prop="Zookeeper">
+          <el-input v-model="form.zookeeper" placeholder="请输入饲草班人员" />
+        </el-form-item>
+        <el-form-item label="计划日期" prop="planDate">
+          <el-date-picker clearable v-model="form.planDate" type="date" value-format="YYYY-MM-DD"
+            placeholder="请选择计划饲喂时间">
+          </el-date-picker>
+        </el-form-item>
+        <div v-if="title === '修改饲喂计划'">
+          <el-divider content-position="left">配方详情</el-divider>
+          <el-form-item label="实际饲喂量">
+            <div style="display: flex; gap: 10px;">
+              <el-input v-model="form.actualMorningSize" placeholder="早上" style="width: 100px;" />
+              <el-input v-model="form.actualNoonSize" placeholder="中午" style="width: 100px;" />
+              <el-input v-model="form.actualAfternoonSize" placeholder="下午" style="width: 100px;" />
+            </div>
+          </el-form-item>
+        </div>
+      </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="FeedPlan">
+  import { listFeedPlan, getFeedPlan, delFeedPlan, addFeedPlan, updateFeedPlan } from "@/api/feed/FeedPlan"
+  import { listFormulaManagement } from "@/api/feed/FormulaManagement";
+  import { listSheepfold } from "@/api/produce/manage_sheep/trans_group.js";
+  import { get } from "@vueuse/core";
+  const { proxy } = getCurrentInstance()
+
+  const FeedPlanList = 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,
+      formulaId: null,
+      sheepHouseId: null,
+    },
+    rules: {
+      formulaId: [
+        { required: true, message: "配方编码不能为空", trigger: "blur" }
+      ],
+      batchId: [
+        { required: true, message: "批号不能为空", trigger: "blur" }
+      ],
+      sheepHouseId: [
+        { required: true, message: "羊舍不能为空", trigger: "blur" }
+      ],
+      planDailySize: [
+        { required: true, message: "日均计划量不能为空", trigger: "blur" }
+      ],
+    }
+  })
+
+  const { queryParams, form, rules } = toRefs(data)
+
+  const formulaIdDict = ref([]) // 配方编码字典
+  // 用于存储配方批号列表
+  const formulaBatchMap = ref([])
+  const formulaBatchDict = ref([]) // 配方批号字典(过滤后)
+  const sheepFolderDict = ref([]) // 羊舍字典
+  // 用于存储羊舍名称的字典
+  const sheepNameDict = ref({}) 
+
+  // 获取配方编码 & 配方批号 字典
+  function getFormulaDict() {
+    listFormulaManagement().then(response => {
+      formulaIdDict.value = response.rows.map(item => ({
+        label: item.formulaId,
+        value: item.formulaId
+      }))
+      // 清空配方批号字典
+      formulaBatchMap.value = []
+
+      // 遍历每个配方列表，提取子配方中的批号
+      response.rows.forEach(item => {
+        if (item.subFormulaList) {
+          item.subFormulaList.forEach(subItem => {
+            formulaBatchMap.value.push({
+              label: subItem.batchId,
+              value: subItem.batchId,
+              formulaId: item.formulaId // 关联配方ID
+            })
+          })
+        }
+      })
+    })
+  }
+
+  // 处理配方编码变化
+  function handleFormulaIdChange(row, value) {
+    // 清空配方批号字典
+    if (!value) {
+      formulaBatchDict.value = []
+    } else {
+      // 根据选择的formulaId筛选batchId
+      formulaBatchDict.value = formulaBatchMap.value;
+      formulaBatchDict.value = formulaBatchDict.value.filter(item => item.formulaId === value)
+    }
+
+    // 重新设置批号为第一个
+    if (formulaBatchDict.value.length > 0) {
+      row.batchId = formulaBatchDict.value[0].value;
+    }
+  }
+
+  function getSheepfoldDict() {
+    listSheepfold().then(response => {
+      sheepFolderDict.value = response.rows.map(item => ({
+        label: item.sheepfoldName,
+        value: item.id
+      }))
+      sheepNameDict.value = response.rows.map(item => ({
+        label: item.id,
+        value: item.sheepfoldName
+      }))
+    })
+  }
+
+  // 根据id获取羊舍名称
+  function getSheepHouseName(id) {
+    const dictItem = sheepFolderDict.value.find(item => item.value === id)
+    return dictItem ? dictItem.label : id
+  }
+
+  // 羊舍ID与名称转换函数：输入可以是 ID 或 羊舍名称
+function getSheepHouseId(inputValue, sheepNameDict) {
+  if (!inputValue) return '';
+
+  // 输入是纯数字，直接返回
+  if (/^\d+$/.test(inputValue)) {
+    return inputValue;
+  }
+
+  // 输入是名称，返回对应的 id
+  const match = sheepNameDict.find(item => item.value === inputValue);
+  return match ? match.label : '';
+}
+
+
+  /** 查询饲喂计划列表 */
+  function getList() {
+    loading.value = true
+    listFeedPlan(queryParams.value).then(response => {
+      FeedPlanList.value = response.rows
+      total.value = response.total
+      loading.value = false
+    })
+  }
+
+  // 取消按钮
+  function cancel() {
+    open.value = false
+    reset()
+  }
+
+  // 表单重置
+  function reset() {
+    form.value = {
+      createDate: null,
+      formulaId: null,
+      batchId: null,
+      sheepHouseId: null,
+      sheepCount: null,
+      planDailySize: null,
+      ratioMorning: null,
+      ratioNoon: null,
+      ratioAfternoon: null,
+      planMorningSize: null,
+      planMorningTotal: null,
+      actualMorningSize: null,
+      planNoonSize: null,
+      planNoonTotal: null,
+      actualNoonSize: null,
+      planAfternoonSize: null,
+      planAfternoonTotal: null,
+      actualAfternoonSize: null,
+      planFeedTotal: null,
+      zookeeper: null,
+      planDate: null,
+      remark: null
+    }
+    proxy.resetForm("FeedPlanRef")
+  }
+
+  /** 搜索按钮操作 */
+  function handleQuery() {
+    queryParams.value.pageNum = 1
+    // 如果羊舍ID是名称，则转换为ID
+    queryParams.value.sheepHouseId = getSheepHouseId(queryParams.value.sheepHouseId, sheepNameDict.value);
+    getList()
+  }
+
+  /** 重置按钮操作 */
+  function resetQuery() {
+    proxy.resetForm("queryRef")
+    handleQuery()
+  }
+
+  // 多选框选中数据
+  function handleSelectionChange(selection) {
+    ids.value = selection.map(item => item.createDate)
+    single.value = selection.length != 1
+    multiple.value = !selection.length
+  }
+
+  /** 新增按钮操作 */
+  function handleAdd() {
+    reset()
+    open.value = true
+    title.value = "添加饲喂计划"
+  }
+
+  /** 修改按钮操作 */
+  function handleUpdate(row) {
+    reset()
+    const _createDate = row.createDate || ids.value
+    getFeedPlan(_createDate).then(response => {
+      form.value = response.data
+      open.value = true
+      title.value = "修改饲喂计划"
+    })
+  }
+
+  /** 提交按钮 */
+  function submitForm() {
+    proxy.$refs["FeedPlanRef"].validate(valid => {
+      if (valid) {
+        if (form.value.createDate != null) {
+          updateFeedPlan(form.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功")
+            open.value = false
+            getList()
+          })
+        } else {
+          addFeedPlan(form.value).then(response => {
+            proxy.$modal.msgSuccess("新增成功")
+            open.value = false
+            getList()
+          })
+        }
+      }
+    })
+  }
+
+  /** 删除按钮操作 */
+  function handleDelete(row) {
+    const _createDates = row.createDate || ids.value
+    proxy.$modal.confirm('是否确认删除饲喂计划编号为"' + _createDates + '"的数据项？').then(function () {
+      return delFeedPlan(_createDates)
+    }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+    }).catch(() => { })
+  }
+
+  /** 导出按钮操作 */
+  function handleExport() {
+    proxy.download('feed/FeedPlan/export', {
+      ...queryParams.value
+    }, `FeedPlan_${new Date().getTime()}.xlsx`)
+  }
+
+  getList()
+  // 获取配方编码字典
+  getFormulaDict()
+  // 获取羊舍字典
+  getSheepfoldDict()
+</script>
diff --git a/src/views/feed/FeedStatistic/index.vue b/src/views/feed/FeedStatistic/index.vue
new file mode 100644
index 0000000..77c5252
--- /dev/null
+++ b/src/views/feed/FeedStatistic/index.vue
@@ -0,0 +1,636 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="配方编号" prop="formulaId">
+        <el-input v-model="queryParams.formulaId" placeholder="请输入配方编号" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="配方批号" prop="formulaBatchId">
+        <el-input v-model="queryParams.formulaBatchId" placeholder="请输入配方批号" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+          v-hasPermi="['feed:FeedStatistic:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['feed:FeedStatistic:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['feed:FeedStatistic:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['feed:FeedStatistic:export']">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="FeedStatisticList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="UID" align="center" prop="id" />
+      <el-table-column label="配方编号" align="center" prop="formulaId" />
+      <el-table-column label="配方批号" align="center" prop="formulaBatchId" />
+      <el-table-column label="羊只数量" align="center" prop="sheepFoldCount" />
+      <!-- <el-table-column label="青贮损耗比例" align="center" prop="silageLossRate" /> -->
+      <el-table-column label="总饲喂量" align="center" prop="feedTotalSize" />
+      <el-table-column label="日均饲喂量" align="center" prop="feedDailySize" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleMaterialView(scope.row)"
+            v-hasPermi="['feed:FeedStatistic:edit']">查看</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['feed:FeedStatistic: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="60%" append-to-body
+      v-if="openModel === 'viewMaterial' || openModel === 'add'">
+      <div>
+        <el-form ref="FeedStatisticRef" :model="showFeedStatistic" :rules="rules" label-width="100px">
+          <el-row :gutter="20">
+            <el-col :span="12" v-if="true">
+              <el-form-item label="UUID" prop="id">
+                <el-input v-model="showFeedStatistic.id" :disabled="true" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="true">
+              <el-form-item label="配方编码" prop="formulaId">
+                <!-- <el-input v-model="form.formulaId" placeholder="请输入配方编码" /> -->
+                <el-select v-model="showFeedStatistic.formulaId" filterable placeholder="请选择配方编码" style="width: 100%"
+                  @change="handleFormulaIdChange(showFeedStatistic, $event)" :disabled="isEdit">
+                  <el-option v-for="item in formulaIdDict" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="批号" prop="batchId">
+                <!-- <el-input v-model="form.batchId" placeholder="请输入批号" /> -->
+                <el-select v-model="showFeedStatistic.formulaBatchId" filterable placeholder="请选择配方批号"
+                  style="width: 100%" :disabled="isEdit"
+                  @change="handleFormulaBatchIdChange(showFeedStatistic, $event)">
+                  <el-option v-for="item in formulaBatchDict" :key="item.value" :label="item.label"
+                    :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="羊只数量" prop="feedStage">
+                <el-input v-model="showFeedStatistic.sheepFoldCount" placeholder="请输入饲养阶段" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="日期" prop="planDate">
+                <el-date-picker clearable v-model="showFeedStatistic.feedDate" type="date" value-format="YYYY-MM-DD"
+                  placeholder="请选择时间" @change="handleDeployDateChange(showFeedStatistic, $event)">
+                </el-date-picker>
+              </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="handleAddMaterial()" 
+              :disabled="
+              showFeedStatistic.feedDate == null 
+              || showFeedStatistic.formulaId === null 
+              || showFeedStatistic.formulaBatchId == null">添加</el-button>
+            </el-col>
+
+          </el-row>
+
+          <el-table :data="showFeedStatistic.materialList" :rules="rules" :row-class-name="rowSgFormulaListDetailIndex"
+            @selection-change="handleSgFormulaListDetailSelectionChange" ref="swPresDetail" border stripe>
+            <el-table-column label="序号" align="center" prop="index" width="60" />
+            <el-table-column label="原料" prop="materialId" align="center">
+              <el-table-column label="名称" align="center">
+                <template #default="scope">
+                  <el-select v-model="scope.row.materialId" filterable placeholder="请选择原料" style="width: 100%"
+                    @change="handleMaterialChange(scope.row, $event)">
+                    <el-option-group v-for="group in groupedMaterials" :key="group.label" :label="group.label">
+                      <el-option v-for="item in group.options" :key="item.value" :label="item.label"
+                        :value="item.value" />
+                    </el-option-group>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="类型" align="center" prop="isGranular">
+                <template #default="scope">
+                  <dict-tag :options="material_type" :value="scope.row.isGranular" />
+                </template>
+              </el-table-column>
+            </el-table-column>
+            <el-table-column label="总量" prop="feedSize" align="center">
+              <template #default="scope">
+                <el-input-number v-model="scope.row.feedSize" placeholder="请输入饲喂总量" :min="0" :precision="1"
+                  controls-position="right" />
+              </template>
+            </el-table-column>
+            <el-table-column label="类型" prop="isSupplement" align="center">
+              <template #default="scope">
+                <el-select v-model="scope.row.isSupplement" placeholder="请选择类型">
+                  <el-option v-for="item in materialType" :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="deleteFormulaListDetail(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <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="handleAddSheep()"               
+              :disabled ="
+              showFeedStatistic.feedDate == null 
+              || showFeedStatistic.formulaId == null 
+              || showFeedStatistic.formulaBatchId == null">添加</el-button>
+            </el-col>
+
+            <el-table :data="showFeedStatistic.sheepFoldList" :rules="rules"
+              :row-class-name="rowSgFormulaListDetailIndex" @selection-change="handleSgFormulaListDetailSelectionChange"
+              ref="swPresDetail" border stripe>
+              <el-table-column label="ID" prop="id" align="center" />
+              <!-- <el-input v-model="form.sheepHouseId" placeholder="请输入羊舍" /> -->
+              <el-table-column label="名称" align="center" prop="sheepfoldName">
+                <template #default="scope">
+                  <el-select v-model="scope.row.id" filterable placeholder="请选择羊舍" style="width: 100%">
+                    <el-option v-for="item in sheepFolderDict" :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="deleteSheepItem(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-row>
+        </el-form>
+      </div>
+      <!-- 底部按钮：仅修改页显示 -->
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitFormDetil">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="FeedStatistic">
+  import { listFeedStatistic, getFeedStatistic, delFeedStatistic, addFeedStatistic, updateFeedStatistic, initFeedStatistic } from "@/api/feed/FeedStatistic"
+  import { listFormulaManagement } from "@/api/feed/FormulaManagement"
+  import { listSheepfold } from "@/api/produce/manage_sheep/trans_group.js";
+  import { listMaterial } from "@/api/feed/Material"
+  import { ref } from "vue";
+
+  const { proxy } = getCurrentInstance()
+
+  const FeedStatisticList = 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,
+      formulaId: null,
+      formulaBatchId: null,
+      silageLossRate: null,
+    },
+    rules: {
+      formulaId: [
+        { required: true, message: "配方编号不能为空", trigger: "blur" }
+      ],
+      formulaBatchId: [
+        { required: true, message: "配方批号不能为空", trigger: "blur" }
+      ],
+    }
+  })
+
+  const { queryParams, form, rules } = toRefs(data)
+  // 打开类型
+  const openModel = ref('')
+  // 编辑状态
+  const isEdit = ref(true)
+
+  const showFeedStatistic = ref({})
+
+  // 用于存储羊舍名称的字典
+  const sheepNameDict = ref({})
+  const sheepFolderDict = ref([]) // 羊舍字典
+  const formulaIdDict = ref([]) // 配方编码字典
+  const formulaBatchMap = ref([]) // 配方批号映射（包含配方ID）
+  const formulaBatchDict = ref([]) // 配方批号字典(过滤后)
+
+  // 原料类型字典
+  const { material_type } = proxy.useDict('material_type')
+  // 原料类型
+  const materialType = [
+    { value: '1', label: '补饲原料' },
+    { value: '0', label: '原料' }
+  ]
+  // 原料下拉列表
+  const materials = ref([])
+  // 原料列表查询参数
+  const materialQueryParams = ref({
+    materialId: null,
+    materialName: null,
+    isGranular: null
+  })
+  function getMaterials() {
+    listMaterial(materialQueryParams).then(response => {
+      console.log("获取原料列表：", response)
+      materials.value = response.rows.map(item => ({
+        value: item.materialId,
+        label: item.materialName,
+        isGranular: item.isGranular,
+        isSupplement: "0" // 默认补饲原料为 0
+      }))
+      // console.log("原料列表：", materials.value)
+    })
+  }
+  /** ================== 分组下拉列表部分 ======================== */
+  const groupedMaterials = ref([])  // 存储分组后的原料数据
+
+  // 从后端获取数据并按isGranular分组
+  function getGroupMaterials() {
+    listMaterial(materialQueryParams).then(response => {
+      console.log("获取原料列表：", response)
+
+      // 根据material_type分组数据
+      const groups = material_type.value.map(type => ({
+        label: type.label,
+        options: []
+      }))
+
+      // 遍历原料数据，根据isGranular字段分组
+      response.rows.forEach(item => {
+        const group = groups.find(group => group.label === material_type.value.find(type => type.value === item.isGranular).label)
+        group.options.push({
+          value: item.materialId,
+          label: item.materialName
+        })
+      })
+
+      // 将分组后的数据赋值给groupedMaterials
+      groupedMaterials.value = groups
+      console.log("分组后的原料列表：", groupedMaterials.value)
+    })
+  }
+
+
+  // 根据id获取羊舍名称
+  function getSheepHouseName(id) {
+    const dictItem = sheepFolderDict.value.find(item => item.value === id)
+    return dictItem ? dictItem.label : id
+  }
+
+  // 羊舍ID与名称转换函数：输入可以是 ID 或 羊舍名称
+  function getSheepHouseId(inputValue, sheepNameDict) {
+    if (!inputValue) return '';
+
+    // 输入是纯数字，直接返回
+    if (/^\d+$/.test(inputValue)) {
+      return inputValue;
+    }
+
+    // 输入是名称，返回对应的 id
+    const match = sheepNameDict.find(item => item.value === inputValue);
+    return match ? match.label : '';
+  }
+  /** ================== 配方字典 & 批号字典 ======================== */
+  // 获取配方编码 & 配方批号 字典
+  function getFormulaDict() {
+    listFormulaManagement().then(response => {
+      formulaIdDict.value = response.rows.map(item => ({
+        label: item.formulaId,
+        value: item.formulaId
+      }))
+      // 清空配方批号字典
+      formulaBatchMap.value = []
+
+      // 遍历每个配方列表，提取子配方中的批号
+      response.rows.forEach(item => {
+        if (item.subFormulaList) {
+          item.subFormulaList.forEach(subItem => {
+            formulaBatchMap.value.push({
+              label: subItem.batchId,
+              value: subItem.batchId,
+              formulaId: item.formulaId // 关联配方ID
+            })
+          })
+        }
+      })
+    })
+  }
+
+  // 处理配方编码变化
+  function handleFormulaIdChange(row, value) {
+    // 清空配方批号字典
+    if (!value) {
+      formulaBatchDict.value = []
+    } else {
+      // 根据选择的formulaId筛选batchId
+      formulaBatchDict.value = formulaBatchMap.value;
+      formulaBatchDict.value = formulaBatchDict.value.filter(item => item.formulaId === value)
+    }
+
+    // 重新设置批号为第一个
+    if (formulaBatchDict.value.length > 0) {
+      row.formulaBatchId = formulaBatchDict.value[0].value;
+    }
+    handleFormulaBatchIdChange(row, value);
+  }
+
+  // 处理配方批号变化 & 当确定批号时加载初始数据
+  function handleFormulaBatchIdChange(row, $event) {
+    if (row.formulaId && row.formulaBatchId && row.feedDate) {
+      queryParams.value.formulaId = row.formulaId
+      queryParams.value.formulaBatchId = row.formulaBatchId
+      queryParams.value.feedDate = row.feedDate
+      queryParams.value.id = null // 清空 ID，防止影响查询
+      // console.log("加载初始数据，查询参数：", queryParams.value)
+      initFeedStatistic(queryParams.value).then(response => {
+        Object.assign(showFeedStatistic.value, response.rows[0] || {})
+        total.value = response.total
+        loading.value = false
+      })
+    }
+  }
+
+  function handleDeployDateChange(showFeedStatistic, event) {
+    // 日期改变时回调
+    if (showFeedStatistic.feedDate) {
+      handleFormulaBatchIdChange(showFeedStatistic, event);
+    }
+  }
+  // 查看详情
+  function handleMaterialView(row) {
+    showFeedStatistic.value = row
+    // 反序列化
+    // showFeedStatistic.value.materialList = JSON.parse(showFeedStatistic.value.materialList || "[]");
+    // showFeedStatistic.value.sheepFoldList = JSON.parse(showFeedStatistic.value.sheepFoldList || "[]");
+    queryParams.value.id = row.id
+    listFeedStatistic(queryParams.value).then(response => {
+      FeedStatisticList.value = response.rows
+      total.value = response.total
+      loading.value = false
+    })
+    open.value = true
+    title.value = "饲喂量统计详情"
+    isEdit.value = true
+    openModel.value = 'viewMaterial'
+  }
+
+  function getSheepfoldDict() {
+    listSheepfold().then(response => {
+      sheepFolderDict.value = response.rows.map(item => ({
+        label: item.sheepfoldName,
+        value: item.id
+      }))
+      sheepNameDict.value = response.rows.map(item => ({
+        label: item.id,
+        value: item.sheepfoldName
+      }))
+    })
+  }
+
+  // 添加原料列表项
+  function handleAddMaterial() {
+    showFeedStatistic.value.materialList.push({
+      materialId: null,
+      materialName: null,
+      ratio: null,
+      isGranular: "0",
+      isSupplement: "0"
+    })
+  }
+
+  // 删除原料列表项
+  function deleteFormulaListDetail(row) {
+    const index = showFeedStatistic.value.materialList.findIndex(item => item.materialId === row.materialId)
+    if (index !== -1) {
+      showFeedStatistic.value.materialList.splice(index, 1)
+    }
+  }
+
+  // 添加羊舍列表项
+  function handleAddSheep() {
+    showFeedStatistic.value.sheepFoldList.push({
+      id: null,
+      sheepfoldName: null
+    })
+  }
+
+  // 删除羊舍列表项
+  function deleteSheepItem(row) {
+    const index = showFeedStatistic.value.sheepFoldList.findIndex(item => item.id === row.id)
+    if (index !== -1) {
+      showFeedStatistic.value.sheepFoldList.splice(index, 1)
+    }
+  }
+
+
+  // 原料下拉选择变化时，更新对应的原料名称
+  function handleMaterialChange(row, selectedValue) {
+    const selectedItem = this.materials.find(item => item.value === selectedValue);
+    if (selectedItem) {
+      // materialName 也在 row 中
+      row.materialName = selectedItem.label;
+      row.isGranular = selectedItem.isGranular; // 更新 isGranular
+      row.isSupplement = selectedItem.isSupplement; // 更新 isSupplement
+    }
+  }
+  /** 查询饲喂量统计列表 */
+  function getList() {
+    loading.value = true
+    listFeedStatistic(queryParams.value).then(response => {
+      FeedStatisticList.value = response.rows
+      total.value = response.total
+      loading.value = false
+    })
+  }
+
+  // 取消按钮
+  function cancel() {
+    open.value = false
+    reset()
+  }
+
+  // 表单重置
+  function reset() {
+    isEdit.value = true
+    showFeedStatistic.value = {
+      id: null,
+      formulaId: null,
+      formulaBatchId: null,
+      sheepFoldCount: null,
+      silageLossRate: null,
+      feedTotalSize: null,
+      feedDailySize: null,
+      materialList: null,
+      sheepFoldList: null
+    }
+    queryParams.value = {
+      pageNum: 1,
+      pageSize: 10,
+      formulaId: null,
+      formulaBatchId: null,
+      silageLossRate: null,
+    }
+    proxy.resetForm("FeedStatisticRef")
+  }
+
+  /** 搜索按钮操作 */
+  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
+    openModel.value = 'add'
+    isEdit.value = false
+    title.value = "添加饲喂量统计"
+  }
+
+  /** 修改按钮操作 */
+  function handleUpdate(row) {
+    reset()
+    const _id = row.id || ids.value
+    getFeedStatistic(_id).then(response => {
+      form.value = response.data
+      open.value = true
+      title.value = "修改饲喂量统计"
+    })
+  }
+
+  /** 提交按钮 */
+  function submitForm() {
+    proxy.$refs["FeedStatisticRef"].validate(valid => {
+      if (valid) {
+        if (form.value.id != null) {
+          updateFeedStatistic(form.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功")
+            open.value = false
+            getList()
+          })
+        } else {
+          addFeedStatistic(form.value).then(response => {
+            proxy.$modal.msgSuccess("新增成功")
+            open.value = false
+            getList()
+          })
+        }
+      }
+    })
+  }
+
+  function submitFormDetil() {
+    proxy.$refs["FeedStatisticRef"].validate(valid => {
+      if (valid) {
+        if (showFeedStatistic.value.id != null) {
+          updateFeedStatistic(showFeedStatistic.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功")
+            open.value = false
+            reset()
+            getList()
+          })
+        } else {
+          addFeedStatistic(showFeedStatistic.value).then(response => {
+            proxy.$modal.msgSuccess("新增成功")
+            open.value = false
+            reset()
+            getList()
+          })
+        }
+      }
+    })
+  }
+  /** 删除按钮操作 */
+  function handleDelete(row) {
+    const _ids = row.id || ids.value
+    proxy.$modal.confirm('是否确认删除饲喂量统计编号为"' + _ids + '"的数据项？').then(function () {
+      return delFeedStatistic(_ids)
+    }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+    }).catch(() => { })
+  }
+
+  /** 导出按钮操作 */
+  function handleExport() {
+    proxy.download('feed/FeedStatistic/export', {
+      ...queryParams.value
+    }, `FeedStatistic_${new Date().getTime()}.xlsx`)
+  }
+
+  /**
+   * 子表行序号计算
+   * 通过 el-table 的 row-class-name 钩子给每一行写入 index（从 1 开始）
+   */
+  function rowSgFormulaListDetailIndex({ row, rowIndex }) {
+    row.index = rowIndex + 1
+  }
+
+  /**
+ * 子表多选回调
+ * 记录被选中的行序号数组
+ */
+  function handleSgFormulaListDetailSelectionChange(selection) {
+    checkedSwPresDetail.value = selection.map(item => item.index)
+  }
+
+  getList()
+  getSheepfoldDict()
+  // 加载原料列表
+  getMaterials()
+  // 加载分组原料列表
+  getGroupMaterials()
+  // 获取羊舍字典
+  getSheepfoldDict()
+  // 获取配方字典
+  getFormulaDict()
+</script>
diff --git a/src/views/feed/FormulaList/index.vue b/src/views/feed/FormulaList/index.vue
new file mode 100644
index 0000000..aff1df4
--- /dev/null
+++ b/src/views/feed/FormulaList/index.vue
@@ -0,0 +1,229 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="原料编号" prop="materialId">
+        <el-input v-model="queryParams.materialId" placeholder="请输入原料编号" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="原料名称" prop="materialName">
+        <el-input v-model="queryParams.materialName" placeholder="请输入原料名称" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="比例" prop="ratio">
+        <el-input v-model="queryParams.ratio" placeholder="请输入比例" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+          v-hasPermi="['feed:FormulaList:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['feed:FormulaList:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['feed:FormulaList:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['feed:FormulaList:export']">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="FormulaListList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="code" />
+      <el-table-column label="配方编号" align="center" prop="formulaId" />
+      <el-table-column label="原料编号" align="center" prop="materialId" />
+      <el-table-column label="原料名称" align="center" prop="materialName" />
+      <el-table-column label="比例" align="center" prop="ratio" />
+      <el-table-column label="颗粒原料" align="center" prop="isGranular" />
+      <el-table-column label="补饲" align="center" prop="isSupplement" />
+      <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="['feed:FormulaList:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['feed:FormulaList: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="FormulaListRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="原料编号" prop="materialId">
+          <el-input v-model="form.materialId" placeholder="请输入原料编号" />
+        </el-form-item>
+        <el-form-item label="原料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入原料名称" />
+        </el-form-item>
+        <el-form-item label="比例" prop="ratio">
+          <el-input v-model="form.ratio" 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="FormulaList">
+import { listFormulaList, getFormulaList, delFormulaList, addFormulaList, updateFormulaList } from "@/api/feed/FormulaList"
+import { reactive } from "vue"
+
+const { proxy } = getCurrentInstance()
+
+const FormulaListList = 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,
+    batchId: "0",
+    materialId: null,
+    materialName: null,
+    ratio: null,
+    isGranular: null,
+    isSupplement: null
+  },
+  rules: {
+    ratio: [
+      { required: true, message: "比例不能为空", trigger: "blur" }
+    ],
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+
+/** 查询配方列表列表 */
+function getList() {
+  loading.value = true
+  listFormulaList(queryParams.value).then(response => {
+    FormulaListList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    code: null,
+    formulaId: null,
+    materialId: null,
+    materialName: null,
+    ratio: null,
+    isGranular: null,
+    isSupplement: null
+  }
+  proxy.resetForm("FormulaListRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.code)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加配方列表"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _code = row.code || ids.value
+  getFormulaList(_code).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改配方列表"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["FormulaListRef"].validate(valid => {
+    if (valid) {
+      if (form.value.code != null) {
+        updateFormulaList(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addFormulaList(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _codes = row.code || ids.value
+  proxy.$modal.confirm('是否确认删除配方列表编号为"' + _codes + '"的数据项？').then(function () {
+    return delFormulaList(_codes)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => { })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('feed/FormulaList/export', {
+    ...queryParams.value
+  }, `FormulaList_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>
diff --git a/src/views/feed/FormulaManagement/index.vue b/src/views/feed/FormulaManagement/index.vue
new file mode 100644
index 0000000..a55708a
--- /dev/null
+++ b/src/views/feed/FormulaManagement/index.vue
@@ -0,0 +1,770 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="饲养阶段" prop="feedStage">
+        <el-input v-model="queryParams.feedStage" placeholder="请输入饲养阶段" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <!-- <el-form-item label="批号" prop="batchId">
+        <el-input v-model="queryParams.batchId" placeholder="请输入批号" clearable @keyup.enter="handleQuery" />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAddFormulatemplate"
+          v-hasPermi="['feed:FormulaManagement:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['feed:FormulaManagement:edit']" v-show="false">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['feed:FormulaManagement:remove']" v-show="false">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['feed:FormulaManagement:export']">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="FormulaManagementList">
+      <!-- 表中表展示子配方 -->
+      <el-table-column type="expand" @expand-change="handleExpandChange">
+        <template #default="props">
+          <el-table :data="props.row.subFormulaList" style="width: 100%">
+            <el-table-column label="批号" align="center" prop="batchId" />
+            <el-table-column label="饲养阶段" align="center" prop="feedStage" />
+            <el-table-column label="开始使用时间" align="center" prop="useStartDate" width="180">
+              <template #default="scope">
+                <span>{{ parseTime(scope.row.useStartDate, '{y}-{m}-{d}') }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结束使用时间" align="center" prop="useEndDate" width="180">
+              <template #default="scope">
+                <span>{{ parseTime(scope.row.useEndDate, '{y}-{m}-{d}') }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="使用状态" align="center" prop="useState">
+              <template #default="scope">
+                <dict-tag :options="pres_status" :value="scope.row.useState" />
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" prop="remark" />
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+              <template #default="scope">
+                <el-button link type="primary" icon="View" @click="handleView(scope.row)">详情</el-button>
+                <el-button link type="primary" icon="Edit" @click="handleFormulaDetailUpdate(scope.row)"
+                  v-hasPermi="['feed:FormulaManagement:edit']">修改</el-button>
+                <el-button link type="primary" icon="Delete" @click="handleFormulaDelete(scope.row)"
+                  v-hasPermi="['feed:FormulaManagement:remove']">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="配方编号" align="center" prop="formulaId" />
+      <el-table-column label="饲养阶段" align="center" prop="feedStage" />
+      <el-table-column label="使用状态" align="center" prop="useState">
+        <template #default="scope">
+          <dict-tag :options="pres_status" :value="scope.row.useState" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Plus" @click="handleAddSgFormulaList(scope.row)"
+            v-hasPermi="['feed:FormulaManagement:add']">新增</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleFormulaTemplateUpdate(scope.row)"
+            v-hasPermi="['feed:FormulaManagement:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleFormulaDelete(scope.row)"
+            v-hasPermi="['feed:FormulaManagement: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="FormulaManagementRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="饲养阶段" prop="feedStage">
+          <el-input v-model="form.feedStage" placeholder="请输入饲养阶段" />
+        </el-form-item>
+        <el-form-item label="开始使用时间" prop="useStartDate">
+          <el-date-picker clearable v-model="form.useStartDate" type="date" value-format="YYYY-MM-DD"
+            placeholder="请选择开始使用时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束使用时间" prop="useEndDate">
+          <el-date-picker clearable v-model="form.useEndDate" type="date" value-format="YYYY-MM-DD"
+            placeholder="请选择结束使用时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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>
+
+    <!-- 弹框：详情/修改 -->
+    <el-dialog :title="title" v-model="formulaListOpen" width="60%" append-to-body s>
+      <!-- 详情页：只读展示 -->
+      <div v-if="isView" style="padding-bottom:20px ;">
+        <el-descriptions :column="2" border>
+          <el-descriptions-item label="配方批号">{{ showFormulaManagementList.batchId }}</el-descriptions-item>
+          <el-descriptions-item label="饲养阶段">{{ showFormulaManagementList.feedStage }}</el-descriptions-item>
+          <el-descriptions-item label="开始使用时间">
+            <span>{{ parseTime(showFormulaManagementList.useStartDate, '{y}-{m}-{d}') }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="结束使用时间">
+            <span>{{ parseTime(showFormulaManagementList.useEndDate, '{y}-{m}-{d}') }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="使用状态">
+            <dict-tag :options="pres_status" :value="showFormulaManagementList.useState" />
+          </el-descriptions-item>
+          <el-descriptions-item label="备注" :span="2">
+            {{ showFormulaManagementList.remark || '无' }}
+          </el-descriptions-item>
+        </el-descriptions>
+
+        <el-divider content-position="left">配方列表</el-divider>
+
+        <el-table :data="showFormulaManagementList.sgFormulaList" stripe border style="width: 100%" max-height="300">
+          <el-table-column label="序号" type="index" width="60" align="center" />
+          <el-table-column label="原料编号" prop="materialId" align="center" />
+          <el-table-column label="原料" align="center">
+            <el-table-column label="名称" prop="materialName" align="center"/>
+            <el-table-column label="类型" align="center" prop="isGranular">
+              <template #default="scope">
+                <dict-tag :options="material_type" :value="scope.row.isGranular" />
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="比例" align="center" prop="ratio" />
+          <el-table-column label="类型" prop="isSupplement" align="center">
+            <template #default="scope">
+              <dict-tag :options="materialType" :value="scope.row.isSupplement" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <!-- 修改页：可编辑表单 -->
+      <div v-else>
+        <el-form ref="FormulaManagementRef" :model="showFormulaManagementList" :rules="rules" label-width="100px">
+          <el-row :gutter="20">
+            <el-col :span="12" v-if="!isView">
+              <el-form-item label="配方编号" prop="formulaId">
+                <el-input v-model="showFormulaManagementList.formulaId" placeholder="请输入配方编号"
+                  :disabled="!FormulaIdEditable" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="批号" prop="batchId">
+                <el-input v-model="showFormulaManagementList.batchId" placeholder="请输入配方批号"
+                  :disabled="!BatchIdEditable" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="饲养阶段" prop="feedStage">
+                <el-input v-model="showFormulaManagementList.feedStage" placeholder="请输入饲养阶段" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开始使用时间" prop="useStartDate">
+                <el-date-picker clearable v-model="showFormulaManagementList.useStartDate" type="date"
+                  value-format="YYYY-MM-DD" placeholder="请选择开始使用时间">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="结束使用时间" prop="useEndDate">
+                <el-date-picker clearable v-model="showFormulaManagementList.useEndDate" type="date"
+                  value-format="YYYY-MM-DD" placeholder="请选择结束使用时间">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="使用状态" prop="useState">
+                <el-select v-model="showFormulaManagementList.useState" placeholder="请选择使用状态">
+                  <el-option v-for="item in useStaus" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remark">
+                <el-input type="textarea" :rows="2" v-model="showFormulaManagementList.remark" 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="handleAddSgFormulaListDetail()">添加</el-button>
+            </el-col>
+
+          </el-row>
+
+          <el-table :data="showFormulaManagementList.sgFormulaList" :rules="rules"
+            :row-class-name="rowSgFormulaListDetailIndex" @selection-change="handleSgFormulaListDetailSelectionChange"
+            ref="swPresDetail" border stripe>
+            <el-table-column label="序号" align="center" prop="index" width="60" />
+            <el-table-column label="原料" prop="materialId" align="center">
+              <el-table-column label="名称" align="center">
+                <template #default="scope">
+                  <el-select v-model="scope.row.materialId" filterable placeholder="请选择原料" style="width: 100%"
+                    @change="handleMaterialChange(scope.row, $event)">
+                    <el-option-group v-for="group in groupedMaterials" :key="group.label" :label="group.label">
+                      <el-option v-for="item in group.options" :key="item.value" :label="item.label"
+                        :value="item.value" />
+                    </el-option-group>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="类型" align="center" prop="isGranular">
+                <template #default="scope">
+                  <dict-tag :options="material_type" :value="scope.row.isGranular" />
+                </template>
+              </el-table-column>
+            </el-table-column>
+            <el-table-column label="比例" prop="dosage" align="center">
+              <template #default="scope">
+                <el-input-number v-model="scope.row.ratio" placeholder="请输入比例" :min="0" :precision="1"
+                  controls-position="right" />
+              </template>
+            </el-table-column>
+            <el-table-column label="类型" prop="isSupplement" align="center">
+              <template #default="scope">
+                <el-select v-model="scope.row.isSupplement" placeholder="请选择类型">
+                  <el-option v-for="item in materialType" :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="deleteFormulaListDetail(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="submitFormulaListForm">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { listFormulaManagement, getFormulaManagement, delFormulaManagement, addFormulaManagement, updateFormulaManagement } from "@/api/feed/FormulaManagement"
+import { ref, reactive, toRefs, getCurrentInstance } from 'vue'
+import { listFormulaList, getFormulaList, delFormulaList, addFormulaList, updateFormulaList } from "@/api/feed/FormulaList"
+import { listMaterial } from "@/api/feed/Material"
+import { fa } from "element-plus/es/locales.mjs"
+const { proxy } = getCurrentInstance()
+const { pres_status } = proxy.useDict('pres_status')
+// Data and refs
+const FormulaManagementList = ref([])
+const showFormulaManagementList = ref([])
+const FormulaDetailList = 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 expandedRows = ref([])  // Track expanded rows
+const isView = ref(false)
+
+/**
+ * add : 添加配方
+ * update : 修改配方
+ */
+const operationType = ref("") // 操作类型：add 或 update
+// 控制批号是否可编辑
+const BatchIdEditable = ref(false)
+const FormulaIdEditable = ref(false)
+// 原料下拉列表
+const materials = ref([])
+// 原料类型
+const materialType = [
+  { value: '1', label: '补饲原料' },
+  { value: '0', label: '原料' }
+]
+// 原料类型字典
+const { material_type } = proxy.useDict('material_type')
+console.log("material_type: ", material_type);
+const useStaus = [
+  { value: '1', label: '启用' },
+  { value: '0', label: '停用' }
+]
+const checkedSwPresDetail = ref([])       // 子表选中的行序号数组
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    feedStage: null,
+    batchId: null,
+  },
+  rules: {
+    formulaId: [
+      { required: true, message: "配方编号不能为空", trigger: "blur" }
+    ],
+    feedStage: [
+      { required: true, message: "饲养阶段不能为空", trigger: "blur" }
+    ],
+    ratio: [
+      { required: true, message: "比例不能为空", trigger: "blur" },
+    ]
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+
+const formulaForm = ref({
+  materialId: '',
+  materialName: '',
+  ratio: '',
+  isGranular: false
+})
+const formulaListOpen = ref(false)
+/** 查询配方管理列表 */
+function getList() {
+  loading.value = true
+  listFormulaManagement(queryParams.value).then(response => {
+    FormulaManagementList.value = response.rows
+    total.value = response.total
+    loading.value = false
+    console.log("配方管理列表数据：", FormulaManagementList.value)
+  })
+}
+
+// 处理展开行的变化
+function handleExpandChange(row, expandedRows) {
+  // 收起其他行
+  expandedRows.forEach(r => {
+    if (r !== row) {
+      mainTable.value.toggleRowExpansion(r, false)
+    }
+  })
+
+  // 如果是展开状态，刷新子表数据
+  const isExpanded = expandedRows.includes(row)
+  if (isExpanded) {
+    loading.value = true
+    getList();
+  }
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  formulaListOpen.value = false
+  formulaFormReset()
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    formulaId: null,
+    feedStage: null,
+    batchId: null,
+    useStartDate: null,
+    useEndDate: null,
+    useState: null,
+    remark: null
+  }
+  proxy.resetForm("FormulaManagementRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.formulaId)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAddFormulatemplate() {
+  formulaFormReset()
+  reset()
+  operationType.value = "add"
+  // 模板禁用批号编辑
+  BatchIdEditable.value = false
+  // 添加模板时配方编号可编辑
+  FormulaIdEditable.value = true
+  isView.value = false
+  // 初始化表单
+  showFormulaManagementList.value = {
+    formulaId: null,
+    // 模板批号为 0
+    batchId: "0",
+    feedStage: null,
+    useStartDate: null,
+    useEndDate: null,
+    useState: '1', // 默认启用
+    remark: null,
+    sgFormulaList: [{
+      materialId: null,
+      materialName: null,
+      ratio: null,
+      isGranular: "0",
+      isSupplement: "0"
+    }]
+  }
+  formulaListOpen.value = true
+  title.value = "添加配方管理模板"
+}
+
+/** 修改按钮操作 */
+function handleFormulaTemplateUpdate(row) {
+  reset()
+  operationType.value = "update"
+  const _id = row.formulaId || ids.value
+  BatchIdEditable.value = false // 修改时批号不可编辑
+  FormulaIdEditable.value = false // 修改时配方编号不可编辑
+  const batchId = row.batchId
+  const queryParams = {
+    formulaId: _id,
+    batchId: batchId,
+    queryType: "query"
+  }
+  listFormulaManagement(queryParams).then(response => {
+    if (response.rows && response.rows.length > 0) {
+      showFormulaManagementList.value = response.rows[0] // 取第一条记录
+    } else {
+      showFormulaManagementList.value = {}
+    }
+    formulaListOpen.value = true
+    title.value = "修改处方"
+    isView.value = false
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["FormulaManagementRef"].validate(valid => {
+    if (valid) {
+      if (form.value.formulaId != null) {
+        updateFormulaManagement(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addFormulaManagement(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _formulaIds = row.formulaId || ids.value
+  proxy.$modal.confirm('是否确认删除配方管理编号为"' + _formulaIds + '"的数据项？').then(function () {
+    return delFormulaManagement(_formulaIds)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => { })
+}
+
+/** ================= 配方列表操作 ================= */
+function handleAddSgFormulaList(row) {
+  formulaFormReset()
+  reset()
+  operationType.value = "add"
+  BatchIdEditable.value = true
+  FormulaIdEditable.value = false
+  isView.value = false
+  console.log(row.sgFormulaList)
+  // 初始化表单
+  showFormulaManagementList.value = {
+    formulaId: row.formulaId || null,
+    batchId: null,
+    feedStage: null,
+    useStartDate: null,
+    useEndDate: null,
+    useState: '1', // 默认启用
+    remark: null,
+    sgFormulaList: row.sgFormulaList || [{
+      materialId: null,
+      materialName: null,
+      ratio: null,
+      isGranular: "0",
+      isSupplement: "0"
+    }]
+  }
+  formulaListOpen.value = true
+  title.value = "添加配方"
+}
+
+/** 修改按钮操作 */
+function handleFormulaUpdate(row) {
+  formulaFormReset()
+  const _code = row.code || ids.value
+  getFormulaList(_code).then(response => {
+    formulaForm.value = response.data
+    if (formulaForm.value.isGranular === "1") {
+      formulaForm.value.isGranular = true
+    } else {
+      formulaForm.value.isGranular = false
+    }
+    console.log("formulaForm: ", formulaForm.value)
+    formulaListOpen.value = true
+    FormulaIdEditable.value = false
+    title.value = "修改配方列表"
+  })
+}
+
+/** 删除按钮操作 */
+function handleFormulaDelete(row) {
+  const _codes = row.formulaId + "/" + row.batchId
+  proxy.$modal.confirm('是否确认删除配方列表编号为"' + _codes + '"的数据项？').then(function () {
+    return delFormulaManagement(_codes)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => { })
+}
+
+/** 提交按钮 */
+function submitFormulaListForm() {
+  proxy.$refs["FormulaManagementRef"].validate(valid => {
+    if (valid) {
+      if (showFormulaManagementList.value.formulaId != null && operationType.value === "update") {
+        updateFormulaManagement(showFormulaManagementList.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          formulaListOpen.value = false
+          getList()
+        })
+      } else if (operationType.value === "add" && showFormulaManagementList.value.formulaId != null && showFormulaManagementList.value.batchId != null) {
+        addFormulaManagement(showFormulaManagementList.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功")
+          formulaListOpen.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+// 原料下拉选择变化时，更新对应的原料名称
+function handleMaterialChange(row, selectedValue) {
+  const selectedItem = this.materials.find(item => item.value === selectedValue);
+  if (selectedItem) {
+    // materialName 也在 row 中
+    row.materialName = selectedItem.label;
+    row.isGranular = selectedItem.isGranular; // 更新 isGranular
+    row.isSupplement = selectedItem.isSupplement; // 更新 isSupplement
+  }
+}
+
+/**
+ * 查看详情
+ * 根据 id 拉取单条记录及子表数据，弹窗只读展示
+ */
+function handleView(row) {
+  reset()
+  const _id = row.formulaId || ids.value
+  const batchId = row.batchId
+  const queryParams = {
+    formulaId: _id,
+    batchId: batchId,
+    queryType: "query"
+  }
+  listFormulaManagement(queryParams).then(response => {
+    if (response.rows && response.rows.length > 0) {
+      showFormulaManagementList.value = response.rows[0] // 取第一条记录
+    } else {
+      showFormulaManagementList.value = {}
+    }
+    title.value = "配方详情"
+    isView.value = true
+    formulaListOpen.value = true
+    console.log("handleView showFormulaManagementList: ", showFormulaManagementList.value);
+    console.log("handleView response: ", response);
+  })
+}
+
+/**
+ * 修改按钮
+ * 与查看详情共用接口，但弹窗可编辑
+ */
+function handleFormulaDetailUpdate(row) {
+  reset()
+  operationType.value = "update"
+  const _id = row.formulaId || ids.value
+  BatchIdEditable.value = false // 修改时批号不可编辑
+  const batchId = row.batchId
+  const queryParams = {
+    formulaId: _id,
+    batchId: batchId,
+    queryType: "query"
+  }
+  listFormulaManagement(queryParams).then(response => {
+    if (response.rows && response.rows.length > 0) {
+      showFormulaManagementList.value = response.rows[0] // 取第一条记录
+    } else {
+      showFormulaManagementList.value = {}
+    }
+    formulaListOpen.value = true
+    title.value = "修改配方"
+    isView.value = false
+  })
+}
+
+// 添加项
+function handleAddSgFormulaListDetail() {
+  showFormulaManagementList.value.sgFormulaList.push({
+    materialId: null,
+    materialName: null,
+    ratio: null,
+    isGranular: "0",
+    isSupplement: "0"
+  })
+}
+// 删除项
+function deleteFormulaListDetail(row) {
+  const index = showFormulaManagementList.value.sgFormulaList.findIndex(item => item.index === row.index)
+  if (index !== -1) {
+    showFormulaManagementList.value.sgFormulaList.splice(index, 1)
+  }
+}
+// 表单重置
+function formulaFormReset() {
+  form.value = {
+    code: null,
+    formulaId: null,
+    materialId: null,
+    materialName: null,
+    ratio: null,
+    isGranular: null,
+    isSupplement: null
+  }
+  proxy.resetForm("FormulaListRef")
+}
+
+// 原料列表查询参数
+const materialQueryParams = ref({
+  materialId: null,
+  materialName: null,
+  isGranular: null
+})
+function getMaterials() {
+  listMaterial(materialQueryParams).then(response => {
+    console.log("获取原料列表：", response)
+    materials.value = response.rows.map(item => ({
+      value: item.materialId,
+      label: item.materialName,
+      isGranular: item.isGranular,
+      isSupplement: "0" // 默认补饲原料为 0
+    }))
+    console.log("原料列表：", materials.value)
+  })
+}
+
+/** ================== 分组下拉列表部分 ======================== */
+const groupedMaterials = ref([])  // 存储分组后的原料数据
+
+// 从后端获取数据并按isGranular分组
+function getGroupMaterials() {
+  listMaterial(materialQueryParams).then(response => {
+    console.log("获取原料列表：", response)
+
+    // 根据material_type分组数据
+    const groups = material_type.value.map(type => ({
+      label: type.label,
+      options: []
+    }))
+
+    // 遍历原料数据，根据isGranular字段分组
+    response.rows.forEach(item => {
+      const group = groups.find(group => group.label === material_type.value.find(type => type.value === item.isGranular).label)
+      group.options.push({
+        value: item.materialId,
+        label: item.materialName
+      })
+    })
+
+    // 将分组后的数据赋值给groupedMaterials
+    groupedMaterials.value = groups
+    console.log("分组后的原料列表：", groupedMaterials.value)
+  })
+}
+
+/**
+ * 子表多选回调
+ * 记录被选中的行序号数组
+ */
+function handleSgFormulaListDetailSelectionChange(selection) {
+  checkedSwPresDetail.value = selection.map(item => item.index)
+}
+/**
+ * 子表行序号计算
+ * 通过 el-table 的 row-class-name 钩子给每一行写入 index（从 1 开始）
+ */
+function rowSgFormulaListDetailIndex({ row, rowIndex }) {
+  row.index = rowIndex + 1
+}
+
+/** ================================= */
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('feed/FormulaManagement/export', {
+    ...queryParams.value
+  }, `FormulaManagement_${new Date().getTime()}.xlsx`)
+}
+
+// 初始化加载数据
+getList()
+// 加载原料列表
+getMaterials()
+// 加载分组原料列表
+getGroupMaterials()
+</script>
diff --git a/src/views/mating_plan/mating_plan/generate/index.vue b/src/views/mating_plan/mating_plan/generate/index.vue
index a81af82..39509a1 100644
--- a/src/views/mating_plan/mating_plan/generate/index.vue
+++ b/src/views/mating_plan/mating_plan/generate/index.vue
@@ -9,6 +9,24 @@
             @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="计划类型" prop="planType">
+        <el-select v-model="queryParams.planType" placeholder="请选择计划类型" clearable>
+          <el-option label="同期发情配种计划" value="1"></el-option>
+          <el-option label="本交配种计划" value="2"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="计划日期" prop="planDate">
+        <el-date-picker
+            v-model="dateRange"
+            style="width: 240px"
+            value-format="YYYY-MM-DD"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            @change="handleDateRangeChange"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
           <el-option label="待审批" value="0"></el-option>
@@ -48,6 +66,13 @@
     <el-table v-loading="loading" :data="breedPlanGenerateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="计划名称" align="center" prop="planName" />
+      <el-table-column label="计划类型" align="center" prop="planType">
+        <template #default="scope">
+          <el-tag v-if="scope.row.planType === 1" type="primary">同期发情配种计划</el-tag>
+          <el-tag v-else-if="scope.row.planType === 2" type="success">本交配种计划</el-tag>
+          <el-tag v-else type="info">未知类型</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="计划日期" align="center" prop="planDate" width="180">
         <template #default="scope">
           <span>{{ scope.row.planDate }}</span>
@@ -82,6 +107,7 @@
               v-hasPermi="['mating_plan:generate:approve']"
               v-if="scope.row.status == 0"
           >审批</el-button>
+
           <el-button
               link
               type="primary"
@@ -93,14 +119,6 @@
       </el-table-column>
     </el-table>
 
-    <!-- 添加调试信息显示 -->
-    <div v-if="breedPlanGenerateList.length === 0 && !loading" style="text-align: center; padding: 20px;">
-      <p>暂无数据</p>
-      <p>数据数组长度: {{ breedPlanGenerateList.length }}</p>
-      <p>总数: {{ total }}</p>
-      <p>加载状态: {{ loading }}</p>
-    </div>
-
     <pagination
         v-show="total>0"
         :total="total"
@@ -111,6 +129,22 @@
 
     <!-- 生成配种计划对话框 -->
     <el-dialog title="生成配种计划" v-model="generateOpen" width="1200px" append-to-body>
+      <el-form ref="generateFormRef" :model="generateForm" :rules="generateRules" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="计划类型" prop="planType">
+              <el-radio-group v-model="generateForm.planType">
+                <el-radio :label="1">同期发情配种计划</el-radio>
+                <el-radio :label="2">本交配种计划</el-radio>
+              </el-radio-group>
+              <div style="margin-top: 10px; color: #666; font-size: 12px;">
+                计划名称将自动生成为：{{ getCurrentDate() }}{{ getPlanTypeName(generateForm.planType) }}
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
       <el-tabs v-model="activeTab" @tab-click="handleTabClick">
         <el-tab-pane label="符合条件的母羊" name="ewe">
           <el-row :gutter="10" class="mb8">
@@ -130,6 +164,7 @@
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="管理耳号" align="center" prop="bs_manage_tags" />
             <el-table-column label="品种" align="center" prop="variety" />
+            <el-table-column label="家系" align="center" prop="family" />
             <el-table-column label="羊只类型" align="center" prop="sheep_type" />
             <el-table-column label="月龄" align="center" prop="month_age" />
             <el-table-column label="当前体重(kg)" align="center" prop="current_weight" />
@@ -156,6 +191,7 @@
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="管理耳号" align="center" prop="bs_manage_tags" />
             <el-table-column label="品种" align="center" prop="variety" />
+            <el-table-column label="家系" align="center" prop="family" />
             <el-table-column label="羊只类型" align="center" prop="sheep_type" />
             <el-table-column label="月龄" align="center" prop="month_age" />
             <el-table-column label="当前体重(kg)" align="center" prop="current_weight" />
@@ -174,10 +210,106 @@
       </template>
     </el-dialog>
 
+
+
+    <!-- 审批配种计划对话框 -->
+    <el-dialog title="审批配种计划" v-model="approveOpen" width="1400px" append-to-body>
+      <el-descriptions :column="3" border class="mb8">
+        <el-descriptions-item label="计划名称">{{ approveData.planInfo.planName }}</el-descriptions-item>
+        <el-descriptions-item label="计划类型">
+          <el-tag v-if="approveData.planInfo.planType === 1" type="primary">同期发情配种计划</el-tag>
+          <el-tag v-else-if="approveData.planInfo.planType === 2" type="success">本交配种计划</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="计划日期">{{ approveData.planInfo.planDate }}</el-descriptions-item>
+        <el-descriptions-item label="母羊数量">{{ approveData.planInfo.totalEweCount }}</el-descriptions-item>
+        <el-descriptions-item label="公羊数量">{{ approveData.planInfo.totalRamCount }}</el-descriptions-item>
+        <el-descriptions-item label="配种比例">{{ approveData.planInfo.breedRatio }}</el-descriptions-item>
+      </el-descriptions>
+
+      <el-divider content-position="left">配种计划详情（可编辑）</el-divider>
+      <el-table
+          :data="approveData.planDetails"
+          style="width: 100%"
+          max-height="500"
+          border
+      >
+        <el-table-column label="序号" type="index" width="60" align="center" />
+        <el-table-column label="母羊耳号" align="center" prop="ewe_manage_tags" width="120" />
+        <el-table-column label="母羊品种" align="center" prop="ewe_variety" width="100" />
+        <el-table-column label="核心羊群" align="center" width="100">
+          <template #default="scope">
+            <el-tag v-if="scope.row.ewe_is_core" type="success">是</el-tag>
+            <el-tag v-else type="info">否</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否种用" align="center" width="100">
+          <template #default="scope">
+            <el-tag v-if="scope.row.ewe_is_breeding" type="success">是</el-tag>
+            <el-tag v-else type="info">否</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="详情" align="center" width="80">
+          <template #default="scope">
+            <el-button link type="primary" icon="View" @click="showEweDetail(scope.row)">查看</el-button>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="配种公羊" align="center" width="200">
+          <template #default="scope">
+            <el-select
+                v-model="scope.row.ram_id"
+                placeholder="选择公羊(可为空)"
+                @change="handleRamChange(scope.$index, scope.row)"
+                filterable
+                clearable
+            >
+              <el-option label="不参与配种" :value="null" />
+              <el-option
+                  v-for="ram in availableRamList"
+                  :key="ram.id"
+                  :label="ram.bs_manage_tags"
+                  :value="ram.id"
+              />
+            </el-select>
+            <!-- 如果当前选中的公羊不在可选列表中，显示当前公羊耳号 -->
+            <div v-if="scope.row.ram_id && !availableRamList.find(r => r.id == scope.row.ram_id)"
+                 style="font-size: 12px; color: #666; margin-top: 4px;">
+              当前: {{ scope.row.ram_manage_tags || scope.row.ram_id }}
+            </div>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="公羊品种" align="center" prop="ram_variety" width="100" />
+        <el-table-column label="详情" align="center" width="80">
+          <template #default="scope">
+            <el-button
+                link
+                type="primary"
+                icon="View"
+                @click="showRamDetail(scope.row)"
+                :disabled="!scope.row.ram_id"
+            >查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="success" @click="confirmApprove">确认审批</el-button>
+          <el-button type="danger" @click="rejectApprove">拒绝审批</el-button>
+          <el-button @click="approveOpen = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
     <!-- 查看配种计划详情对话框 -->
-    <el-dialog title="配种计划详情" v-model="viewOpen" width="1000px" append-to-body>
+    <el-dialog title="配种计划详情" v-model="viewOpen" width="1200px" append-to-body>
       <el-descriptions :column="3" border>
         <el-descriptions-item label="计划名称">{{ planInfo.planName }}</el-descriptions-item>
+        <el-descriptions-item label="计划类型">
+          <el-tag v-if="planInfo.planType === 1" type="primary">同期发情配种计划</el-tag>
+          <el-tag v-else-if="planInfo.planType === 2" type="success">本交配种计划</el-tag>
+        </el-descriptions-item>
         <el-descriptions-item label="计划日期">{{ planInfo.planDate }}</el-descriptions-item>
         <el-descriptions-item label="状态">
           <el-tag v-if="planInfo.status === 0" type="warning">待审批</el-tag>
@@ -193,29 +325,90 @@
         <el-descriptions-item label="审批人">{{ planInfo.approver }}</el-descriptions-item>
       </el-descriptions>
 
+      <!-- 只有已审批状态才显示导出按钮 -->
+      <el-row :gutter="10" class="mb8" style="margin-top: 16px;" v-if="planInfo.status === 1">
+        <el-col :span="1.5">
+          <el-button type="success" icon="Download" @click="exportBreedPlanDetails">导出配种计划详情</el-button>
+        </el-col>
+      </el-row>
+
       <el-divider content-position="left">配种计划详情</el-divider>
-      <el-table :data="planDetails" max-height="400">
-        <el-table-column label="公羊耳号" align="center" prop="ram_manage_tags" />
-        <el-table-column label="公羊品种" align="center" prop="ram_variety" />
-        <el-table-column label="母羊耳号" align="center" prop="ewe_manage_tags" />
-        <el-table-column label="母羊品种" align="center" prop="ewe_variety" />
-        <el-table-column label="母羊体重" align="center" prop="ewe_weight" />
-        <el-table-column label="配种类型" align="center" prop="breed_type">
+      <el-table :data="planDetails" max-height="600" border stripe>
+        <el-table-column label="序号" type="index" width="60" align="center" />
+        <el-table-column label="母羊耳号" align="center" prop="ewe_manage_tags" width="120" />
+        <el-table-column label="母羊品种" align="center" prop="ewe_variety" width="100" />
+        <el-table-column label="核心羊群" align="center" width="100">
           <template #default="scope">
-            <el-tag v-if="scope.row.breed_type === 1" type="primary">自然交配</el-tag>
-            <el-tag v-else-if="scope.row.breed_type === 2" type="success">人工授精</el-tag>
-            <el-tag v-else-if="scope.row.breed_type === 3" type="info">胚胎移植</el-tag>
+            <el-tag v-if="scope.row.ewe_is_core" type="success">是</el-tag>
+            <el-tag v-else type="info">否</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否种用" align="center" width="100">
+          <template #default="scope">
+            <el-tag v-if="scope.row.ewe_is_breeding" type="success">是</el-tag>
+            <el-tag v-else type="info">否</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="母羊详情" align="center" width="100">
+          <template #default="scope">
+            <el-button link type="primary" icon="View" @click="showEweDetail(scope.row)">查看</el-button>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="公羊耳号" align="center" prop="ram_manage_tags" width="120" />
+        <el-table-column label="公羊品种" align="center" prop="ram_variety" width="100" />
+        <el-table-column label="公羊详情" align="center" width="100">
+          <template #default="scope">
+            <el-button
+                link
+                type="primary"
+                icon="View"
+                @click="showRamDetail(scope.row)"
+                :disabled="!scope.row.ram_id"
+            >查看</el-button>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="配种类型" align="center" prop="breed_type" width="120">
+          <template #default="scope">
+            <el-tag v-if="scope.row.breed_type === 1" type="primary">同期发情</el-tag>
+            <el-tag v-else-if="scope.row.breed_type === 2" type="success">本交</el-tag>
             <el-tag v-else type="warning">未知类型</el-tag>
           </template>
         </el-table-column>
       </el-table>
     </el-dialog>
+
+    <!-- 羊只详情对话框 -->
+    <el-dialog :title="sheepDetailTitle" v-model="sheepDetailOpen" width="800px" append-to-body>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item label="耳号">{{ sheepDetail.manage_tags }}</el-descriptions-item>
+        <el-descriptions-item label="品种">{{ sheepDetail.variety }}</el-descriptions-item>
+        <el-descriptions-item label="家系">{{ sheepDetail.family }}</el-descriptions-item>
+        <el-descriptions-item label="羊只类别">{{ sheepDetail.sheep_type }}</el-descriptions-item>
+        <el-descriptions-item label="繁育状态" v-if="sheepDetail.breed_status">{{ sheepDetail.breed_status }}</el-descriptions-item>
+        <el-descriptions-item label="生日" v-if="sheepDetail.birthday">{{ sheepDetail.birthday }}</el-descriptions-item>
+        <el-descriptions-item label="月龄">{{ sheepDetail.month_age }}</el-descriptions-item>
+        <el-descriptions-item label="当前体重">{{ sheepDetail.current_weight }}kg</el-descriptions-item>
+        <el-descriptions-item label="胎次" v-if="sheepDetail.parity">{{ sheepDetail.parity }}</el-descriptions-item>
+        <el-descriptions-item label="是否核心羊群" v-if="sheepDetail.is_core !== undefined">
+          <el-tag v-if="sheepDetail.is_core" type="success">是</el-tag>
+          <el-tag v-else type="info">否</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="是否种用" v-if="sheepDetail.is_breeding !== undefined">
+          <el-tag v-if="sheepDetail.is_breeding" type="success">是</el-tag>
+          <el-tag v-else type="info">否</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="羊舍" v-if="sheepDetail.sheepfold_name">{{ sheepDetail.sheepfold_name }}</el-descriptions-item>
+        <el-descriptions-item label="备注" v-if="sheepDetail.comment">{{ sheepDetail.comment }}</el-descriptions-item>
+        <el-descriptions-item label="繁殖情况" v-if="sheepDetail.reproduction_info">{{ sheepDetail.reproduction_info }}</el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="BreedPlanGenerate">
-import {ref, reactive, toRefs, onMounted} from 'vue'
-import {getCurrentInstance} from 'vue'
+import {ref, reactive, toRefs, onMounted, getCurrentInstance} from 'vue'
 import {
   listBreedPlanGenerate,
   getBreedPlanGenerate,
@@ -223,28 +416,31 @@ import {
   selectEligibleEwe as apiSelectEligibleEwe,
   selectEligibleRam as apiSelectEligibleRam,
   autoGenerateBreedPlan,
-  approveBreedPlan,
+  getApproveBreedPlan,
+  confirmApproveBreedPlan,
   viewBreedPlan
 } from "@/api/mating_plan/generate"
 
 const {proxy} = getCurrentInstance()
-// 修复字典问题 - 使用 proxy.useDict 或直接定义
-const dict = proxy.useDict ? proxy.useDict('breed_plan_status', 'breed_type') : {
-  type: {
-    breed_plan_status: [],
-    breed_type: []
-  }
-}
 
 const breedPlanGenerateList = ref([])
 const eligibleEweList = ref([])
 const eligibleRamList = ref([])
+const availableRamList = ref([])
 const selectedEwe = ref([])
 const selectedRam = ref([])
 const planInfo = ref({})
 const planDetails = ref([])
+const approveData = ref({
+  planInfo: {},
+  planDetails: []
+})
+const sheepDetail = ref({})
+const sheepDetailTitle = ref('')
 const generateOpen = ref(false)
 const viewOpen = ref(false)
+const approveOpen = ref(false)
+const sheepDetailOpen = ref(false)
 const loading = ref(true)
 const eweLoading = ref(false)
 const ramLoading = ref(false)
@@ -253,36 +449,36 @@ const ids = ref([])
 const multiple = ref(true)
 const total = ref(0)
 const activeTab = ref('ewe')
+const dateRange = ref([])
 
 const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     planName: null,
-    status: null
+    planType: null,
+    status: null,
+    params: {}
+  },
+  generateForm: {
+    planType: 1
+  },
+  generateRules: {
+    planType: [
+      { required: true, message: '请选择计划类型', trigger: 'change' }
+    ]
   }
 })
 
-const {queryParams} = toRefs(data)
+const {queryParams, generateForm, generateRules} = toRefs(data)
 
 /** 查询配种计划生成列表 */
 function getList() {
   loading.value = true
-  console.log('开始获取配种计划列表...')
-  console.log('查询参数:', queryParams.value)
-
   listBreedPlanGenerate(queryParams.value).then(response => {
-    console.log('API完整响应:', response)
-
-    // 处理API响应数据
     breedPlanGenerateList.value = response.rows || []
     total.value = response.total || 0
     loading.value = false
-
-    console.log('处理后的数据列表:', breedPlanGenerateList.value)
-    console.log('数据列表长度:', breedPlanGenerateList.value.length)
-    console.log('总数:', total.value)
-
   }).catch(error => {
     console.error('获取列表失败:', error)
     loading.value = false
@@ -299,10 +495,36 @@ function handleQuery() {
 
 /** 重置按钮操作 */
 function resetQuery() {
+  dateRange.value = []
+  queryParams.value.params = {}
   proxy.resetForm("queryRef")
   handleQuery()
 }
 
+/** 日期范围变化处理 */
+function handleDateRangeChange(dates) {
+  if (dates && dates.length === 2) {
+    queryParams.value.params.beginTime = dates[0]
+    queryParams.value.params.endTime = dates[1]
+  } else {
+    queryParams.value.params = {}
+  }
+}
+
+/** 获取当前日期 */
+function getCurrentDate() {
+  const today = new Date()
+  const year = today.getFullYear()
+  const month = String(today.getMonth() + 1).padStart(2, '0')
+  const day = String(today.getDate()).padStart(2, '0')
+  return `${year}-${month}-${day}`
+}
+
+/** 获取计划类型名称 */
+function getPlanTypeName(planType) {
+  return planType === 1 ? '同期发情配种计划' : '本交配种计划'
+}
+
 // 多选框选中数据
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.id)
@@ -327,6 +549,7 @@ function handleTabClick(tab) {
 /** 生成配种计划按钮操作 */
 function handleGenerate() {
   generateOpen.value = true
+  generateForm.value.planType = 1
   selectedEwe.value = []
   selectedRam.value = []
   eligibleEweList.value = []
@@ -353,36 +576,43 @@ function selectEligibleRam() {
 
 /** 生成配种计划 */
 function generateBreedPlan() {
-  if (selectedEwe.value.length === 0) {
-    proxy.$modal.msgError("请选择母羊")
-    return
-  }
-  if (selectedRam.value.length === 0) {
-    proxy.$modal.msgError("请选择公羊")
-    return
-  }
+  proxy.$refs.generateFormRef.validate((valid) => {
+    if (!valid) return
 
-  const params = {
-    eweIds: selectedEwe.value,
-    ramIds: selectedRam.value
-  }
+    if (selectedEwe.value.length === 0) {
+      proxy.$modal.msgError("请选择母羊")
+      return
+    }
+    if (selectedRam.value.length === 0) {
+      proxy.$modal.msgError("请选择公羊")
+      return
+    }
 
-  autoGenerateBreedPlan(params).then(response => {
-    proxy.$modal.msgSuccess("配种计划生成成功")
-    generateOpen.value = false
-    // 重新加载列表数据
-    getList()
-    // 重置选择的羊只
-    selectedEwe.value = []
-    selectedRam.value = []
-    eligibleEweList.value = []
-    eligibleRamList.value = []
-  }).catch(error => {
-    console.error('生成配种计划失败:', error)
-    proxy.$modal.msgError("生成配种计划失败")
+    const params = {
+      planType: generateForm.value.planType,
+      eweIds: selectedEwe.value,
+      ramIds: selectedRam.value
+    }
+
+    autoGenerateBreedPlan(params).then(response => {
+      proxy.$modal.msgSuccess("配种计划生成成功")
+      generateOpen.value = false
+      getList()
+      // 重置表单和选择
+      generateForm.value = { planType: 1 }
+      selectedEwe.value = []
+      selectedRam.value = []
+      eligibleEweList.value = []
+      eligibleRamList.value = []
+    }).catch(error => {
+      console.error('生成配种计划失败:', error)
+      proxy.$modal.msgError("生成配种计划失败")
+    })
   })
 }
 
+
+
 /** 查看配种计划详情 */
 function handleView(row) {
   viewBreedPlan(row.id).then(response => {
@@ -394,14 +624,143 @@ function handleView(row) {
 
 /** 审批配种计划 */
 function handleApprove(row) {
-  proxy.$modal.confirm('是否确认审批通过配种计划"' + row.planName + '"？').then(function () {
-    return approveBreedPlan(row.id)
+  getApproveBreedPlan(row.id).then(response => {
+    approveData.value = response.data
+    availableRamList.value = response.data.availableRams || []
+
+    // 确保每行数据都有正确的公羊ID映射
+    if (approveData.value.planDetails) {
+      approveData.value.planDetails.forEach(detail => {
+        // 如果ram_id是字符串，转换为数字用于下拉框匹配
+        if (detail.ram_id && typeof detail.ram_id === 'string') {
+          detail.ram_id = parseInt(detail.ram_id, 10)
+        }
+
+        // 如果当前公羊不在可选列表中，添加到列表中以显示当前选择
+        if (detail.ram_id && detail.ram_manage_tags &&
+            !availableRamList.value.find(ram => ram.id === detail.ram_id)) {
+          availableRamList.value.push({
+            id: detail.ram_id,
+            bs_manage_tags: detail.ram_manage_tags
+          })
+        }
+      })
+    }
+
+    approveOpen.value = true
+  })
+}
+
+/** 公羊选择变化处理 */
+function handleRamChange(index, row) {
+  if (row.ram_id === null) {
+    // 不参与配种
+    row.ram_manage_tags = ''
+    row.ram_variety = ''
+    row.ram_family = ''
+    row.ram_sheep_type = ''
+    row.ram_birthday = ''
+    row.ram_month_age = ''
+    row.ram_current_weight = ''
+    row.breed_type = null
+  } else {
+    // 确保ram_id是数字类型进行匹配
+    const ramId = typeof row.ram_id === 'string' ? parseInt(row.ram_id, 10) : row.ram_id
+    const selectedRam = availableRamList.value.find(ram => ram.id === ramId)
+
+    if (selectedRam) {
+      row.ram_manage_tags = selectedRam.bs_manage_tags
+      row.ram_variety = selectedRam.variety
+      row.ram_family = selectedRam.family
+      row.ram_sheep_type = selectedRam.sheep_type
+      row.ram_birthday = selectedRam.birthday
+      row.ram_month_age = selectedRam.month_age
+      row.ram_current_weight = selectedRam.current_weight
+      // 设置默认配种类型
+      if (!row.breed_type) {
+        row.breed_type = 1 // 默认同期发情
+      }
+    }
+  }
+}
+
+/** 显示母羊详情 */
+function showEweDetail(row) {
+  sheepDetail.value = {
+    manage_tags: row.ewe_manage_tags,
+    variety: row.ewe_variety,
+    family: row.ewe_family,
+    sheep_type: row.ewe_sheep_type,
+    breed_status: row.ewe_breed_status,
+    parity: row.ewe_parity,
+    month_age: row.ewe_month_age,
+    current_weight: row.ewe_current_weight,
+    is_core: row.ewe_is_core,
+    is_breeding: row.ewe_is_breeding,
+    sheepfold_name: row.ewe_sheepfold_name,
+    comment: row.ewe_comment,
+    reproduction_info: row.ewe_reproduction_info
+  }
+  sheepDetailTitle.value = '母羊详情'
+  sheepDetailOpen.value = true
+}
+
+/** 显示公羊详情 */
+function showRamDetail(row) {
+  if (!row.ram_id) {
+    proxy.$modal.msgWarning("该母羊未分配公羊")
+    return
+  }
+
+  sheepDetail.value = {
+    manage_tags: row.ram_manage_tags,
+    variety: row.ram_variety,
+    family: row.ram_family,
+    sheep_type: row.ram_sheep_type,
+    birthday: row.ram_birthday,
+    month_age: row.ram_month_age,
+    current_weight: row.ram_current_weight
+  }
+  sheepDetailTitle.value = '公羊详情'
+  sheepDetailOpen.value = true
+}
+
+/** 确认审批 */
+function confirmApprove() {
+  proxy.$modal.confirm('确认审批通过此配种计划？').then(function () {
+    const params = {
+      planId: approveData.value.planInfo.id,
+      planDetails: approveData.value.planDetails,
+      status: 1,
+      approveRemark: '审批通过'
+    }
+    return confirmApproveBreedPlan(params)
   }).then(() => {
     proxy.$modal.msgSuccess("审批成功")
-    // 刷新列表
+    approveOpen.value = false
     getList()
-  }).catch(() => {
-  })
+  }).catch(() => {})
+}
+
+/** 拒绝审批 */
+function rejectApprove() {
+  proxy.$modal.prompt('请输入拒绝原因', '拒绝审批', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    inputPattern: /.+/,
+    inputErrorMessage: '拒绝原因不能为空'
+  }).then(({ value }) => {
+    const params = {
+      planId: approveData.value.planInfo.id,
+      status: 2,
+      approveRemark: value
+    }
+    return confirmApproveBreedPlan(params)
+  }).then(() => {
+    proxy.$modal.msgSuccess("已拒绝审批")
+    approveOpen.value = false
+    getList()
+  }).catch(() => {})
 }
 
 /** 删除按钮操作 */
@@ -411,18 +770,35 @@ function handleDelete(row) {
     return delBreedPlanGenerate(_ids)
   }).then(() => {
     proxy.$modal.msgSuccess("删除成功")
-    // 刷新列表
     getList()
-  }).catch(() => {
-  })
+  }).catch(() => {})
+}
+
+/** 导出配种计划详情 */
+function exportBreedPlanDetails() {
+  if (!planInfo.value || !planDetails.value || planDetails.value.length === 0) {
+    proxy.$modal.msgError("暂无数据可导出")
+    return
+  }
+
+  // 检查是否已审批
+  if (planInfo.value.status !== 1) {
+    proxy.$modal.msgError("只有已审批的配种计划才能导出")
+    return
+  }
+
+  // 使用proxy.download方法，会自动携带认证信息
+  proxy.download(`/mating_plan/generate/export/${planInfo.value.id}`, {}, `${planInfo.value.planName}_配种计划详情_${new Date().getTime()}.xlsx`)
 }
 
 // 页面挂载时加载数据
 onMounted(() => {
-  console.log('配种计划生成页面已挂载')
   getList()
 })
+</script>
 
-// 初始加载数据
-getList()
-</script>
\ No newline at end of file
+<style scoped>
+.mb8 {
+  margin-bottom: 8px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/mating_plan/mating_plan/index.vue b/src/views/mating_plan/mating_plan/mating_plan/index.vue
similarity index 66%
rename from src/views/mating_plan/mating_plan/index.vue
rename to src/views/mating_plan/mating_plan/mating_plan/index.vue
index ab78192..c84f453 100644
--- a/src/views/mating_plan/mating_plan/index.vue
+++ b/src/views/mating_plan/mating_plan/mating_plan/index.vue
@@ -3,18 +3,18 @@
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公羊id" prop="ramId">
         <el-input
-          v-model="queryParams.ramId"
-          placeholder="请输入公羊id"
-          clearable
-          @keyup.enter="handleQuery"
+            v-model="queryParams.ramId"
+            placeholder="请输入公羊id"
+            clearable
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="母羊id" prop="eweId">
         <el-input
-          v-model="queryParams.eweId"
-          placeholder="请输入母羊id"
-          clearable
-          @keyup.enter="handleQuery"
+            v-model="queryParams.eweId"
+            placeholder="请输入母羊id"
+            clearable
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item>
@@ -26,40 +26,40 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['mating_plan:mating_plan:add']"
+            type="primary"
+            plain
+            icon="Plus"
+            @click="handleAdd"
+            v-hasPermi="['mating_plan:mating_plan:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['mating_plan:mating_plan:edit']"
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['mating_plan:mating_plan:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['mating_plan:mating_plan:remove']"
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['mating_plan:mating_plan:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['mating_plan:mating_plan:export']"
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['mating_plan:mating_plan:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -67,10 +67,17 @@
 
     <el-table v-loading="loading" :data="mating_planList" @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="id" />
       <el-table-column label="公羊id" align="center" prop="ramId" />
       <el-table-column label="母羊id" align="center" prop="eweId" />
-      <el-table-column label="配种类型" align="center" prop="breedType" />
+      <el-table-column label="配种类型" align="center" prop="breedType">
+        <template #default="scope">
+          <el-tag v-if="scope.row.breedType === 1" type="primary">自然交配</el-tag>
+          <el-tag v-else-if="scope.row.breedType === 2" type="success">人工授精</el-tag>
+          <el-tag v-else-if="scope.row.breedType === 3" type="info">胚胎移植</el-tag>
+          <el-tag v-else type="warning">未知类型</el-tag>
+        </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="['mating_plan:mating_plan:edit']">修改</el-button>
@@ -80,11 +87,11 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
     />
 
     <!-- 添加或修改配种计划对话框 -->
@@ -96,6 +103,13 @@
         <el-form-item label="母羊id" prop="eweId">
           <el-input v-model="form.eweId" placeholder="请输入母羊id" />
         </el-form-item>
+        <el-form-item label="配种类型" prop="breedType">
+          <el-select v-model="form.breedType" placeholder="请选择配种类型">
+            <el-option label="自然交配" :value="1"></el-option>
+            <el-option label="人工授精" :value="2"></el-option>
+            <el-option label="胚胎移植" :value="3"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -108,6 +122,7 @@
 </template>
 
 <script setup name="Mating_plan">
+import { ref, reactive, toRefs, onMounted, getCurrentInstance } from 'vue'
 import { listMating_plan, getMating_plan, delMating_plan, addMating_plan, updateMating_plan } from "@/api/mating_plan/mating_plan"
 
 const { proxy } = getCurrentInstance()
@@ -132,6 +147,15 @@ const data = reactive({
     breedType: null
   },
   rules: {
+    ramId: [
+      { required: true, message: "公羊id不能为空", trigger: "blur" }
+    ],
+    eweId: [
+      { required: true, message: "母羊id不能为空", trigger: "blur" }
+    ],
+    breedType: [
+      { required: true, message: "配种类型不能为空", trigger: "change" }
+    ]
   }
 })
 
@@ -141,9 +165,14 @@ const { queryParams, form, rules } = toRefs(data)
 function getList() {
   loading.value = true
   listMating_plan(queryParams.value).then(response => {
-    mating_planList.value = response.rows
-    total.value = response.total
+    mating_planList.value = response.rows || []
+    total.value = response.total || 0
     loading.value = false
+  }).catch(error => {
+    console.error('获取列表失败:', error)
+    loading.value = false
+    mating_planList.value = []
+    total.value = 0
   })
 }
 
@@ -240,5 +269,14 @@ function handleExport() {
   }, `mating_plan_${new Date().getTime()}.xlsx`)
 }
 
-getList()
+// 页面挂载时加载数据
+onMounted(() => {
+  getList()
+})
 </script>
+
+<style scoped>
+.mb8 {
+  margin-bottom: 8px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/miscarriage/miscarriage/index.vue b/src/views/miscarriage/miscarriage/index.vue
new file mode 100644
index 0000000..2e6d70c
--- /dev/null
+++ b/src/views/miscarriage/miscarriage/index.vue
@@ -0,0 +1,457 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="耳号" prop="bsManageTags">
+        <el-input
+            v-model="queryParams.bsManageTags"
+            placeholder="请输入羊只耳号"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="品种" prop="variety">
+        <el-input
+            v-model="queryParams.variety"
+            placeholder="请输入品种"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="事件日期" prop="datetime">
+        <el-date-picker clearable
+                        v-model="queryParams.datetime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择事件日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="流产原因" prop="reason">
+        <el-select v-model="queryParams.reason" placeholder="请选择流产原因" clearable>
+          <el-option
+              v-for="item in reasonOptions"
+              :key="item"
+              :label="item"
+              :value="item">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="技术员" prop="technician">
+        <el-input
+            v-model="queryParams.technician"
+            placeholder="请输入技术员"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+            type="primary"
+            plain
+            icon="Plus"
+            @click="handleAdd"
+            v-hasPermi="['miscarriage:miscarriage:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['miscarriage:miscarriage:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['miscarriage:miscarriage:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['miscarriage:miscarriage:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="miscarriageList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- 日期作为第一列 -->
+      <el-table-column label="流产日期" align="center" prop="datetime" width="100" fixed="left">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="耳号" align="center" prop="bsManageTags" />
+      <el-table-column label="品种" align="center" prop="variety" />
+      <el-table-column label="事件类型" align="center">
+        <template #default="scope">
+          <span>流产</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="流产原因" align="center" prop="reason" />
+      <el-table-column label="配种类型" align="center" prop="matingTypeName" />
+      <el-table-column label="配种日期" align="center" prop="matingDate" width="100">
+        <template #default="scope">
+          <span>{{ scope.row.matingDate ? parseTime(scope.row.matingDate, '{y}-{m}-{d}') : '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="胎次" align="center" prop="parity" />
+      <el-table-column label="配种公羊品种" align="center" prop="ramVariety" />
+      <el-table-column label="流产数量" align="center" prop="miscaLamb" />
+      <el-table-column label="技术员" align="center" prop="technician" />
+      <el-table-column label="月龄" align="center" prop="monthAge" />
+      <el-table-column label="流产时怀孕天数" align="center" prop="pregnantDays" />
+      <el-table-column label="当前羊舍" align="center" prop="sheepfoldName" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建日期" align="center" prop="createTime" width="100">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="所在牧场" align="center" prop="drRanch" />
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="是否列胎次" align="center" prop="status">
+        <template #default="scope">
+          <el-tag v-if="scope.row.status === 1" type="success">是</el-tag>
+          <el-tag v-else-if="scope.row.status === 0" type="danger">否</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否见胎" align="center" prop="exposeType">
+        <template #default="scope">
+          <el-tag v-if="scope.row.exposeType === 1" type="success">是</el-tag>
+          <el-tag v-else-if="scope.row.exposeType === 2" type="warning">复检无胎</el-tag>
+          <el-tag v-else-if="scope.row.exposeType === 3" type="danger">返情</el-tag>
+        </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="['miscarriage:miscarriage:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['miscarriage:miscarriage: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="600px" append-to-body>
+      <el-form ref="miscarriageRef" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="耳号" prop="manageTags">
+              <el-input
+                  v-model="form.manageTags"
+                  placeholder="请输入羊只耳号"
+                  @blur="handleEarTagChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="事件日期" prop="datetime">
+              <el-date-picker clearable
+                              v-model="form.datetime"
+                              type="date"
+                              value-format="YYYY-MM-DD"
+                              placeholder="请选择事件日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="流产原因" prop="reason">
+              <el-select v-model="form.reason" placeholder="请选择流产原因" style="width: 100%;">
+                <el-option
+                    v-for="item in reasonOptions"
+                    :key="item"
+                    :label="item"
+                    :value="item">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="技术员" prop="technician">
+              <el-input v-model="form.technician" placeholder="请输入技术员" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否列胎次" prop="status">
+              <el-select v-model="form.status" placeholder="请选择" style="width: 100%;" @change="handleStatusChange">
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否见胎" prop="exposeType">
+              <el-select v-model="form.exposeType" placeholder="请选择" style="width: 100%;" :disabled="form.status === 1">
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="复检无胎" :value="2"></el-option>
+                <el-option label="返情" :value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="流产羔羊数" prop="miscaLamb">
+              <el-input-number v-model="form.miscaLamb" :min="0" :max="10" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" type="textarea" 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="Miscarriage">
+import {
+  listMiscarriage,
+  getMiscarriage,
+  delMiscarriage,
+  addMiscarriage,
+  updateMiscarriage,
+  getSheepInfo,
+  getReasonOptions
+} from "@/api/miscarriage/miscarriage"
+
+const {proxy} = getCurrentInstance()
+
+const miscarriageList = 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 reasonOptions = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    bsManageTags: null,
+    variety: null,
+    datetime: null,
+    comment: null,
+    technician: null,
+    reason: null,
+    exposeType: null,
+    status: null,
+    miscaLamb: null,
+  },
+  rules: {
+    manageTags: [
+      {required: true, message: "耳号不能为空", trigger: "blur"}
+    ],
+    datetime: [
+      {required: true, message: "事件日期不能为空", trigger: "blur"}
+    ],
+    reason: [
+      {required: true, message: "流产原因不能为空", trigger: "change"}
+    ],
+    status: [
+      {required: true, message: "是否列胎次不能为空", trigger: "change"}
+    ],
+    exposeType: [
+      {required: true, message: "是否见胎不能为空", trigger: "change"}
+    ]
+  }
+})
+
+const {queryParams, form, rules} = toRefs(data)
+
+/** 查询流产记录列表 */
+function getList() {
+  loading.value = true
+  listMiscarriage(queryParams.value).then(response => {
+    miscarriageList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+/** 获取流产原因选项 */
+function getReasonOptionsList() {
+  getReasonOptions().then(response => {
+    reasonOptions.value = response.data
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    manageTags: null,
+    datetime: null,
+    comment: null,
+    technician: null,
+    reason: null,
+    exposeType: null,
+    status: null,
+    miscaLamb: null
+  }
+  proxy.resetForm("miscarriageRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getMiscarriage(_id).then(response => {
+    form.value = response.data
+    form.value.manageTags = response.data.bsManageTags
+    open.value = true
+    title.value = "修改流产记录"
+  })
+}
+
+/** 耳号输入框失焦事件 */
+function handleEarTagChange() {
+  if (form.value.manageTags) {
+    getSheepInfo(form.value.manageTags).then(response => {
+      if (response.data) {
+        // 这里可以显示羊只相关信息或做验证
+        proxy.$modal.msgSuccess("羊只信息验证成功")
+      } else {
+        proxy.$modal.msgError("未找到该耳号对应的羊只信息")
+      }
+    }).catch(() => {
+      proxy.$modal.msgError("羊只信息查询失败")
+    })
+  }
+}
+
+/** 是否列胎次变化事件 */
+function handleStatusChange(value) {
+  if (value === 1) {
+    // 如果选择是，则是否见胎默认选择是
+    form.value.exposeType = 1
+  } else {
+    // 如果选择否，则清空是否见胎的值
+    form.value.exposeType = null
+  }
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["miscarriageRef"].validate(valid => {
+    if (valid) {
+      // 将耳号转换为sheepId保存
+      form.value.sheepId = form.value.manageTags
+
+      if (form.value.id != null) {
+        updateMiscarriage(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addMiscarriage(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 delMiscarriage(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {
+  })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('miscarriage/miscarriage/export', {
+    ...queryParams.value
+  }, `miscarriage_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+getReasonOptionsList()
+</script>
\ No newline at end of file
diff --git a/src/views/produce/bodyManage/body_measure/index.vue b/src/views/produce/bodyManage/body_measure/index.vue
index ebf88b3..9f7b827 100644
--- a/src/views/produce/bodyManage/body_measure/index.vue
+++ b/src/views/produce/bodyManage/body_measure/index.vue
@@ -4,13 +4,32 @@
       <!-- <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="创建时间" 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 label="测量日期" style="width: 308px">
+        <el-date-picker v-model="daterangeMeasureDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
       </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 label="羊舍" prop="sheepfoldId">
+        <el-select v-model="queryParams.sheepfoldId" 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="varietyId" style="width: 308px">
+        <el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
+          <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="羊只类别" prop="sheepTypeId">
+        <el-select v-model="queryParams.sheepTypeId" placeholder="请选择羊只类别" clearable style="min-width:150px">
+          <el-option v-for="type in sheepTypeList" :key="type.id" :label="type.name" :value="type.id" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -40,9 +59,30 @@
 
     <el-table v-loading="loading" :data="body_measureList" @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="manageTags" fixed min-width="100px" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" fixed>
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="测量日期" align="center" prop="measureDate" width="120">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.measureDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
+      <el-table-column label="品种" align="center" prop="varietyName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
+      <el-table-column label="羊只类别" align="center" prop="sheepTypeName" />
+      <el-table-column label="性别" align="center">
+        <template #default="scope">
+          <span>{{ genderMap[scope.row.gender] || '未知' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="胎次" align="center" prop="parity" />
+      <el-table-column label="出生体重(kg)" align="center" prop="birthWeight" min-width="100px" />
+      <el-table-column label="断奶体重(kg)" align="center" prop="weaningWeight" min-width="100px" />
+      <el-table-column label="当前体重(kg)" align="center" prop="currentWeight" min-width="100px" />
       <el-table-column label="体高" align="center" prop="height" />
       <el-table-column label="胸围" align="center" prop="bust" />
       <el-table-column label="体斜长" align="center" prop="bodyLength" />
@@ -53,14 +93,29 @@
       <el-table-column label="尻高" align="center" prop="rumpHeignt" />
       <el-table-column label="腰角宽" align="center" prop="hipWidth" />
       <el-table-column label="十字部高" align="center" prop="hipCrossHeight" />
+      <el-table-column label="繁育状态" align="center" prop="breedStatusName" width="100">
+        <template #default="scope">
+          <span>{{ scope.row.breedStatusName || '未设置' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="泌乳天数" align="center" prop="lactationDay" width="100">
+        <template #default="scope">
+          <span>{{ scope.row.lactationDay || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="怀孕天数" align="center" prop="gestationDay" width="100">
+        <template #default="scope">
+          <span>{{ scope.row.gestationDay || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="配后天数" align="center" prop="postMatingDay" width="100">
+        <template #default="scope">
+          <span>{{ scope.row.postMatingDay || '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="comment" min-width="100px" />
       <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" fixed="right" min-width="130px">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -84,7 +139,10 @@
               <el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="onManageTagsBlur" :disabled="!isAdd"
                 clearable />
             </el-form-item>
-
+            <el-form-item label="测量日期" prop="measureDate">
+              <el-date-picker v-model="form.measureDate" value-format="YYYY-MM-DD" type="date" placeholder="请选择测量日期"
+                :disabled="!isAdd"></el-date-picker>
+            </el-form-item>
             <el-form-item label="体高" prop="height">
               <el-input v-model="form.height" placeholder="请输入体高" :disabled="!isAdd" clearable />
             </el-form-item>
@@ -149,10 +207,11 @@
 </template>
 
 <script setup name="Body_measure">
-import { listBody_measure, getBody_measure, delBody_measure, addBody_measure, updateBody_measure } from "@/api/produce/bodyManage/body_measure"
-import { getCurrentInstance } from 'vue'
+import { listBody_measure, getBody_measure, delBody_measure, addBody_measure, updateBody_measure, getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
 import { getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
-
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
+import { getVarietyOptions } from '@/api/produce/other/fixHoof'
+import { getCurrentInstance } from 'vue'
 const { proxy } = getCurrentInstance()
 
 const body_measureList = ref([])
@@ -166,6 +225,13 @@ const total = ref(0)
 const title = ref("")
 const daterangeCreateTime = ref([])
 const isAdd = ref(false)
+const daterangeMeasureDate = ref([]);
+
+const genderMap = {
+  1: '母',
+  2: '公',
+  3: '阉羊'
+};
 
 const data = reactive({
   form: { manageTags: null, technician: null },
@@ -173,7 +239,10 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     sheepId: null,
+    sheepfoldId: null,
+    varietyId: null,
     manageTags: null,
+    measureDate: null,
     createTime: null
   },
   rules: {
@@ -183,7 +252,12 @@ const data = reactive({
     technician: [
       { required: true, message: '请输入技术员', trigger: 'blur' }
     ],
-  }
+    measureDate: [
+      { required: true, message: '请选择测量日期', trigger: 'change' }
+    ]
+  },
+  sheepfoldName: '',
+  varietyName: '',
 })
 
 const { queryParams, form, rules } = toRefs(data)
@@ -196,6 +270,10 @@ function getList() {
     queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
     queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
   }
+  if (daterangeMeasureDate.value.length > 0) {
+    queryParams.value.params["beginMeasureDate"] = daterangeMeasureDate.value[0];
+    queryParams.value.params["endMeasureDate"] = daterangeMeasureDate.value[1];
+  }
   listBody_measure(queryParams.value).then(response => {
     body_measureList.value = response.rows
     total.value = response.total
@@ -252,6 +330,7 @@ function reset() {
     comment: null,
     technician: null,
     createBy: null,
+    measureDate: null,
     createTime: null
   }
   proxy.resetForm("body_measureRef")
@@ -265,9 +344,14 @@ function handleQuery() {
 
 /** 重置按钮操作 */
 function resetQuery() {
-  daterangeCreateTime.value = []
-  proxy.resetForm("queryRef")
-  handleQuery()
+  daterangeCreateTime.value = [];
+  queryParams.value.sheepfoldId = null;
+  data.sheepfoldName = '';
+  queryParams.value.varietyId = null;
+  data.varietyName = '';
+  daterangeMeasureDate.value = [];
+  proxy.resetForm("queryRef");
+  handleQuery();
 }
 
 // 多选框选中数据
@@ -321,7 +405,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除体尺测量编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delBody_measure(_ids)
   }).then(() => {
     getList()
@@ -336,5 +420,36 @@ function handleExport() {
   }, `body_measure_${new Date().getTime()}.xlsx`)
 }
 
-getList()
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
+}
+//加载品种数据
+const varietyOptions = ref([])
+function loadVarietyOptions() {
+  getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
+    varietyOptions.value = res.rows;
+  })
+}
+
+// 加载羊只类别数据
+const sheepTypeList = ref([]);
+function loadSheepTypeList() {
+  getSheepTypeList().then(response => {
+    sheepTypeList.value = response.rows || [];
+  }).catch(error => {
+    console.error('加载羊只类别失败', error);
+  });
+}
+
+
+onMounted(() => {
+  getSheepfoldOptions()
+  loadSheepTypeList()
+  loadVarietyOptions()
+  getList()
+})
 </script>
diff --git a/src/views/produce/bodyManage/body_score/index.vue b/src/views/produce/bodyManage/body_score/index.vue
index ea09165..837c8e4 100644
--- a/src/views/produce/bodyManage/body_score/index.vue
+++ b/src/views/produce/bodyManage/body_score/index.vue
@@ -4,29 +4,31 @@
       <!-- <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="manageTags">
-        <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
-          style="max-width: 160px;" />
+      <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 label="事件日期" style="width: 308px">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
-      <el-form-item label="体况评分" prop="score">
-        <el-input v-model="queryParams.score" placeholder="请输入体况评分" clearable @keyup.enter="handleQuery"
-          style="max-width: 150px;" />
+      <el-form-item label="管理耳号" prop="manageTags">
+        <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
+          style="max-width: 160px;" />
       </el-form-item>
-      <el-form-item label="羊舍" prop="sheepfold">
-        <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" clearable filterable @keyup.enter="handleQuery">
-          <el-option v-for="item in sheepfoldList" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
+      <el-form-item label="品种" prop="varietyId">
+        <el-select v-model="queryParams.varietyId" placeholder="请选择品种" clearable style="min-width:150px">
+          <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </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="score">
+        <el-input v-model="queryParams.score" placeholder="请输入体况评分" clearable @keyup.enter="handleQuery"
+          style="max-width: 150px;" />
       </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 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>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -39,10 +41,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['body_score:body_score:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
           v-hasPermi="['body_score:body_score:edit']">修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['body_score:body_score:remove']">删除</el-button>
@@ -58,27 +60,29 @@
       <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="manageTags" fixed />
-      <el-table-column label="事件日期" align="center" prop="datetime" width="180">
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="130px" fixed>
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="事件日期" align="center" prop="datetime" min-width="120px">
         <template #default="scope">
           <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" />
+      <el-table-column label="品种" align="center" prop="varietyName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" />
       <el-table-column label="体况评分" align="center" prop="score" />
       <!-- <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="sheepfoldName" min-width="100px" />
+      <el-table-column label="备注" align="center" prop="comment" min-width="130px" />
       <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">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150px" fixed="right">
         <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="150px">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['body_score:body_score:edit']">修改</el-button>
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['body_score:body_score:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['body_score:body_score:remove']">删除</el-button>
         </template>
@@ -133,8 +137,8 @@
 
 <script setup name="Body_score">
 import { listBody_score, getBody_score, delBody_score, addBody_score, updateBody_score } from "@/api/produce/bodyManage/body_score"
-import { listSheepfold } from "@/api/produce/manage_sheep/trans_group"
-import { checkSheepByManageTags } from "@/api/produce/other/fixHoof"
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
+import { checkSheepByManageTags, getVarietyOptions } from "@/api/produce/other/fixHoof"
 import { getCurrentInstance, ref, reactive, toRefs } from 'vue'
 
 const { proxy } = getCurrentInstance()
@@ -167,6 +171,8 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     manageTags: null,
+    varietyId: null,
+    sheepfold: null,
     score: null,
     createTime: null
   },
@@ -177,6 +183,9 @@ const data = reactive({
     score: [
       { required: true, message: '请输入体况评分', trigger: 'blur' }
     ],
+    datetime:[
+      { required: true, message: '请选择事件日期', trigger: 'blur' }
+    ],
     technician: [
       { required: true, message: '请输入技术员', trigger: 'blur' }
     ]
@@ -234,14 +243,12 @@ function onManageTagsBlur() {
   });
 }
 
-// 加载羊舍列表
-function loadSheepfoldList() {
-  listSheepfold().then(response => {
-    sheepfoldList.value = response.rows || [];
-  }).catch(err => {
-    console.error("加载羊舍列表失败：", err);
-    proxy.$modal.msgError("加载羊舍列表失败，请刷新页面重试");
-  });
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
 }
 
 // 取消按钮
@@ -276,6 +283,7 @@ function handleQuery() {
 function resetQuery() {
   daterangeDatetime.value = []
   daterangeCreateTime.value = []
+  queryParams.value.varietyId = null;
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -335,7 +343,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除体况评分编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delBody_score(_ids)
   }).then(() => {
     getList()
@@ -350,6 +358,17 @@ function handleExport() {
   }, `body_score_${new Date().getTime()}.xlsx`)
 }
 
-getList()
-loadSheepfoldList(); 
+//加载品种数据
+const varietyOptions = ref([])
+function loadVarietyOptions() {
+  getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
+    varietyOptions.value = res.rows;
+  })
+}
+
+onMounted(() => {
+  loadVarietyOptions()
+  getSheepfoldOptions()
+  getList()
+})
 </script>
diff --git a/src/views/produce/bodyManage/breast_rating/index.vue b/src/views/produce/bodyManage/breast_rating/index.vue
index 28c141f..8571353 100644
--- a/src/views/produce/bodyManage/breast_rating/index.vue
+++ b/src/views/produce/bodyManage/breast_rating/index.vue
@@ -4,29 +4,42 @@
       <!-- <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="创建时间" 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 label="事件日期" style="width: 308px">
+        <el-date-picker v-model="daterangeEventDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入耳号搜索" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
       </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 label="品种" prop="varietyId">
+        <el-select v-model="queryParams.varietyId" placeholder="请选择品种" clearable style="min-width:150px">
+          <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="羊舍" prop="sheepfoldId">
+        <el-select v-model="queryParams.sheepfoldId" 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>
         <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="['breast_rating:breast_rating:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
           v-hasPermi="['breast_rating:breast_rating:edit']">修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['breast_rating:breast_rating:remove']">删除</el-button>
@@ -40,27 +53,33 @@
 
     <el-table v-loading="loading" :data="breast_ratingList" @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="manageTags" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="150" fixed>
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="事件日期" align="center" prop="eventDate" min-width="120px">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" />
+      <el-table-column label="品种" align="center" prop="varietyName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="120px" />
       <el-table-column label="乳房深度" align="center" prop="depth" />
       <el-table-column label="乳房长度" align="center" prop="length" />
       <el-table-column label="乳房位置" align="center" prop="position" />
       <el-table-column label="乳房附着" align="center" prop="adbere" />
-      <el-table-column label="乳房间隔度" align="center" prop="spacing" />
+      <el-table-column label="乳房间隔度" align="center" prop="spacing" min-width="120px" />
       <el-table-column label="乳房评分" align="center" prop="score" />
       <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="150">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120px" fixed="right">
         <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="120px">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['breast_rating:breast_rating:edit']">修改</el-button>
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['breast_rating:breast_rating:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['breast_rating:breast_rating:remove']">删除</el-button>
         </template>
@@ -80,6 +99,11 @@
           <el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="onManageTagsBlur" clearable
             :disabled="!isAdd" />
         </el-form-item>
+        <el-form-item label="事件日期" prop="eventDate">
+          <el-date-picker clearable v-model="form.eventDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择事件日期"
+            :disabled="!isAdd">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="乳房深度" prop="depth">
           <el-input v-model="form.depth" placeholder="请输入乳房深度" :disabled="!isAdd" />
         </el-form-item>
@@ -117,7 +141,8 @@
 
 <script setup name="Breast_rating">
 import { listBreast_rating, getBreast_rating, delBreast_rating, addBreast_rating, updateBreast_rating } from "@/api/produce/bodyManage/breast_rating"
-import { checkSheepByManageTags } from "@/api/produce/other/fixHoof"
+import { checkSheepByManageTags, getVarietyOptions } from "@/api/produce/other/fixHoof"
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { getCurrentInstance, reactive, ref } from "vue"
 
 const { proxy } = getCurrentInstance()
@@ -132,11 +157,13 @@ const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
 const daterangeCreateTime = ref([])
+const daterangeEventDate = ref([]);
 const isAdd = ref(false)
 const data = reactive({
   form: {
     id: null,
     manageTags: null,
+    eventDate: null,
     depth: null,
     length: null,
     position: null,
@@ -155,6 +182,9 @@ const data = reactive({
     manageTags: [
       { required: true, message: '请输入管理耳号', trigger: 'blur' }
     ],
+    eventDate:[
+      { required: true, message: '请选择事件日期', trigger: 'blur' }
+    ],
     score: [
       { required: true, message: '请输入乳房评分', trigger: 'blur' }
     ],
@@ -170,6 +200,10 @@ const { queryParams, form, rules } = toRefs(data)
 function getList() {
   loading.value = true
   queryParams.value.params = {}
+  if (daterangeEventDate.value.length) {
+    queryParams.value.params["beginEventDate"] = daterangeEventDate.value[0]
+    queryParams.value.params["endEventDate"] = daterangeEventDate.value[1]
+  }
   if (daterangeCreateTime.value.length) {
     queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
     queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
@@ -241,6 +275,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
+  daterangeEventDate.value = [];
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -300,7 +335,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除乳房评分编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delBreast_rating(_ids)
   }).then(() => {
     getList()
@@ -315,5 +350,25 @@ function handleExport() {
   }, `breast_rating_${new Date().getTime()}.xlsx`)
 }
 
-getList()
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
+}
+
+//加载品种数据
+const varietyOptions = ref([])
+function loadVarietyOptions() {
+  getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
+    varietyOptions.value = res.rows;
+  })
+}
+
+onMounted(() => {
+  loadVarietyOptions()
+  getSheepfoldOptions()
+  getList()
+})
 </script>
diff --git a/src/views/produce/manage_sheep/add_sheep/index.vue b/src/views/produce/manage_sheep/add_sheep/index.vue
index 1380d22..24a1cc5 100644
--- a/src/views/produce/manage_sheep/add_sheep/index.vue
+++ b/src/views/produce/manage_sheep/add_sheep/index.vue
@@ -14,9 +14,24 @@
             <el-input v-model="form.earNumber" placeholder="请输入耳号" @blur="handleEarNumberBlur" />
           </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="ranchId">
+            <el-select v-model="form.ranchId" placeholder="请选择牧场" clearable @change="handleRanchChange" required>
+              <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName" :value="ranch.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="10">
           <el-form-item label="羊舍" prop="sheepfold">
-            <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
+            <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable :disabled="!form.ranchId">
               <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -61,7 +76,7 @@
         </el-col>
         <el-col :span="10">
           <el-form-item label="胎次" prop="parity">
-            <el-input v-model="form.parity" placeholder="请输入胎次" />
+            <el-input-number v-model="form.parity" :min="0" label="胎次" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -75,13 +90,16 @@
           </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 label="羊只类别" prop="typeId">
+            <el-select v-model="form.typeId" placeholder="请选择羊只类别" clearable>
+              <el-option v-for="type in sheepTypeList" :key="type.id" :label="type.name" :value="Number(type.id)" />
+            </el-select>
           </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="请输入技术员" />
@@ -102,26 +120,28 @@
         <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" />
-      <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>
+    <!-- 导入弹窗 -->
+    <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" />
+        <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>
+  </div>
 </template>
 
 <script setup>
-import { ref, onMounted, getCurrentInstance } from 'vue'
+import { ref, getCurrentInstance } from 'vue'
 import request from '@/utils/request'
 import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep'
+import { getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
+import { listRanch } from '@/api/produce/manage_sheep/trans_group'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { getToken } from '@/utils/auth'
 
@@ -129,6 +149,7 @@ import { getToken } from '@/utils/auth'
 const { proxy } = getCurrentInstance()
 const form = ref({
   earNumber: '',
+  ranchId: null,
   sheepfold: '',
   father: '',
   mother: '',
@@ -137,24 +158,29 @@ const form = ref({
   gender: '',
   parity: '',
   varietyId: '',
+  typeId: null,
   joinDate: '',
   comment: '',
   technician: ''
 })
 const formRef = ref(null)
-
+const sheepfoldOptions = ref([])
+const varietyOptions = ref([])
+const ranchOptions = ref([])
 const rules = {
   earNumber: [
     { required: true, message: '请输入耳号', trigger: 'blur' },
     { validator: checkEarNumberExists, trigger: 'blur' }
   ],
+  ranchId: [{ required: true, message: '请选择牧场', trigger: 'change' }],
   sheepfold: [{ required: true, message: '请选择羊舍', trigger: 'change' }],
-  bornWeight: [{ required: true, message: '请输入出生体重', trigger: 'blur' }],
+  bornWeight: [{ required: true, message: '请输入出生体重', trigger: 'change' }],
   birthday: [{ required: true, message: '请选择出生日期', trigger: 'change' }],
   gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
   varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }],
-  joinDate:[{ required: true, message: '请选择入群日期', trigger: 'change' }],
-  technician:[{ required: true, message: '请输入技术员', trigger: 'change' }],
+  typeId: [{ required: true, message: '请选择羊只类别', trigger: 'change' }],
+  joinDate: [{ required: true, message: '请选择入群日期', trigger: 'change' }],
+  technician: [{ required: true, message: '请输入技术员', trigger: 'change' }],
 }
 
 // 校验耳号是否存在
@@ -189,15 +215,33 @@ function handleEarNumberBlur() {
   formRef.value.validateField('earNumber')
 }
 
+function handleRanchChange(ranchId) {
+  form.value.sheepfold = '';
+  sheepfoldOptions.value = [];
 
-const sheepfoldOptions = ref([])
-const varietyOptions = ref([])
+  if (!ranchId) return;
+
+  listSheepfold({
+    pageNum: 1,
+    pageSize: 9999,
+    ranchId: ranchId
+  }).then(res => {
+    if (res.rows && res.rows.length > 0) {
+      sheepfoldOptions.value = res.rows || [];
+    } else {
+      proxy.$modal.msgWarning(`该牧场下暂无羊舍数据`);
+    }
+  }).catch(error => {
+    console.error('加载羊舍数据失败', error);
+    proxy.$modal.msgError('获取羊舍数据失败');
+  });
+}
 
 //羊舍列表
 function getSheepfoldOptions() {
-  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
-    sheepfoldOptions.value = res.rows || []
-  })
+  // listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+  //   sheepfoldOptions.value = res.rows || []
+  // })
 }
 
 //品种列表
@@ -211,6 +255,29 @@ function getVarietyOptions() {
   })
 }
 
+//加载所有牧场列表
+function loadRanchList() {
+  listRanch().then(res => {
+    ranchOptions.value = res.rows.map(ranch => ({
+      id: ranch.id,
+      ranchName: ranch.ranch
+    }));
+  }).catch(error => {
+    console.error('加载牧场列表失败', error);
+    proxy.$modal.msgError('获取牧场数据失败');
+  });
+}
+
+// 加载羊只类别数据
+const sheepTypeList = ref([]);
+function loadSheepTypeList() {
+  getSheepTypeList().then(response => {
+    sheepTypeList.value = response.rows || [];
+  }).catch(error => {
+    console.error('加载羊只类别失败', error);
+  });
+}
+
 //确保日期格式一致
 function formatDate(date) {
   if (!date) return null;
@@ -237,6 +304,7 @@ function submitForm() {
     addSheep(formData).then(res => {
       if (res.code === 200) {
         proxy.$modal.msgSuccess('新增成功');
+        formRef.value.clearValidate();
         resetForm();
       } else {
         proxy.$modal.msgError(res.msg || '新增失败');
@@ -254,8 +322,9 @@ function resetForm() {
     bornWeight: '',
     birthday: '',
     gender: '',
-    parity: '',
+    parity: 0,
     varietyId: '',
+    typeId: null,
     joinDate: '',
     comment: '',
     technician: ''
@@ -312,10 +381,12 @@ function handleImportError(err) {
   proxy.$modal.msgError('导入失败：' + msg)
 }
 
-
-getSheepfoldOptions()
-getVarietyOptions()
-
+onMounted(() => {
+  getSheepfoldOptions()
+  loadSheepTypeList()
+  loadRanchList()
+  getVarietyOptions()
+})
 </script>
 
 <style scoped>
diff --git a/src/views/produce/manage_sheep/changeComment/index.vue b/src/views/produce/manage_sheep/changeComment/index.vue
index 775410f..2328cf1 100644
--- a/src/views/produce/manage_sheep/changeComment/index.vue
+++ b/src/views/produce/manage_sheep/changeComment/index.vue
@@ -9,6 +9,10 @@
           @keyup.enter="handleQuery"
         />
       </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 label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
@@ -21,9 +25,10 @@
         <el-input v-model="queryParams.oldComment" placeholder="请输入原备注" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
       </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 label="羊舍" prop="sheepfoldId">
+        <el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" 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>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -36,10 +41,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['changeComment:changeComment:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
           v-hasPermi="['changeComment:changeComment:edit']">修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['changeComment:changeComment:remove']">删除</el-button>
@@ -55,19 +60,21 @@
       <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="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="管理耳号" align="center" prop="manageTags" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
       <el-table-column label="新备注" align="center" prop="newComment" />
       <el-table-column label="原备注" align="center" prop="oldComment" />
       <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="['changeComment:changeComment:edit']">修改</el-button>
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['changeComment:changeComment:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['changeComment:changeComment:remove']">删除</el-button>
         </template>
@@ -90,7 +97,7 @@
           <el-input v-model="form.newComment" placeholder="请输入新备注" :disabled="!isAddMode" />
         </el-form-item>
         <el-form-item label="原备注" prop="oldComment">
-          <el-input v-model="form.oldComment" placeholder="请输入原备注" :disabled="!isAddMode" />
+          <el-input v-model="form.oldComment" placeholder="请输入原备注" disabled />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -106,6 +113,7 @@
 <script setup name="ChangeComment">
 import { listChangeComment, getChangeComment, delChangeComment, addChangeComment, updateChangeComment } from "@/api/produce/manage_sheep/changeComment"
 import { getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 
 const { proxy } = getCurrentInstance()
 
@@ -127,6 +135,7 @@ const data = reactive({
     pageSize: 10,
     sheepId: null,
     manageTags: null,
+    sheepfoldId: null,
     newComment: null,
     oldComment: null,
     createTime: null
@@ -151,6 +160,9 @@ function getList() {
     queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
     queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
   }
+  if (queryParams.value.sheepfoldId) {
+    queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
+  }
   listChangeComment(queryParams.value).then(response => {
     changeCommentList.value = response.rows
     total.value = response.total
@@ -208,6 +220,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
+  queryParams.value.sheepfoldId = null
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -270,7 +283,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除改备注编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delChangeComment(_ids)
   }).then(() => {
     getList()
@@ -285,5 +298,16 @@ function handleExport() {
   }, `changeComment_${new Date().getTime()}.xlsx`)
 }
 
-getList()
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
+}
+
+onMounted(() => {
+  getSheepfoldOptions();
+  getList();
+});
 </script>
diff --git a/src/views/produce/manage_sheep/changeEar/index.vue b/src/views/produce/manage_sheep/changeEar/index.vue
index 0486f44..6ac38a4 100644
--- a/src/views/produce/manage_sheep/changeEar/index.vue
+++ b/src/views/produce/manage_sheep/changeEar/index.vue
@@ -4,6 +4,10 @@
       <!-- <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="创建时间" style="width: 300px">
+        <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 label="耳号" prop="manageTag">
         <el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
@@ -16,9 +20,10 @@
         <el-input v-model="queryParams.oldTag" placeholder="请输入旧耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
       </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 label="羊舍" prop="sheepfoldId">
+        <el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" 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>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -31,10 +36,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['changeEar:changeEar:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
           v-hasPermi="['changeEar:changeEar:edit']">修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['changeEar:changeEar:remove']">删除</el-button>
@@ -50,7 +55,14 @@
       <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="sheepId" /> -->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="耳号" align="center" prop="manageTags" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" />
       <el-table-column label="耳号类型" align="center" prop="earType">
         <template #default="scope">
           {{ scope.row.earType === 0 ? '电子耳号' : '管理耳号' }}
@@ -60,15 +72,10 @@
       <el-table-column label="旧耳号" align="center" prop="oldTag" />
       <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">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['changeEar:changeEar:edit']">修改</el-button>
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['changeEar:changeEar:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['changeEar:changeEar:remove']">删除</el-button>
         </template>
@@ -87,7 +94,6 @@
         <el-form-item label="耳号" prop="earNumber">
           <el-input v-model="form.earNumber" placeholder="请输入管理耳号或电子耳号" @change="fetchOldTag" :disabled="!isAddMode" />
         </el-form-item>
-
         <el-form-item label="耳号类型" prop="earType">
           <el-select v-model="form.earType" placeholder="请选择耳号类型" @change="fetchOldTag" :disabled="!isAddMode">
             <el-option label="电子耳号" :value="0"></el-option>
@@ -98,7 +104,7 @@
           <el-input v-model="form.newTag" placeholder="请输入新耳号/电子耳号" @blur="checkNewTagExists" :disabled="!isAddMode" />
         </el-form-item>
         <el-form-item label="旧耳号" prop="oldTag">
-          <el-input v-model="form.oldTag" placeholder="请输入旧耳号/电子耳号" :disabled="!isAddMode" />
+          <el-input v-model="form.oldTag" placeholder="请输入旧耳号/电子耳号" disabled />
         </el-form-item>
         <el-form-item label="备注" prop="comment" v-if="!isAddMode">
           <el-input v-model="form.comment" type="textarea" placeholder="请输入内容" :disabled="!isAddMode" />
@@ -115,8 +121,8 @@
 </template>
 
 <script setup name="ChangeEar">
-import { listChangeEar, getChangeEar, delChangeEar, addChangeEar, updateChangeEar, getSheepByEarNumber,checkTagExists } from "@/api/produce/manage_sheep/changeEar"
-
+import { listChangeEar, getChangeEar, delChangeEar, addChangeEar, updateChangeEar, getSheepByEarNumber, checkTagExists } from "@/api/produce/manage_sheep/changeEar"
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 const { proxy } = getCurrentInstance()
 
 const changeEarList = ref([])
@@ -138,6 +144,7 @@ const data = reactive({
     pageSize: 10,
     manageTags: null,
     // sheepId: null,
+    sheepfoldId: null,
     earType: null,
     newTag: null,
     oldTag: null,
@@ -168,6 +175,9 @@ async function getList() {
   if (queryParams.value.manageTags) {
     queryParams.value.params["manageTags"] = queryParams.value.manageTags;
   }
+  if (queryParams.value.sheepfoldId) {
+    queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
+  }
   if (daterangeCreateTime.value && daterangeCreateTime.value.length > 0) {
     queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0];
     queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1];
@@ -214,7 +224,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
-
+  queryParams.value.sheepfoldName = null
   queryParams.value.manageTags = null
   queryParams.value.newTag = null
   queryParams.value.oldTag = null
@@ -347,7 +357,7 @@ function fetchOldTag() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除修改电子耳号记录编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delChangeEar(_ids)
   }).then(() => {
     getList()
@@ -362,8 +372,16 @@ function handleExport() {
   }, `changeEar_${new Date().getTime()}.xlsx`)
 }
 
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
+}
 
 onMounted(() => {
+  getSheepfoldOptions();
   getList();
 });
 </script>
diff --git a/src/views/produce/manage_sheep/changeVariety/index.vue b/src/views/produce/manage_sheep/changeVariety/index.vue
index 4c0eab6..70beb33 100644
--- a/src/views/produce/manage_sheep/changeVariety/index.vue
+++ b/src/views/produce/manage_sheep/changeVariety/index.vue
@@ -9,6 +9,10 @@
           @keyup.enter="handleQuery"
         />
       </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 label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="width: 150px;" />
@@ -23,9 +27,10 @@
           <el-option v-for="item in varietyOptions" :key="item.value" :label="item.label" :value="item.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 label="羊舍" prop="sheepfoldId">
+        <el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" 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>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -38,10 +43,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['changeVariety:changeVariety:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
           v-hasPermi="['changeVariety:changeVariety:edit']">修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['changeVariety:changeVariety:remove']">删除</el-button>
@@ -57,20 +62,22 @@
       <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="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="管理耳号" align="center" prop="manageTags" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
       <el-table-column label="原品种" align="center" prop="varietyOld" />
       <el-table-column label="新品种" align="center" prop="varietyNew" />
       <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">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['changeVariety:changeVariety:edit']">修改</el-button>
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['changeVariety:changeVariety:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['changeVariety:changeVariety:remove']">删除</el-button>
         </template>
@@ -90,7 +97,7 @@
           <el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="onManageTagsBlur" :disabled="!isAdd" />
         </el-form-item>
         <el-form-item label="原品种" prop="varietyOld">
-          <el-input v-model="form.varietyOld" placeholder="请输入原品种" :disabled="!isAdd" />
+          <el-input v-model="form.varietyOld" placeholder="请输入原品种" disabled />
         </el-form-item>
         <el-form-item label="新品种" prop="varietyNew">
           <el-select v-model="form.varietyNew" placeholder="请选择新品种" clearable filterable :disabled="!isAdd">
@@ -113,6 +120,7 @@
 
 <script setup name="ChangeVariety">
 import { listChangeVariety, getChangeVariety, delChangeVariety, addChangeVariety, updateChangeVariety, getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { listVariety } from '@/api/variety/variety'
 
 const { proxy } = getCurrentInstance()
@@ -139,6 +147,7 @@ const data = reactive({
     pageSize: 10,
     // sheepId: null,
     manageTags: null,
+    sheepfoldId: null,
     varietyOld: null,
     varietyNew: null,
     createTime: null
@@ -166,6 +175,9 @@ function getList() {
     queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
     queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
   }
+  if (queryParams.value.sheepfoldId) {
+    queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
+  }
   listChangeVariety(queryParams.value).then(response => {
     changeVarietyList.value = response.rows
     total.value = response.total
@@ -234,6 +246,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
+  queryParams.value.sheepfoldId = null;
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -298,7 +311,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除改品种记录编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delChangeVariety(_ids)
   }).then(() => {
     getList()
@@ -313,8 +326,18 @@ function handleExport() {
   }, `changeVariety_${new Date().getTime()}.xlsx`)
 }
 
+
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
+}
+
 onMounted(() => {
   loadVarietyOptions();
+  getSheepfoldOptions();
   getList();
 });
 </script>
diff --git a/src/views/produce/manage_sheep/trans_group/index.vue b/src/views/produce/manage_sheep/trans_group/index.vue
index c6679ee..d6e517d 100644
--- a/src/views/produce/manage_sheep/trans_group/index.vue
+++ b/src/views/produce/manage_sheep/trans_group/index.vue
@@ -1,16 +1,29 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <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 label="转群日期" style="width: 308px">
+        <el-date-picker v-model="daterangeTransDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery"
           style="width: 150px;" />
       </el-form-item>
-      <el-form-item label="转出羊舍" prop="foldFrom">
+      <el-form-item label="事件类型" prop="eventType">
+        <el-select v-model="queryParams.eventType" placeholder="请选择事件类型" style="min-width:150px" clearable required>
+          <el-option v-for="dict in eventTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="转出羊舍" prop="foldFrom" style="width: 308px">
         <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-form-item label="转入羊舍" prop="foldTo" style="width: 308px">
         <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>
@@ -20,15 +33,16 @@
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="羊只类型" prop="sheepTypeId">
+        <el-select v-model="queryParams.sheepTypeId" placeholder="请选择羊只类型" clearable style="min-width:150px">
+          <el-option v-for="type in sheepTypeOptions" :key="type.id" :label="type.name" :value="type.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-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -40,10 +54,10 @@
         <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-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> -->
       <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>
@@ -57,30 +71,34 @@
 
     <el-table v-loading="loading" :data="trans_groupList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="管理耳号" align="center" prop="manageTags" />
-      <el-table-column label="转出羊舍" align="center" prop="foldFromName" />
-      <el-table-column label="转入羊舍" align="center" prop="foldToName" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="120" fixed>
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="转群日期" align="center" prop="transDate" min-width="120" />
+      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" />
+      <el-table-column label="事件类型" align="center" prop="eventTypeText" />
+      <el-table-column label="转出羊舍" align="center" prop="foldFromName" min-width="130" />
+      <el-table-column label="转入羊舍" align="center" prop="foldToName" min-width="130" />
       <el-table-column label="品种" align="center" prop="varietyName" />
-      <el-table-column label="转群原因" align="center" prop="reasonText" />
+      <el-table-column label="羊只类别" align="center" prop="sheepTypeName" />
+      <el-table-column label="转群原因" align="center" prop="reasonText" min-width="120" />
       <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="状态" align="center" prop="status">
+      <!-- <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> -->
+      <el-table-column label="备注" align="center" prop="comment" min-width="120" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime">
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="160" fixed="right">
         <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)"
+          <!-- <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
             v-hasPermi="['trans_group:trans_group:approve']">
             审批
-          </el-button>
+          </el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['trans_group:trans_group:remove']">
             删除
@@ -96,21 +114,40 @@
     <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="管理耳号" prop="manageTags">
-          <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
-            style="width: 100%" @change="loadSheepInfo" :disabled="!isAdd">
-            <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
-              :value="sheep.manageTags" />
+          <div style="display: flex; align-items: center; gap: 8px;">
+            <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
+              style="width: 100%; flex:1;" @change="loadSheepInfo" :disabled="!isAdd">
+              <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
+                :value="sheep.manageTags" />
+            </el-select>
+            <span v-if="form.manageTags?.length > 0" class="tag-count">
+              已选 {{ form.manageTags.length }} 个
+            </span>
+          </div>
+        </el-form-item>
+        <el-form-item label="事件类型" prop="eventType">
+          <el-select v-model="form.eventType" placeholder="请选择事件类型" clearable required>
+            <el-option v-for="dict in eventTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
+        <el-form-item label="牧场" prop="ranchId">
+          <el-select v-model="form.ranchId" placeholder="请选择牧场" clearable @change="handleRanchChange">
+            <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName" :value="ranch.id" />
+          </el-select>
+        </el-form-item>
+
         <el-form-item label="转出羊舍" prop="foldFrom">
-          <el-select v-model="form.foldFrom" placeholder="请选择转出羊舍" clearable @change="handleSheepFilter"
-            :disabled="!isAdd">
-            <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
+          <el-select v-model="form.foldFrom" placeholder="请选择转出羊舍" clearable :disabled="!form.ranchId"
+            @change="handleSheepFilter">
+            <el-option v-for="fold in currentRanchSheepfolds" :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 :disabled="!isAdd">
-            <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
+          <el-select v-model="form.foldTo" placeholder="请选择转入羊舍" clearable :disabled="!form.ranchId">
+            <el-option v-for="fold in currentRanchSheepfolds" :key="fold.id" :label="fold.sheepfoldName"
+              :value="fold.id" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="isAdd" label="羊只类型" prop="sheepTypeId">
@@ -124,6 +161,10 @@
               :value="Number(dict.value)" />
           </el-select>
         </el-form-item>
+        <el-form-item label="转群日期" prop="transDate">
+          <el-date-picker v-model="form.transDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择转群日期"
+            style="width: 100%" required />
+        </el-form-item>
         <el-form-item label="技术员" prop="technician">
           <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
@@ -135,53 +176,57 @@
         </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="耳号">
-        <el-input v-model="displayManageTags" disabled />
-      </el-form-item>
-      <el-form-item label="转出羊舍">
-        <el-input :value="sheepfoldNameMap[approveForm.foldFrom] || approveForm.foldFrom" disabled />
-      </el-form-item>
-      <el-form-item label="转入羊舍">
-        <el-input :value="sheepfoldNameMap[approveForm.foldTo] || approveForm.foldTo" disabled />
-      </el-form-item>
-      <el-form-item label="品种">
-        <el-input :value="approveForm.varietyName" disabled />
-      </el-form-item>
-      <el-form-item label="转群原因">
-        <el-input :value="approveForm.reasonText" disabled />
-      </el-form-item>
-      <el-form-item label="状态">
-        <el-input :value="approveForm.statusText" disabled />
-      </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>
+    <!-- 审批对话框 -->
+    <!-- <el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
+      <el-form ref="approveFormRef" :model="approveForm" label-width="120px">
+        <el-form-item label="耳号">
+          <el-input v-model="displayManageTags" disabled />
+        </el-form-item>
+        <el-form-item label="事件类型">
+          <el-input :value="approveForm.eventTypeText || '未知'" disabled />
+        </el-form-item>
+        <el-form-item label="转出羊舍">
+          <el-input :value="sheepfoldNameMap[approveForm.foldFrom] || approveForm.foldFrom" disabled />
+        </el-form-item>
+        <el-form-item label="转入羊舍">
+          <el-input :value="sheepfoldNameMap[approveForm.foldTo] || approveForm.foldTo" disabled />
+        </el-form-item>
+        <el-form-item label="品种">
+          <el-input :value="approveForm.varietyName" disabled />
+        </el-form-item>
+        <el-form-item label="转群原因">
+          <el-input :value="approveForm.reasonText" disabled />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-input :value="approveForm.statusText" disabled />
+        </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> -->
+  </div>
 </template>
 
 <script setup name="Trans_group">
-import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group, approveScTransGroup } from '@/api/produce/manage_sheep/trans_group'
+import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group, approveScTransGroup, listRanch } from '@/api/produce/manage_sheep/trans_group'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
+import { getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
 import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance();
-const { trans_group_reason, status } = proxy.useDict('trans_group_reason', 'status');
+const { trans_group_reason, status, trans_group_event_type } = proxy.useDict('trans_group_reason', 'status', 'trans_group_event_type');
 
 const trans_groupList = ref([]);
 const open = ref(false);
@@ -192,39 +237,50 @@ const single = ref(true);
 const multiple = ref(false);
 const total = ref(0);
 const title = ref('');
+const daterangeTransDate = ref([]);
 const daterangeCreateTime = ref([]);
-
-const approveDialog = ref(false);
-const approveForm = ref({});
-const displayManageTags = ref('');
+const eventTypeOptions = trans_group_event_type || [];
+// const approveDialog = ref(false);
+// const approveForm = ref({});
+// const displayManageTags = ref('');
 const sheepOptions = ref([]);
 const sheepfoldOptions = ref([]);
 const sheepfoldNameMap = ref({});
 const varietyOptions = ref([]);
 const sheepTypeOptions = ref([]);
 const isAdd = ref(false);
+const ranchOptions = ref([]);
+const currentRanchSheepfolds = ref([]);
 
 const data = reactive({
   form: {
     manageTags: [],
     tagDetails: {},
+    eventType: null,
+    transDate: null,
   },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     sheepId: null,
     manageTags: null,
+    eventType: null,
+    ranchId: null,
     foldTo: null,
     foldFrom: null,
     varietyId: null,
+    sheepTypeId: null,
     status: null,
     createTime: null,
   },
   rules: {
     manageTags: [{ required: true, message: '请输入耳号', trigger: 'blur' }],
+    eventType: [{ required: true, message: '请选择事件类型', trigger: 'change' }],
+    ranchId: [{ required: true, message: '请选择牧场', trigger: 'change' }],
     foldTo: [{ required: true, message: '请选择转入羊舍', trigger: 'change' }],
     varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }],
     reason: [{ required: true, message: '请选择转群原因', trigger: 'change' }],
+    transDate: [{ required: true, message: '请选择转群日期', trigger: 'change' }],
     technician: [{ required: true, message: '请输入技术员', trigger: 'blur' }],
   },
 });
@@ -238,6 +294,13 @@ function getList() {
     queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0];
     queryParams.value.params.endCreateTime = daterangeCreateTime.value[1];
   }
+  if (daterangeTransDate.value?.length) {
+    queryParams.value.params.beginTransDate = daterangeTransDate.value[0];
+    queryParams.value.params.endTransDate = daterangeTransDate.value[1];
+  }
+  if (queryParams.value.sheepTypeId !== null && queryParams.value.sheepTypeId !== undefined) {
+    queryParams.value.params.sheepTypeId = queryParams.value.sheepTypeId;
+  }
   listTrans_group(queryParams.value).then((res) => {
     trans_groupList.value = res.rows;
     total.value = res.total;
@@ -250,6 +313,7 @@ function reset() {
   form.value = {
     id: null,
     sheepId: null,
+    ranchId: null,
     foldFrom: null,
     foldTo: null,
     varietyId: null,
@@ -268,10 +332,17 @@ function reset() {
 
 //新增时判断筛选条件
 async function handleSheepFilter() {
-  const { foldFrom, sheepTypeId } = form.value;
+  const { foldFrom, sheepTypeId, ranchId } = form.value;
   let isOnlySheepfold = false;
   let isOnlyTypeOrCombined = false;
 
+  if (!ranchId) {
+    form.value.manageTags = [];
+    sheepOptions.value = [];
+    proxy.$message.warning("请先选择牧场");
+    return;
+  }
+
   if (foldFrom && !sheepTypeId) {
     isOnlySheepfold = true;
   } else if (!foldFrom && sheepTypeId) {
@@ -285,64 +356,98 @@ async function handleSheepFilter() {
   }
 
   if (isOnlySheepfold) {
-    await loadSheepBySheepfoldOnly(foldFrom);
-  }
-  else if (isOnlyTypeOrCombined) {
+    await loadSheepBySheepfoldOnly(foldFrom, ranchId);
+  } else if (isOnlyTypeOrCombined) {
     form.value.manageTags = [];
     let loadedSheep = [];
 
     if (foldFrom && sheepTypeId) {
-      loadedSheep = await loadSheepBySheepfoldAndType(foldFrom, sheepTypeId);
+      loadedSheep = await loadSheepBySheepfoldAndType(foldFrom, sheepTypeId, ranchId);
     } else if (sheepTypeId) {
-      loadedSheep = await loadSheepByTypeOnly(sheepTypeId);
+      loadedSheep = await loadSheepByTypeOnly(sheepTypeId, ranchId);
     }
 
     if (loadedSheep.length > 0) {
       form.value.manageTags = loadedSheep.map((sheep) => sheep.manageTags);
       await loadSheepInfo();
+    } else {
+      proxy.$message.info("未查询到符合条件的耳号");
     }
   }
 }
 
-//转群类型列表
-function getSheepTypeList() {
-  return new Promise((resolve, reject) => {
-    request({
-      url: '/base/base/list',
-      method: 'get',
-      params: { pageNum: 1, pageSize: 9999 },
-    }).then((res) => {
-      sheepTypeOptions.value = res.rows.map(item => ({
-        id: Number(item.id),
-        name: item.name || item.typeName
-      })) || [];
-      resolve();
-    }).catch((error) => {
-      console.error('获取羊只类型失败', error);
-      proxy.$modal.msgError('加载羊只类型失败，请重试');
-      reject(error);
-    });
+
+//加载所有牧场列表
+function loadRanchList() {
+  listRanch().then(res => {
+    ranchOptions.value = res.rows.map(ranch => ({
+      id: ranch.id,
+      ranchName: ranch.ranch
+    }));
+  }).catch(error => {
+    console.error('加载牧场列表失败', error);
+    proxy.$modal.msgError('获取牧场数据失败');
+  });
+}
+
+//切换牧场时触发
+function handleRanchChange(ranchId) {
+  form.value.foldFrom = null;
+  form.value.foldTo = null;
+
+  if (!ranchId) {
+    currentRanchSheepfolds.value = [];
+    return;
+  }
+
+  request({
+    url: '/sheepfold_management/sheepfold_management/list',
+    method: 'get',
+    params: { ranchId, pageNum: 1, pageSize: 9999 }
+  }).then(res => {
+    currentRanchSheepfolds.value = res.rows || [];
+    if (currentRanchSheepfolds.value.length === 0) {
+      proxy.$modal.msgWarning(`所选牧场（ID:${ranchId}）暂无羊舍数据`);
+    }
+  }).catch(error => {
+    console.error('加载牧场羊舍失败', error);
+    proxy.$modal.msgError('获取羊舍数据失败');
+    currentRanchSheepfolds.value = [];
   });
 }
 
 //只通过羊舍
-async function loadSheepBySheepfoldOnly(sheepfoldId) {
+async function loadSheepBySheepfoldOnly(sheepfoldId, ranchId) {
+  if (!sheepfoldId || isNaN(Number(sheepfoldId))) {
+    proxy.$message.error('请选择有效的羊舍');
+    sheepOptions.value = [];
+    return [];
+  }
+  if (!ranchId) {
+    proxy.$message.error('牧场信息异常，请重新选择');
+    sheepOptions.value = [];
+    return [];
+  }
   try {
-    const res = await getSheepBySheepfoldId(String(sheepfoldId));
+    const res = await getSheepBySheepfoldId(Number(sheepfoldId));
     const newSheepList = (res.data || []).map((sheep) => ({
       id: sheep.id,
-      manageTags: sheep.manageTags,
-      sheepfoldId: sheepfoldId,
-    }));
+      manageTags: sheep.manageTags || '未知耳号',
+      sheepfoldId: Number(sheepfoldId),
+    })).filter(item => item.manageTags);
 
-    const existingTags = new Set(sheepOptions.value.map((item) => item.manageTags));
-    const mergedSheep = newSheepList.filter((item) => !existingTags.has(item.manageTags));
-
-    sheepOptions.value.push(...mergedSheep);
-    return mergedSheep;
+    if (newSheepList.length === 0) {
+      proxy.$message.info('当前羊舍下暂无羊只数据');
+      sheepOptions.value = [];
+      return [];
+    }
+    sheepOptions.value = newSheepList;
+    return newSheepList;
   } catch (error) {
-    console.error('根据羊舍加载耳号失败', error);
-    proxy.$modal.msgError('加载羊舍耳号失败，请重试');
+    console.error('根据羊舍加载耳号失败:', error);
+    const errorMsg = error.response?.data?.msg || '加载羊舍耳号失败，请重试';
+    proxy.$modal.msgError(errorMsg);
+    sheepOptions.value = [];
     return [];
   }
 }
@@ -403,6 +508,7 @@ async function loadSheepInfo() {
   const tagDetails = {};
   const validResults = [];
   let firstSheepfoldId = null;
+  let firstRanchId = null;
 
   for (const tag of tags) {
     try {
@@ -420,6 +526,7 @@ async function loadSheepInfo() {
         };
         if (!firstSheepfoldId) {
           firstSheepfoldId = sheepData.sheepfoldId;
+          firstRanchId = sheepData.ranchId;
         }
       }
     } catch (error) {
@@ -435,6 +542,11 @@ async function loadSheepInfo() {
   }
   form.value.tagDetails = tagDetails;
 
+  if (firstRanchId && isAdd.value) {
+    form.value.ranchId = firstRanchId;
+    handleRanchChange(firstRanchId);
+  }
+
   if (firstSheepfoldId && isAdd.value) {
     form.value.foldFrom = Number(firstSheepfoldId);
   }
@@ -455,6 +567,8 @@ function handleQuery() {
 //重置搜索框
 function resetQuery() {
   daterangeCreateTime.value = [];
+  daterangeTransDate.value = [];
+  queryParams.value.eventType = null;
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -498,6 +612,8 @@ async function handleUpdate(row) {
     const formData = {
       ...d,
       manageTags: manageTags,
+      eventType: d.eventType || null,
+      transDate: d.transDate || null,
       foldFrom: Number(d.foldFrom || 0),
       foldTo: Number(d.foldTo || 0),
       sheepTypeId: Number(d.sheepTypeId || 0),
@@ -507,16 +623,10 @@ async function handleUpdate(row) {
       isEdit: true
     };
 
-    // 5. 验证匹配情况（调试用）
-    // const foldFromItem = sheepfoldOptions.value.find(item => item.id === formData.foldFrom);
-    // const foldToItem = sheepfoldOptions.value.find(item => item.id === formData.foldTo);
-    // const sheepTypeItem = sheepTypeOptions.value.find(item => item.id === formData.sheepTypeId);
-    // console.log("转出羊舍匹配结果:", foldFromItem ? foldFromItem.sheepfoldName : "未找到");
-    // console.log("转入羊舍匹配结果:", foldToItem ? foldToItem.sheepfoldName : "未找到");
-    // console.log("羊只类型匹配结果:", sheepTypeItem ? sheepTypeItem.name : "未找到");
-
     form.value = formData;
-
+    form.value.ranchId = row.ranchId;
+    handleRanchChange(row.ranchId);
+    isAdd.value = false;
     if (manageTags.length > 0) {
       await loadSheepInfo();
     }
@@ -572,7 +682,7 @@ function submitForm() {
 //删除
 function handleDelete(row) {
   const _ids = row.id || ids.value;
-  proxy.$modal.confirm(`是否确认删除转群记录编号为“${_ids}”的数据项？`)
+  proxy.$modal.confirm(`是否确认删除这条记录数据`)
     .then(() => delTrans_group(_ids))
     .then(() => {
       getList();
@@ -589,39 +699,40 @@ function handleExport() {
 }
 
 // 审核
-function handleApprove(row) {
-  approveForm.value = { ...row };
-  approveDialog.value = true;
-  displayManageTags.value = row.manageTags;
-}
+//function handleApprove(row) {
+//   approveForm.value = { ...row };
+//   approveDialog.value = true;
+//   displayManageTags.value = row.manageTags;
+// }
 
 // 审批同意
-function handleApproveAgree() {
-  if (typeof approveForm.value.foldTo !== 'number') {
-    approveForm.value.foldTo = Number(approveForm.value.foldTo);
-  }
+// function handleApproveAgree() {
+//   if (typeof approveForm.value.foldTo !== 'number') {
+//     approveForm.value.foldTo = Number(approveForm.value.foldTo);
+//   }
 
-  approveForm.value.status = 1;
-  approveScTransGroup(approveForm.value).then(() => {
-    approveDialog.value = false;
-    proxy.$modal.msgSuccess('审批通过，羊只所在羊舍已更新');
-    getList();
-  }).catch(error => {
-    proxy.$modal.msgError(`审批失败：${error.message}`);
-  });
-}
+//   approveForm.value.status = 1;
+//   approveScTransGroup(approveForm.value).then(() => {
+//     approveDialog.value = false;
+//     proxy.$modal.msgSuccess('审批通过，羊只所在羊舍已更新');
+//     getList();
+//   }).catch(error => {
+//     proxy.$modal.msgError(`审批失败：${error.message}`);
+//   });
+// }
 
-function handleApproveReject() {
-  approveForm.value.status = 2;
-  approveScTransGroup(approveForm.value).then(() => {
-    approveDialog.value = false;
-    proxy.$modal.msgSuccess('审批已驳回');
-    getList();
-  }).catch(error => {
-    proxy.$modal.msgError(`审批失败：${error.message}`);
-  });
-}
+// function handleApproveReject() {
+//   approveForm.value.status = 2;
+//   approveScTransGroup(approveForm.value).then(() => {
+//     approveDialog.value = false;
+//     proxy.$modal.msgSuccess('审批已驳回');
+//     getList();
+//   }).catch(error => {
+//     proxy.$modal.msgError(`审批失败：${error.message}`);
+//   });
+// }
 
+//加载羊舍数据
 function loadSheepfold() {
   listSheepfold({ pageNum: 1, pageSize: 9999 }).then((res) => {
     sheepfoldOptions.value = res.rows;
@@ -632,6 +743,7 @@ function loadSheepfold() {
   });
 }
 
+//获取品种数据
 function getVarietyOptions() {
   request({
     url: '/base/variety/list',
@@ -642,10 +754,37 @@ function getVarietyOptions() {
   });
 }
 
+// 加载羊只类别数据
+const sheepTypeList = ref([]);
+function loadSheepTypeList() {
+  getSheepTypeList().then(response => {
+    sheepTypeList.value = response.rows || [];
+    sheepTypeOptions.value = (response.rows || []).map(item => ({
+      id: Number(item.id),
+      name: item.name || item.typeName
+    }));
+  }).catch(error => {
+    console.error('加载羊只类别失败', error);
+    sheepTypeList.value = [];
+    sheepTypeOptions.value = [];
+  });
+}
+
 onMounted(() => {
   loadSheepfold();
+  loadRanchList();
   getVarietyOptions();
-  getSheepTypeList();
+  loadSheepTypeList();
   getList();
 });
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.tag-count {
+  color: #606266;
+  background-color: #f5f7fa;
+  padding: 2px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/produce/manage_sheep/transition_info/index.vue b/src/views/produce/manage_sheep/transition_info/index.vue
index 7538b49..1ced6d2 100644
--- a/src/views/produce/manage_sheep/transition_info/index.vue
+++ b/src/views/produce/manage_sheep/transition_info/index.vue
@@ -2,14 +2,36 @@
   <div class="app-container">
     <!-- 查询表单 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <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 label="转场日期" style="width: 308px">
+        <el-date-picker v-model="transitionDateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
-        <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery" style="width: 150px;"/>
+        <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
+          style="width: 150px;" />
       </el-form-item>
       <el-form-item label="品种" prop="varietyId">
         <el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
+      <el-form-item label="事件类型" prop="eventType" style="width: 308px">
+        <el-select v-model="queryParams.eventType" placeholder="请选择事件类型" clearable style="min-width:150px">
+          <el-option label="转场转入" value="转场转入" />
+          <el-option label="转场转出" value="转场转出" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="转场类型" prop="transType" style="width: 308px">
+        <el-select v-model="queryParams.transType" placeholder="请选择转场类型" clearable style="min-width:150px">
+          <el-option label="内部调拨" :value="0" />
+          <el-option label="内部销售" :value="1" />
+          <el-option label="育肥调拨" :value="2" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="转入牧场" prop="transTo">
         <el-select v-model="queryParams.transTo" placeholder="请选择转入牧场" clearable style="min-width:150px">
           <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName" :value="ranch.ranchName" />
@@ -25,10 +47,6 @@
           <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-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -41,10 +59,10 @@
         <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-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> -->
       <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>
@@ -59,9 +77,21 @@
     <!-- 列表 -->
     <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="manageTags" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="130" fixed>
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="转场日期" align="center" prop="transitionDate" min-width="150">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.transitionDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" />
+      <el-table-column label="事件类型" align="center" prop="eventType" min-width="120" />
+      <el-table-column label="转场类型" align="center" prop="transTypeText" />
       <el-table-column label="品种" align="center" prop="varietyName" />
-      <el-table-column label="转入牧场" align="center" prop="transTo" />
+      <el-table-column label="转入牧场" align="center" prop="transTo" min-width="120" />
       <el-table-column label="当前牧场" align="center" prop="transFrom" />
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
@@ -69,18 +99,19 @@
         </template>
       </el-table-column>
       <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="状态" align="center" prop="statusText" />
-      <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">
+      <el-table-column label="当前状态" align="center" prop="status" min-width="120">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span v-if="scope.row.status === 0">待审批</span>
+          <span v-else-if="scope.row.status === 1 || scope.row.status === 2">审批完成</span>
+          <span v-else>未知状态</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" min-width="180">
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="操作" align="center" min-width="180" fixed="right">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
-            v-hasPermi="['transition_info:transition_info:approve']">审批</el-button>
+            v-hasPermi="['transition_info:transition_info:approve']" :disabled="scope.row.status !== 0">审批</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['transition_info:transition_info:remove']">删除</el-button>
         </template>
@@ -94,33 +125,51 @@
     <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="管理耳号" prop="manageTags">
-          <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" filterable multiple allow-create
-            @change="loadSheepInfo" :disabled="!isAdd" >
-            <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
-              :value="sheep.manageTags" />
-          </el-select>
+          <div style="display: flex; align-items: center; gap: 8px;">
+            <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" filterable multiple allow-create
+              @change="loadSheepInfo" :disabled="!isAdd" style="flex:1;">
+              <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
+                :value="sheep.manageTags" />
+            </el-select>
+            <span v-if="form.manageTags?.length > 0" class="tag-count">
+              已选 {{ form.manageTags.length }} 个
+            </span>
+          </div>
         </el-form-item>
 
         <el-form-item label="转入牧场" prop="transTo">
-          <el-select v-model="form.transTo" placeholder="请选择转入牧场" clearable :disabled="!isAdd" >
+          <el-select v-model="form.transTo" placeholder="请选择转入牧场" clearable :disabled="!isAdd">
             <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName"
               :value="ranch.ranchName" />
           </el-select>
         </el-form-item>
 
         <el-form-item label="当前牧场" prop="transFrom">
-          <el-select v-model="form.transFrom" placeholder="请选择当前牧场" clearable @change="handleRanchChange" :disabled="!isAdd" >
+          <el-select v-model="form.transFrom" placeholder="请选择当前牧场" clearable @change="handleRanchChange"
+            :disabled="!isAdd">
             <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName"
               :value="ranch.ranchName" />
           </el-select>
         </el-form-item>
 
+        <el-form-item label="事件类型" prop="eventType">
+          <el-select v-model="form.eventType" placeholder="请选择事件类型">
+            <el-option label="转场转入" value="转场转入" />
+            <el-option label="转场转出" value="转场转出" />
+          </el-select>
+        </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-select>
         </el-form-item>
 
+        <el-form-item label="转场日期" prop="transitionDate">
+          <el-date-picker v-model="form.transitionDate" value-format="YYYY-MM-DD" type="date" placeholder="请选择转场日期"
+            :disabled="!isAdd"></el-date-picker>
+        </el-form-item>
+
         <el-form-item label="技术员" prop="technician">
           <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
@@ -143,6 +192,9 @@
         <el-form-item label="品种">
           <el-input :value="approveForm.varietyName" disabled />
         </el-form-item>
+        <el-form-item label="事件类型">
+          <el-input :value="approveForm.eventType" disabled />
+        </el-form-item>
         <el-form-item label="转入牧场">
           <el-input :value="approveForm.transTo" disabled />
         </el-form-item>
@@ -161,6 +213,12 @@
         <el-form-item label="状态">
           <el-input :value="getStatusLabel(approveForm.status)" disabled />
         </el-form-item>
+        <el-form-item label="接收羊舍" v-if="approveForm.eventType === '转场转入'">
+          <el-select v-model="approveForm.sheepfoldId" placeholder="请选择接收羊舍" clearable>
+            <el-option v-for="sheepfold in acceptSheepfold" :key="sheepfold.id" :label="sheepfold.sheepfoldName"
+              :value="sheepfold.id" />
+          </el-select>
+        </el-form-item>
       </el-form>
 
       <template #footer>
@@ -174,7 +232,7 @@
 </template>
 
 <script setup name="Transition_info">
-import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, getSheepByRanchId, updateTransition_info, listRanch,approveTransitionInfo } from "@/api/produce/manage_sheep/transition_info"
+import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, getSheepByRanchId, updateTransition_info, listRanch, approveTransitionInfo } from "@/api/produce/manage_sheep/transition_info"
 import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
 import request from '@/utils/request'
 
@@ -191,15 +249,17 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
+const transitionDateRange = ref([])
 const daterangeCreateTime = ref([])
 const approveDialog = ref(false)
 const approveForm = ref({})
 const displayManageTags = ref('')
 const varietyOptions = ref([])
-const ranchOptions = ref([]);
-const sheepOptions = ref([]); 
-const isAdd = ref(true); 
-const isEdit = ref(false); 
+const ranchOptions = ref([])
+const sheepOptions = ref([])
+const isAdd = ref(true)
+const isEdit = ref(false)
+const acceptSheepfold = ref([])
 
 const data = reactive({
   form: {
@@ -207,22 +267,27 @@ const data = reactive({
     manageTags: [],
     transTo: null,
     transFrom: null,
+    eventType: null,
     transType: null,
+    transitionDate: null,
     technician: null,
-    tagDetails: {} 
+    tagDetails: {}
   },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     manageTags: [],
     varietyId: null,
+    eventType: null,
+    transType: null,
     transTo: null,
     transFrom: null,
     status: null,
-    createTime: null
+    createTime: null,
+    transitionDate: null
   },
   rules: {
-    manageTags:[
+    manageTags: [
       { required: true, message: "请输入管理耳号", trigger: "blur" }
     ],
     transTo: [
@@ -231,9 +296,15 @@ const data = reactive({
     transFrom: [
       { required: false, message: "请选择当前牧场", trigger: "blur" }
     ],
+    eventType: [
+      { required: true, message: '请选择事件类型', trigger: 'change' }
+    ],
     transType: [
       { required: true, message: "请选择转场类型", trigger: "change" }
     ],
+    transitionDate: [
+      { required: true, message: "请选择转场日期", trigger: "change" }
+    ],
     technician: [
       { required: true, message: "请输入技术员", trigger: "blur" }
     ]
@@ -249,6 +320,13 @@ function getList() {
     queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
     queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
   }
+  if (queryParams.value.transType !== null) {
+    queryParams.value.params.transType = queryParams.value.transType;
+  }
+  if (transitionDateRange.value && transitionDateRange.value.length > 0) {
+    queryParams.value.params["beginTransitionDate"] = transitionDateRange.value[0];
+    queryParams.value.params["endTransitionDate"] = transitionDateRange.value[1];
+  }
   listTransition_info(queryParams.value).then(res => {
     transition_infoList.value = res.rows
     total.value = res.total
@@ -264,12 +342,12 @@ function reset() {
     transFrom: null,
     transType: null,
     technician: null,
-    createBy:null,
+    createBy: null,
     tagDetails: {}
   };
   sheepOptions.value = [];
   proxy.resetForm("transition_infoRef");
-  isAdd.value = true; 
+  isAdd.value = true;
   isEdit.value = false;
 }
 
@@ -280,7 +358,7 @@ function loadRanchOptions() {
       if (res.rows && Array.isArray(res.rows)) {
         const mapped = res.rows.map((ranch) => ({
           id: Number(ranch.id),
-          ranchName: ranch.ranch || '未知牧场', 
+          ranchName: ranch.ranch || '未知牧场',
         }));
         ranchOptions.value = mapped;
       } else {
@@ -302,6 +380,40 @@ function loadSheepOptions() {
   });
 }
 
+// 加载牧场下的羊舍
+// 修改：加载转入牧场下的接收羊舍（使用牧场ID而非名称）
+function loadSheepfoldsByRanch(ranchName) {
+  // 1. 根据转入牧场名称匹配牧场ID
+  const matchedRanch = ranchOptions.value.find(
+    ranch => ranch.ranchName === ranchName
+  );
+  if (!matchedRanch) {
+    proxy.$modal.msgWarning(`未找到牧场“${ranchName}”的信息`);
+    acceptSheepfold.value = [];
+    return;
+  }
+  const ranchId = matchedRanch.id; // 获取匹配的牧场ID
+
+  // 2. 使用牧场ID调用接口加载羊舍（修正参数）
+  request({
+    url: '/sheepfold_management/sheepfold_management/list',
+    method: 'get',
+    params: {
+      ranchId: ranchId, // 关键：使用牧场ID而非名称
+      pageNum: 1,
+      pageSize: 999
+    }
+  }).then(res => {
+    acceptSheepfold.value = res.rows || [];
+    if (acceptSheepfold.value.length === 0) {
+      proxy.$modal.msgWarning(`转入牧场“${ranchName}”没有可用的接收羊舍`);
+    }
+  }).catch(error => {
+    console.error('加载接收羊舍失败:', error);
+    proxy.$modal.msgError('获取接收羊舍数据失败');
+  });
+}
+
 // 通过牧场 ID 查询牧场名称
 async function getRanchNameByRanchId(ranchId) {
   if (!ranchId) return '';
@@ -312,7 +424,7 @@ async function getRanchNameByRanchId(ranchId) {
     const matchedRanch = ranchOptions.value.find(
       (item) => item.id === Number(ranchId)
     );
-    return matchedRanch ? matchedRanch.ranchName : ''; 
+    return matchedRanch ? matchedRanch.ranchName : '';
   } catch (error) {
     console.error('通过 ranchId 查询牧场名称失败:', error);
     return '';
@@ -337,7 +449,7 @@ function handleRanchChange(ranchName) {
 
   getSheepByRanchId(ranchIdNum)
     .then((res) => {
-      if (res.code === 200) { 
+      if (res.code === 200) {
         if (res.data && res.data.length > 0) {
           sheepOptions.value = res.data.map((sheep) => ({
             id: sheep.id,
@@ -374,7 +486,7 @@ async function loadSheepInfo() {
       const { data: sheepData } = await checkSheepByManageTags(tag.trim());
       if (!sheepData) {
         validResults.push(false);
-        proxy.$modal.msgError(`耳号 ${tag} 不存在`);
+        proxy.$modal.msgError(`耳号 ${tag} 不存在或已删除`);
         continue;
       }
 
@@ -410,7 +522,7 @@ async function loadSheepInfo() {
 // 导出
 function handleExport() {
   proxy.download(
-    '/produce/manage_sheep/transition_info/export', 
+    '/produce/manage_sheep/transition_info/export',
     { ...queryParams.value },
     `transition_info_${Date.now()}.xlsx`
   );
@@ -418,11 +530,22 @@ function handleExport() {
 
 // 审批
 function handleApprove(row) {
-  approveForm.value = { ...row }; 
+  if (row.status !== 0) {
+    proxy.$modal.msgWarning("该记录已完成审批，无法重复操作");
+    return;
+  }
+  approveForm.value = { ...row };
   approveDialog.value = true;
   displayManageTags.value = Array.isArray(row.manageTags)
     ? row.manageTags.join(',')
     : row.manageTags || '';
+
+  if (row.eventType === '转场转入') {
+    loadSheepfoldsByRanch(row.transTo);
+  } else {
+    acceptSheepfold.value = [];
+  }
+  approveDialog.value = true;
 }
 
 // 审批同意
@@ -431,12 +554,15 @@ function handleApproveAgree() {
     proxy.$modal.msgError('转入牧场不能为空');
     return;
   }
-  
-  approveForm.value.status = 1; 
-  
+
+  approveForm.value.status = 1;
+  if (approveForm.value.eventType === '转场转入' && !approveForm.value.sheepfoldId) {
+    proxy.$modal.msgError('请选择接收羊舍');
+    return;
+  }
   approveTransitionInfo(approveForm.value).then(() => {
     approveDialog.value = false;
-    proxy.$modal.msgSuccess('审批通过，已更新羊只所在牧场');
+    proxy.$modal.msgSuccess('通过请求，已更新羊只信息');
     getList();
   }).catch(error => {
     proxy.$modal.msgError(`审批失败：${error.message}`);
@@ -448,8 +574,10 @@ function handleApproveReject() {
   approveForm.value.status = 2;
   updateTransition_info(approveForm.value).then(() => {
     approveDialog.value = false;
-    proxy.$modal.msgSuccess('审批成功，状态已更新为驳回');
+    proxy.$modal.msgSuccess('驳回请求');
     getList();
+  }).catch(error => {
+    proxy.$modal.msgError(`审批失败：${error.message}`);
   });
 }
 
@@ -488,6 +616,8 @@ function handleQuery() {
 //重置
 function resetQuery() {
   daterangeCreateTime.value = []
+  queryParams.value.transType = null;
+  transitionDateRange.value = [];
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -503,7 +633,7 @@ function handleAdd() {
   reset();
   open.value = true;
   title.value = "添加转场";
-  isAdd.value = true; 
+  isAdd.value = true;
   isEdit.value = false;
   sheepOptions.value = [];
   form.value.manageTags = [];
@@ -516,11 +646,11 @@ async function handleUpdate(row) {
   getTransition_info(_id).then(response => {
     form.value = {
       ...response.data,
-      manageTags: [response.data.manageTags] 
+      manageTags: [response.data.manageTags]
     };
     open.value = true;
     title.value = "修改转场";
-    isAdd.value = false; 
+    isAdd.value = false;
     isEdit.value = true;
   }).catch(error => {
     console.error('获取转场详情失败:', error);
@@ -536,7 +666,7 @@ async function submitForm() {
     const allTags = form.value.manageTags;
     let validTags = [];
 
-    if (isAdd.value) { 
+    if (isAdd.value) {
       if (!allTags || allTags.length === 0) {
         proxy.$modal.msgError('请选择至少一个耳号');
         return;
@@ -549,7 +679,7 @@ async function submitForm() {
         proxy.$modal.msgError('所有耳号均无效，请重新输入');
         return;
       }
-    } else { 
+    } else {
       validTags = allTags;
     }
 
@@ -559,10 +689,12 @@ async function submitForm() {
         sheepId: form.value.tagDetails[tag].sheepId,
         varietyId: form.value.tagDetails[tag].varietyId,
         varietyName: form.value.tagDetails[tag].varietyName,
-        manageTags: tag, 
+        manageTags: tag,
         transTo: form.value.transTo,
         transFrom: form.value.tagDetails[tag].ranchName,
         transType: form.value.transType,
+        eventType: form.value.eventType,
+        transitionDate: form.value.transitionDate,
         technician: form.value.technician,
         comment: form.value.tagDetails[tag].comment,
         status: 0,
@@ -571,6 +703,7 @@ async function submitForm() {
       submitData = {
         ...form.value,
         manageTags: validTags.join(','),
+        eventType: form.value.eventType,
       };
     }
 
@@ -602,7 +735,7 @@ function getVarietyOptions() {
 //删除
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除转场编号为"' + _ids + '"的数据项？')
+  proxy.$modal.confirm('是否确认删除这条记录数据')
     .then(() => delTransition_info(_ids))
     .then(() => {
       getList()
@@ -617,4 +750,14 @@ onMounted(() => {
   loadSheepOptions();
   getList();
 });
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.tag-count {
+  color: #606266;
+  background-color: #f5f7fa;
+  padding: 2px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/produce/other/castrate/index.vue b/src/views/produce/other/castrate/index.vue
index 4a74ec7..873e55b 100644
--- a/src/views/produce/other/castrate/index.vue
+++ b/src/views/produce/other/castrate/index.vue
@@ -2,27 +2,24 @@
   <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-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery" style="width: 150px;"/>
+      <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 label="管理耳号" prop="manageTags">
+        <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
+          style="width: 150px;" />
       </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="品种" prop="varietyId">
         <el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :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-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -55,17 +52,18 @@
     <el-table v-loading="loading" :data="castrateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="耳号" align="center" prop="manageTags" />
-      <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
       <el-table-column label="品种" align="center" prop="varietyName" />
       <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" prop="createBy" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <!-- 按需添加 是否需要修改功能 -->
@@ -84,11 +82,16 @@
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="castrateRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="管理耳号" prop="manageTags">
-          <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
-            style="width: 100%" @change="loadSheepInfo"  @blur="loadSheepInfo">
-            <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
-              :value="sheep.manageTags" />
-          </el-select>
+          <div style="display: flex; align-items: center; gap: 8px;">
+            <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
+              style="width: 100%; flex:1;" @change="loadSheepInfo" @blur="loadSheepInfo">
+              <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
+                :value="sheep.manageTags" />
+            </el-select>
+            <span v-if="form.manageTags?.length > 0" class="tag-count">
+              已选 {{ form.manageTags.length }} 个
+            </span>
+          </div>
         </el-form-item>
         <el-form-item label="羊舍" prop="sheepfold">
           <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable @change="loadSheepBySheepfold">
@@ -154,9 +157,9 @@ const data = reactive({
     manageTags: [
       { required: true, message: '请输入管理耳号', trigger: 'blur' }
     ],
-    sheepfold: [
-      { required: true, message: '请选择羊舍', trigger: 'change' }
-    ],
+    // sheepfold: [
+    //   { required: true, message: '请选择羊舍', trigger: 'change' }
+    // ],
     technician: [
       { required: true, message: '请输入技术员', trigger: 'blur' }
     ]
@@ -186,7 +189,7 @@ function loadSheepBySheepfold() {
       sheepOptions.value = sheepList.map(sheep => ({
         id: sheep.id,
         manageTags: sheep.manageTags,
-        gender: sheep.gender 
+        gender: sheep.gender
       }));
     })
     .catch(error => {
@@ -207,18 +210,18 @@ async function loadSheepInfo() {
   for (const tag of tags) {
     try {
       const { data: sheepData } = await checkSheepByManageTags(tag.trim());
-      
+
       if (!sheepData) {
         validResults.push(false);
         proxy.$modal.msgError(`耳号 ${tag} 不存在`);
-      } else if (sheepData.gender !== 2) { 
+      } else if (sheepData.gender !== 2) {
         validResults.push(false);
         proxy.$modal.msgError(`耳号 ${tag} 对应的羊只性别不是公，无法添加`);
       } else {
         validResults.push(true);
         tagDetails[tag] = {
           sheepId: sheepData.id,
-          gender: sheepData.gender, 
+          gender: sheepData.gender,
           sheepfoldId: sheepData.sheepfoldId,
           varietyId: sheepData.varietyId,
           comment: sheepData.comment || ''
@@ -261,7 +264,7 @@ function getList() {
     loading.value = false;
   });
 
-    getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
+  getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
     varietyOptions.value = res.rows || []
   })
 }
@@ -404,7 +407,7 @@ function submitForm() {
 //删除
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm(`是否确认删除去势编号为"${_ids}"的数据项？`).then(() => {
+  proxy.$modal.confirm(`是否确认删除这条记录数据`).then(() => {
     return delCastrate(_ids)
   }).then(() => {
     getList()
@@ -426,8 +429,18 @@ function getSheepfoldOptions() {
 }
 
 onMounted(() => {
-  getList()
   getSheepfoldOptions()
   getVarietyOptions()
+  getList()
 })
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.tag-count {
+  color: #606266;
+  background-color: #f5f7fa;
+  padding: 2px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/produce/other/fixHoof/index.vue b/src/views/produce/other/fixHoof/index.vue
index 15b0e4b..bc4c586 100644
--- a/src/views/produce/other/fixHoof/index.vue
+++ b/src/views/produce/other/fixHoof/index.vue
@@ -1,11 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <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 label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="width: 150px;" />
       </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" />
@@ -16,12 +19,6 @@
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :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-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -53,17 +50,18 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="fixHoofList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="耳号" align="center" prop="manageTags" />
-      <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
       <el-table-column label="品种" align="center" prop="varietyName" />
       <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">
           <!-- 按需添加 是否需要修改功能 -->
@@ -82,11 +80,16 @@
     <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="耳号" prop="manageTags">
-          <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
-            style="width: 100%" @change="loadSheepInfo">
-            <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
-              :value="sheep.manageTags" />
-          </el-select>
+          <div style="display: flex; align-items: center; gap: 8px;">
+            <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
+              style="width: 100%; flex:1;" @change="loadSheepInfo">
+              <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
+                :value="sheep.manageTags" />
+            </el-select>
+            <span v-if="form.manageTags?.length > 0" class="tag-count">
+              已选 {{ form.manageTags.length }} 个
+            </span>
+          </div>
         </el-form-item>
         <el-form-item label="羊舍" prop="sheepfolds">
           <el-select v-model="form.sheepfold" filterable style="width: 100%" @change="loadSheepBySheepfold">
@@ -219,7 +222,7 @@ async function loadSheepInfo() {
   form.value.tagDetails = tagDetails;
 
   if (validTags.length > 0) {
-    const firstValidTag = validTags[0]; 耳号
+    const firstValidTag = validTags[0];
     const firstSheepfoldId = tagDetails[firstValidTag].sheepfoldId;
     form.value.sheepfold = firstSheepfoldId;
   }
@@ -345,7 +348,7 @@ function submitForm() {
 //删除
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm(`是否确认删除修蹄编号为"${_ids}"的数据项？`).then(() => {
+  proxy.$modal.confirm(`是否确认删除这条记录数据`).then(() => {
     return delFixHoof(_ids)
   }).then(() => {
     getList()
@@ -371,4 +374,14 @@ onMounted(() => {
   getVarietyOptions()
   getList()
 })
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.tag-count {
+  color: #606266;
+  background-color: #f5f7fa;
+  padding: 2px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/sale/customer/index.vue b/src/views/sale/customer/index.vue
new file mode 100644
index 0000000..22759b9
--- /dev/null
+++ b/src/views/sale/customer/index.vue
@@ -0,0 +1,285 @@
+<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>
+        <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="['customer:customer:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['customer:customer:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['customer:customer:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['customer:customer:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="customerList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="客户名称" align="center" prop="name" />
+      <el-table-column label="客户电话" align="center" prop="phone" />
+      <el-table-column label="客户地址" align="center">
+        <template #default="scope">
+          {{ scope.row.province }}{{ scope.row.city }}{{ scope.row.district }}{{ scope.row.address }}
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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="['customer:customer:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['customer:customer: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="700px" append-to-body>
+      <el-form ref="customerRef" :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="phone">
+          <el-input v-model="form.phone" placeholder="请输入客户电话" />
+        </el-form-item>
+        <el-form-item label="所在地区" required>
+          <el-cascader
+            v-model="selectedArea"
+            :options="areaOptions"
+            :props="areaProps"
+            placeholder="请选择省市区"
+            style="width: 100%"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="详细地址" prop="address">
+          <el-input v-model="form.address" placeholder="请输入详细地址" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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>
+import { ref, reactive, getCurrentInstance, onMounted } from 'vue'
+import { listCustomer, getCustomer, delCustomer, addCustomer, updateCustomer } from "@/api/sale/customer/customer"
+import { regionData } from 'element-china-area-data'
+
+const { proxy } = getCurrentInstance()
+
+const customerList = 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 areaOptions = ref(regionData)
+const areaProps = {
+  label: 'label',
+  value: 'label',
+  children: 'children'
+}
+const selectedArea = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    name: null,
+  },
+  rules: {
+    name: [{ required: true, message: "客户名称不能为空", trigger: "blur" }],
+    address: [{ required: true, message: "详细地址不能为空", trigger: "blur" }]
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+onMounted(() => {
+  getList()
+})
+
+function getList() {
+  loading.value = true
+  listCustomer(queryParams.value).then(response => {
+    customerList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+function cancel() {
+  open.value = false
+  reset()
+}
+
+function reset() {
+  form.value = {
+    id: null,
+    name: null,
+    phone: null,
+    province: null,
+    city: null,
+    district: null,
+    address: null,
+    remark: null
+  }
+  selectedArea.value = []
+  proxy.resetForm("customerRef")
+}
+
+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[0]
+  getCustomer(id).then(response => {
+    form.value = response.data
+    // 设置地区选择
+    if (response.data.province || response.data.city || response.data.district) {
+      selectedArea.value = [
+        response.data.province,
+        response.data.city,
+        response.data.district
+      ].filter(item => item) // 过滤空值
+    }
+    open.value = true
+    title.value = "修改客户"
+  })
+}
+
+function handleAddress() {
+  if (selectedArea.value.length > 0) {
+    form.value.province = selectedArea.value[0] || ''
+    form.value.city = selectedArea.value[1] || ''
+    form.value.district = selectedArea.value[2] || ''
+  } else {
+    form.value.province = ''
+    form.value.city = ''
+    form.value.district = ''
+  }
+}
+
+function submitForm() {
+  handleAddress() // 处理地址数据
+  
+  proxy.$refs["customerRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateCustomer(form.value).then(() => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addCustomer(form.value).then(() => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+function handleDelete(row) {
+  const customerIds = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除选中的数据?').then(() => {
+    return delCustomer(customerIds)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+function handleExport() {
+  proxy.download('customer/customer/export', {
+    ...queryParams.value
+  }, `customer_${new Date().getTime()}.xlsx`)
+}
+</script>
\ No newline at end of file
diff --git a/src/views/sale/saleRecord/saleRecord/index.vue b/src/views/sale/saleRecord/saleRecord/index.vue
new file mode 100644
index 0000000..666ddc9
--- /dev/null
+++ b/src/views/sale/saleRecord/saleRecord/index.vue
@@ -0,0 +1,935 @@
+<template>
+  <div class="app-container">
+    <!-- 面包屑导航 -->
+    <el-breadcrumb separator="/" class="breadcrumb">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>销售管理</el-breadcrumb-item>
+      <el-breadcrumb-item>销售记录</el-breadcrumb-item>
+    </el-breadcrumb>
+
+    <!-- 搜索区域 -->
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="耳号" prop="bsManageTags">
+        <el-input
+          v-model="queryParams.bsManageTags"
+          placeholder="请输入耳号"
+          clearable
+          size="small"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="销售日期" prop="saleDate">
+        <el-date-picker
+          v-model="queryParams.saleDate"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          size="small"
+        />
+      </el-form-item>
+
+      <el-form-item label="销售类别" prop="saleType">
+        <el-select v-model="queryParams.saleType" clearable placeholder="请选择" size="small" style="width: 180px">
+          <el-option
+            v-for="d in saleTypeOptions"
+            :key="d.dictValue"
+            :label="d.dictLabel"
+            :value="d.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @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="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['saleRecord:saleRecord:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['saleRecord:saleRecord:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['saleRecord:saleRecord:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['saleRecord:saleRecord:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :show-search="showSearch" @update:showSearch="val => showSearch = val" @queryTable="getList" />
+    </el-row>
+
+    <!-- 表格区域 -->
+    <el-table v-loading="loading" :data="saleRecordList" @selection-change="handleSelectionChange" style="width: 100%">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" type="index" width="50" align="center" />
+      <el-table-column label="耳号" align="center" prop="bsManageTags" width="120" show-overflow-tooltip />
+      <el-table-column label="品种" align="center" prop="variety" width="100" show-overflow-tooltip />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="100" show-overflow-tooltip />
+      <el-table-column label="销售日期" align="center" prop="saleDate" width="120">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.saleDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="羊只类别" align="center" prop="sheepName" width="100" show-overflow-tooltip />
+      <el-table-column label="性别" align="center" prop="gender" width="80" />
+      <el-table-column label="月龄" align="center" prop="monthAge" width="80" />
+      <el-table-column label="胎次" align="center" prop="parity" width="80" />
+      <el-table-column label="计价方式" align="center" prop="pricingMethod" width="100" show-overflow-tooltip />
+      <el-table-column label="单价" align="center" prop="unitPrice" width="100">
+        <template #default="scope">
+          <span v-if="scope.row.unitPrice !== null && scope.row.unitPrice !== undefined">{{ scope.row.unitPrice }}元</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总价" align="center" prop="totalPrice" width="100">
+        <template #default="scope">
+          <span v-if="scope.row.totalPrice !== null && scope.row.totalPrice !== undefined">{{ scope.row.totalPrice }}元</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总体重" align="center" prop="totalWeight" width="100">
+        <template #default="scope">
+          <span v-if="scope.row.totalWeight">{{ scope.row.totalWeight }}kg</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="平均体重" align="center" prop="avgWeight" width="100">
+        <template #default="scope">
+          <span v-if="scope.row.avgWeight">{{ scope.row.avgWeight }}kg</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="平均单只价格" align="center" prop="avgPricePerSheep" width="120">
+        <template #default="scope">
+          <span v-if="scope.row.avgPricePerSheep">{{ scope.row.avgPricePerSheep }}元</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="销售类别" align="center" prop="saleType" width="120" :formatter="saleTypeFormat" show-overflow-tooltip />
+      <el-table-column label="客户名称" align="center" prop="customerName" width="140" show-overflow-tooltip />
+      <el-table-column label="客户电话" align="center" prop="customerPhone" width="130" show-overflow-tooltip />
+      <el-table-column label="客户地址" align="center" prop="customerAddress" width="180" show-overflow-tooltip />
+      <el-table-column label="销售人员" align="center" prop="salesPersonName" width="120" show-overflow-tooltip />
+      <el-table-column label="检疫证号" align="center" prop="quarantineNo" width="130" show-overflow-tooltip />
+      <el-table-column label="审批编号" align="center" prop="approvalNo" width="130" show-overflow-tooltip />
+      <el-table-column label="疾病类型" align="center" prop="diseaseType" width="120" :formatter="diseaseTypeFormat" show-overflow-tooltip />
+      <el-table-column label="次要原因" align="center" prop="secondaryReason" width="120" show-overflow-tooltip />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" width="120" show-overflow-tooltip />
+      <el-table-column label="班组" align="center" prop="groupCode" width="100" :formatter="groupFormat" />
+      <el-table-column label="繁育状态" align="center" prop="breed" width="100" show-overflow-tooltip />
+      <el-table-column label="产后天数" align="center" prop="postLambingDay" width="90" />
+      <el-table-column label="泌乳天数" align="center" prop="lactationDay" width="90" />
+      <el-table-column label="怀孕天数" align="center" prop="lambingDay" width="90" />
+      <el-table-column label="创建人" align="center" prop="createdByName" width="120" show-overflow-tooltip />
+      <el-table-column label="创建日期" align="center" prop="createdAt" width="120">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="技术员" align="center" prop="technicianName" width="120" show-overflow-tooltip />
+      <el-table-column label="处理人" align="center" prop="handlerName" width="120" show-overflow-tooltip />
+      <el-table-column label="备注" align="center" prop="remark" width="150" show-overflow-tooltip />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
+        <template #default="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['saleRecord:saleRecord:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['saleRecord:saleRecord:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page="queryParams.pageNum"
+      :limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改羊只销售记录对话框 -->
+    <el-dialog :title="title" :model-value="open" width="1200px" append-to-body @update:modelValue="val => open = val">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="羊舍" prop="sheepfoldId">
+              <el-select
+                v-model="form.sheepfoldId"
+                placeholder="请选择羊舍"
+                clearable
+                @change="handleSheepfoldChange"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in sheepfoldOptions"
+                  :key="item.id || item.sheepfoldId"
+                  :label="item.sheepfoldName || item.name"
+                  :value="item.id || item.sheepfoldId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="耳号" prop="bsManageTagsList">
+              <!-- 通过 allow-create + 回车新增耳号，使用 watch 捕捉新增项并拉取详情 -->
+              <el-select
+                v-model="form.bsManageTagsList"
+                multiple
+                filterable
+                allow-create
+                default-first-option
+                placeholder="请先选择羊舍，或手动输入耳号并回车确认"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="tag in earTagOptions"
+                  :key="tag"
+                  :label="tag"
+                  :value="tag"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 自动填充展示 -->
+        <el-row :gutter="20">
+          <el-col :span="8"><el-form-item label="品种">{{ form.variety }}</el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="羊只类别">{{ form.sheepName }}</el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="性别">{{ form.gender }}</el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="月龄">{{ form.monthAge }}</el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="胎次">{{ form.parity }}</el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="繁育状态">{{ form.breed }}</el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="产后天数">{{ form.postLambingDay }}</el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="泌乳天数">{{ form.lactationDay }}</el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="怀孕天数">{{ form.lambingDay }}</el-form-item></el-col>
+        </el-row>
+
+        <el-divider />
+
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="事件类型" prop="eventType">
+              <el-input v-model="form.eventType" placeholder="默认为销售" readonly />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="销售日期" prop="saleDate">
+              <el-date-picker
+                v-model="form.saleDate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+                :disabled-date="disabledDate"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="计价方式" prop="pricingMethod">
+              <el-select
+                v-model="form.pricingMethod"
+                placeholder="请选择计价方式"
+                @change="handlePricingMethodChange"
+                style="width: 100%"
+              >
+                <el-option label="按个体" value="按个体" />
+                <el-option label="按体重" value="按体重" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <!-- 动态字段：按个体 -->
+          <template v-if="form.pricingMethod === '按个体'">
+            <el-col :span="8">
+              <el-form-item label="单价(元/只)" prop="unitPrice">
+                <el-input v-model="form.unitPrice" placeholder="请输入单价" @input="calculateIndividualPrice">
+                  <template #append>元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="总价" prop="totalPrice">
+                <el-input v-model="form.totalPrice" placeholder="自动计算" readonly>
+                  <template #append>元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </template>
+
+          <!-- 动态字段：按体重 -->
+          <template v-if="form.pricingMethod === '按体重'">
+            <el-col :span="8">
+              <el-form-item label="总重量" prop="totalWeight">
+                <el-input v-model="form.totalWeight" placeholder="请输入总重量" @input="calculateWeightPrice">
+                  <template #append>kg</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="单价(元/kg)" prop="unitPrice">
+                <el-input v-model="form.unitPrice" placeholder="请输入单价" @input="calculateWeightPrice">
+                  <template #append>元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="总价" prop="totalPrice">
+                <el-input v-model="form.totalPrice" placeholder="自动计算" readonly>
+                  <template #append>元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="平均体重">
+                <el-input v-model="form.avgWeight" placeholder="自动计算" readonly>
+                  <template #append>kg</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="平均单只价格">
+                <el-input v-model="form.avgPricePerSheep" placeholder="自动计算" readonly>
+                  <template #append>元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </template>
+        </el-row>
+
+        <el-divider />
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="销售类别" prop="saleType">
+              <el-select
+                v-model="form.saleType"
+                placeholder="请选择销售类别"
+                @change="handleSaleTypeChange"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in saleTypeOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="客户名称" prop="customerId">
+              <el-select
+                v-model="form.customerId"
+                filterable
+                remote
+                reserve-keyword
+                placeholder="请输入客户名称"
+                :remote-method="remoteMethodGetCustomer"
+                :loading="customerLoading"
+                @change="handleCustomerChange"
+                style="width: 100%"
+              >
+                <!-- 使用 sx_customer.name 作为显示字段 -->
+                <el-option
+                  v-for="item in customerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <!-- 淘汰相关：仅在 销售类别=淘汰销售/淘汰屠宰 时显示 -->
+          <template v-if="isEliminationSale">
+            <el-col :span="12">
+              <el-form-item label="疾病类型" prop="diseaseType">
+                <el-select v-model="form.diseaseType" placeholder="请选择疾病类型" @change="handleDiseaseTypeChange" style="width: 100%">
+                  <el-option
+                    v-for="dict in diseaseTypeOptions"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="班组" prop="groupCode">
+                <el-select v-model="form.groupCode" placeholder="请选择班组" style="width: 100%">
+                  <el-option
+                    v-for="dict in groupOptions"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12" v-if="diseaseTypeLabel === '病残羊'">
+              <el-form-item label="次要原因" prop="secondaryReason">
+                <el-input v-model="form.secondaryReason" placeholder="请输入次要原因" />
+              </el-form-item>
+            </el-col>
+          </template>
+
+          <el-col :span="12">
+            <el-form-item label="销售人员" prop="salesPersonId">
+              <el-select v-model="form.salesPersonId" placeholder="请选择销售人员" style="width: 100%">
+                <el-option v-for="user in userOptions" :key="user.userId" :label="user.nickName" :value="user.userId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="检疫证号" prop="quarantineNo">
+              <el-input v-model="form.quarantineNo" placeholder="请输入检疫证号" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="审批编号" prop="approvalNo">
+              <el-input v-model="form.approvalNo" placeholder="请输入审批编号" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="技术员" prop="technicianId">
+              <el-select v-model="form.technicianId" placeholder="请选择技术员" style="width: 100%">
+                <el-option v-for="user in userOptions" :key="user.userId" :label="user.nickName" :value="user.userId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="处理人" prop="handlerId">
+              <el-select v-model="form.handlerId" placeholder="请选择处理人" style="width: 100%">
+                <el-option v-for="user in userOptions" :key="user.userId" :label="user.nickName" :value="user.userId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :rows="2" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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>
+import {
+  listSaleRecord,
+  getSaleRecord,
+  delSaleRecord,
+  addSaleRecord,
+  updateSaleRecord,
+  getSheepInfo,
+} from '@/api/sale/saleRecord/saleRecord'
+import { listSheepfold_management } from '@/api/fileManagement/sheepfold_management'
+import { listUser } from '@/api/system/user'
+import { getDicts } from '@/api/system/dict/data'
+import { listCustomer } from '@/api/sale/customer/customer'
+
+export default {
+  name: 'SxSheepSale',
+  data() {
+    return {
+      // 通用
+      loading: true,
+      ids: [],
+      single: true,
+      multiple: true,
+      showSearch: true,
+      total: 0,
+      saleRecordList: [],
+      title: '',
+      open: false,
+
+      // 查询
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        bsManageTags: null,
+        sheepfoldId: null,
+        saleDate: null,
+        saleType: null,
+      },
+
+      // 表单
+      form: {},
+
+      // 字典
+      saleTypeOptions: [],
+      diseaseTypeOptions: [],
+      groupOptions: [],
+
+      // 下拉数据
+      sheepfoldOptions: [],
+      earTagOptions: [],
+      userOptions: [],
+      customerOptions: [],
+      customerLoading: false,
+
+      // 耳号变更侦听缓存
+      _prevTags: [],
+
+      // 校验规则（包含动态必填的自自定义 validator）
+      rules: {
+        sheepfoldId: [{ required: true, message: '羊舍不能为空', trigger: 'change' }],
+        bsManageTagsList: [{ type: 'array', required: true, message: '至少需要一个耳号', trigger: 'change' }],
+        saleDate: [{ required: true, message: '销售日期不能为空', trigger: 'change' }],
+        pricingMethod: [{ required: true, message: '计价方式不能为空', trigger: 'change' }],
+        unitPrice: [{ required: true, message: '单价不能为空', trigger: 'blur' }],
+        saleType: [{ required: true, message: '销售类别不能为空', trigger: 'change' }],
+        customerId: [{ required: true, message: '客户不能为空', trigger: 'change' }],
+        salesPersonId: [{ required: true, message: '销售人员不能为空', trigger: 'change' }],
+        diseaseType: [
+          {
+            validator: (rule, val, cb) => {
+              if (this.isEliminationSale && !val) return cb(new Error('淘汰销售必须选择疾病类型'))
+              cb()
+            },
+            trigger: 'change',
+          },
+        ],
+        groupCode: [
+          {
+            validator: (rule, val, cb) => {
+              if (this.isEliminationSale && !val) return cb(new Error('淘汰销售必须选择班组'))
+              cb()
+            },
+            trigger: 'change',
+          },
+        ],
+        secondaryReason: [
+          {
+            validator: (rule, val, cb) => {
+              if (this.diseaseTypeLabel === '病残羊' && !val) return cb(new Error('疾病类型为病残羊时必须填写次要原因'))
+              cb()
+            },
+            trigger: 'blur',
+          },
+        ],
+      },
+    }
+  },
+  computed: {
+    // 根据"标签(label)"判断淘汰类，避免 dictValue 不一致导致判断失效
+    isEliminationSale() {
+      const opt = this.saleTypeOptions.find(o => o.dictValue === this.form.saleType)
+      const label = opt ? opt.dictLabel : ''
+      return label === '淘汰销售' || label === '淘汰屠宰'
+    },
+    diseaseTypeLabel() {
+      const opt = this.diseaseTypeOptions.find(o => o.dictValue === this.form.diseaseType)
+      return opt ? opt.dictLabel : ''
+    },
+  },
+  watch: {
+    // 监听耳号多选变化：只对"新添加"的耳号拉取一次详情
+    'form.bsManageTagsList'(val = []) {
+      const added = Array.isArray(val) ? val.filter(v => !this._prevTags.includes(v)) : []
+      if (added.length > 0) {
+        this.fetchSheepInfo(added[added.length - 1])
+      }
+      this._prevTags = Array.isArray(val) ? [...val] : []
+
+      // 计价联动
+      if (this.form.pricingMethod === '按个体') {
+        this.calculateIndividualPrice()
+      } else if (this.form.pricingMethod === '按体重') {
+        this.calculateWeightPrice()
+      }
+    },
+    'form.unitPrice': function () {
+      if (this.form.pricingMethod === '按个体') {
+        this.calculateIndividualPrice()
+      } else if (this.form.pricingMethod === '按体重') {
+        this.calculateWeightPrice()
+      }
+    },
+    'form.totalWeight': function () {
+      if (this.form.pricingMethod === '按体重') this.calculateWeightPrice()
+    }
+  },
+  created() {
+    this.getList()
+    this.getDictsData()
+    this.getSheepfoldOptions()
+    this.getUserOptions()
+    this.remoteMethodGetCustomer('') // 初始化客户列表
+  },
+  methods: {
+    /** 禁用未来日期 */
+    disabledDate(time) {
+      return time.getTime() > Date.now()
+    },
+    
+    /** 查询列表 */
+    getList() {
+      this.loading = true
+      listSaleRecord(this.queryParams)
+        .then(res => {
+          this.saleRecordList = res.rows || []
+          this.total = res.total || 0
+        })
+        .finally(() => (this.loading = false))
+    },
+
+    // 字典翻译
+    saleTypeFormat(row) {
+      return this.selectDictLabel(this.saleTypeOptions, row.saleType)
+    },
+    diseaseTypeFormat(row) {
+      return this.selectDictLabel(this.diseaseTypeOptions, row.diseaseType)
+    },
+    groupFormat(row) {
+      return this.selectDictLabel(this.groupOptions, row.groupCode)
+    },
+
+    // 顶部搜索
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+
+    // 选择行
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+
+    // 新增
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加羊只销售记录'
+      this.form.eventType = '销售'
+      // 设置销售日期默认值为今天 (保持与 value-format="yyyy-MM-dd" 一致的字符串格式)
+      this.form.saleDate = new Date().toISOString().slice(0, 10)
+    },
+
+    // 修改
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getSaleRecord(id).then(response => {
+        this.form = response.data || {}
+        if (this.form.bsManageTags) {
+          this.form.bsManageTagsList = String(this.form.bsManageTags).split(',').filter(Boolean)
+        }
+        this._prevTags = Array.isArray(this.form.bsManageTagsList) ? [...this.form.bsManageTagsList] : []
+        this.open = true
+        this.title = '修改羊只销售记录'
+      })
+    },
+
+    // 取消
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+
+    // 重置
+    reset() {
+      this.form = {
+        id: null,
+        bsManageTags: null,
+        bsManageTagsList: [],
+        sheepfoldId: null,
+        variety: null,
+        sheepName: null,
+        gender: null,
+        monthAge: null,
+        parity: null,
+        breed: null,
+        postLambingDay: null,
+        lactationDay: null,
+        lambingDay: null,
+        eventType: '销售',
+        saleDate: null,
+        pricingMethod: null,
+        unitPrice: null,
+        totalPrice: null,
+        totalWeight: null,
+        avgWeight: null,
+        avgPricePerSheep: null,
+        saleType: null,
+        diseaseType: null,
+        secondaryReason: null,
+        groupCode: null,
+        customerId: null,
+        customerName: null,
+        customerPhone: null,
+        customerAddress: null,
+        salesPersonId: null,
+        salesPersonName: null,
+        quarantineNo: null,
+        approvalNo: null,
+        technicianId: null,
+        technicianName: null,
+        handlerId: null,
+        handlerName: null,
+        createdBy: null,
+        createdByName: null,
+        createdAt: null,
+        remark: null
+      }
+      this._prevTags = []
+      this.resetForm('formRef')
+    },
+
+    /** 提交 */
+    submitForm() {
+      this.$refs.formRef.validate(valid => {
+        if (!valid) return
+
+        // 耳号数组 → 逗号串
+        if (Array.isArray(this.form.bsManageTagsList) && this.form.bsManageTagsList.length > 0) {
+          this.form.bsManageTags = this.form.bsManageTagsList.join(',')
+        } else {
+          this.form.bsManageTags = null
+        }
+
+        // 由后端设置 createdBy / createdAt，更稳妥
+        const api = this.form.id ? updateSaleRecord : addSaleRecord
+        api(this.form)
+          .then(() => {
+            this.$modal.msgSuccess(this.form.id ? '修改成功' : '新增成功')
+            this.open = false
+            this.getList()
+          })
+          .catch(err => {
+            this.$modal.msgError((this.form.id ? '修改失败：' : '新增失败：') + (err.message || '未知错误'))
+          })
+      })
+    },
+
+    /** 删除 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除羊只销售记录编号为"' + ids + '"的数据项？')
+        .then(() => delSaleRecord(ids))
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('删除成功')
+        })
+        .catch(() => {})
+    },
+
+    /** 导出 */
+    handleExport() {
+      this.$modal.confirm('是否确认导出所有羊只销售记录数据项？').then(() => {
+        this.download('/saleRecord/saleRecord/export', { ...this.queryParams }, `saleRecord_${new Date().getTime()}.xlsx`)
+      })
+    },
+
+    /** 字典数据（注意 disease_type） */
+    getDictsData() {
+      getDicts('sale_type').then(r => (this.saleTypeOptions = r.data || []))
+      getDicts('disease_type').then(r => (this.diseaseTypeOptions = r.data || []))
+      getDicts('group').then(r => (this.groupOptions = r.data || []))
+    },
+
+    /** 羊舍下拉 */
+    getSheepfoldOptions() {
+      listSheepfold_management().then(r => {
+        this.sheepfoldOptions = r.rows || r.data || []
+      })
+    },
+
+    /** 用户下拉（销售人员、技术员、处理人） */
+    getUserOptions() {
+      listUser().then(r => {
+        this.userOptions = r.rows || r.data || []
+      })
+    },
+
+    /** 客户远程搜索：使用 sx_customer.name 字段 */
+    remoteMethodGetCustomer(query) {
+      this.customerLoading = true
+      const p = query ? { name: query } : {}
+      listCustomer(p)
+        .then(r => {
+          this.customerOptions = r.rows || r.data || []
+        })
+        .finally(() => (this.customerLoading = false))
+    },
+
+    /** 客户选择后回填 name/phone/address 到表单 */
+    handleCustomerChange(customerId) {
+      const customer = this.customerOptions.find(item => item.id === customerId)
+      if (customer) {
+        this.form.customerName = customer.name
+        this.form.customerPhone = customer.phone
+        this.form.customerAddress = customer.address
+      } else {
+        this.form.customerName = null
+        this.form.customerPhone = null
+        this.form.customerAddress = null
+      }
+    },
+
+    /** 羊舍改变：加载耳号（此处示例，替换成你的真实接口） */
+    handleSheepfoldChange(sheepfoldId) {
+      this.form.bsManageTagsList = []
+      this.earTagOptions = []
+      // TODO: 替换为真实接口 getEarTagsBySheepfold(sheepfoldId)
+      if (sheepfoldId) {
+        this.earTagOptions = ['1001', '1002', '1003', '1004', '1005']
+      }
+    },
+
+    /** 根据耳号查羊只信息 */
+    fetchSheepInfo(bsManageTags) {
+      if (!bsManageTags) return
+      getSheepInfo(bsManageTags).then(response => {
+        if (response.code === 200 && response.data) {
+          const data = response.data
+          this.form.variety = data.variety
+          this.form.sheepName = data.sheepName
+          this.form.gender = data.gender
+          this.form.monthAge = data.monthAge
+          this.form.parity = data.parity
+          this.form.breed = data.breed
+          this.form.postLambingDay = data.postLambingDay
+          this.form.lactationDay = data.lactationDay
+          this.form.lambingDay = data.lambingDay
+          if (!this.form.sheepfoldId && data.sheepfoldId) {
+            this.form.sheepfoldId = data.sheepfoldId
+            this.handleSheepfoldChange(data.sheepfoldId)
+          }
+        } else {
+          this.$modal.msgError(response.msg || '未查询到羊只信息')
+        }
+      })
+    },
+
+    /** 计价方式切换 */
+    handlePricingMethodChange(method) {
+      if (method === '按个体') {
+        this.form.totalWeight = null
+        this.form.avgWeight = null
+        this.calculateIndividualPrice()
+      } else if (method === '按体重') {
+        this.calculateWeightPrice()
+      }
+    },
+
+    /** 按个体计价 */
+    calculateIndividualPrice() {
+      if (this.form.pricingMethod !== '按个体') return
+      const unitPrice = parseFloat(this.form.unitPrice) || 0
+      const count = Array.isArray(this.form.bsManageTagsList) ? this.form.bsManageTagsList.length : 0
+      const total = unitPrice * count
+      this.form.totalPrice = Number.isFinite(total) ? Number(total.toFixed(2)) : 0
+      this.form.avgPricePerSheep = Number.isFinite(unitPrice) ? Number(unitPrice.toFixed(2)) : 0
+    },
+
+    /** 按体重计价 */
+    calculateWeightPrice() {
+      if (this.form.pricingMethod !== '按体重') return
+      const unitPrice = parseFloat(this.form.unitPrice) || 0
+      const totalWeight = parseFloat(this.form.totalWeight) || 0
+      const count = Array.isArray(this.form.bsManageTagsList) && this.form.bsManageTagsList.length > 0 ? this.form.bsManageTagsList.length : 1
+      const total = unitPrice * totalWeight
+      this.form.totalPrice = Number.isFinite(total) ? Number(total.toFixed(2)) : 0
+      const avgW = totalWeight / count
+      this.form.avgWeight = Number.isFinite(avgW) ? Number(avgW.toFixed(2)) : 0
+      const avgP = this.form.totalPrice / count
+      this.form.avgPricePerSheep = Number.isFinite(avgP) ? Number(avgP.toFixed(2)) : 0
+    },
+
+    /** 销售类别变化：清理并重新校验 */
+    handleSaleTypeChange() {
+      if (!this.isEliminationSale) {
+        this.form.diseaseType = null
+        this.form.groupCode = null
+        this.form.secondaryReason = null
+      }
+      this.$nextTick(() => {
+        this.$refs.formRef.clearValidate(['diseaseType', 'groupCode', 'secondaryReason'])
+      })
+    },
+
+    /** 疾病类型变化：联动"次要原因" */
+    handleDiseaseTypeChange() {
+      if (this.diseaseTypeLabel !== '病残羊') {
+        this.form.secondaryReason = null
+      }
+      this.$nextTick(() => this.$refs.formRef.clearValidate('secondaryReason'))
+    },
+  },
+}
+</script>
+
+<style scoped>
+.breadcrumb { margin-bottom: 16px; }
+.app-container { position: relative; }
+.el-table { width: 100%; overflow-x: auto; }
+</style>
diff --git a/src/views/sheep_death/death/index.vue b/src/views/sheep_death/death/index.vue
new file mode 100644
index 0000000..e212dd4
--- /dev/null
+++ b/src/views/sheep_death/death/index.vue
@@ -0,0 +1,472 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="管理耳号" prop="manageTags">
+        <el-input
+            v-model="queryParams.manageTags"
+            placeholder="请输入管理耳号"
+            clearable
+            @keyup.enter="handleQuery"
+            @blur="validateManageTagsInQuery"
+        />
+      </el-form-item>
+      <el-form-item label="事件类型" prop="eventType">
+        <el-input
+            v-model="queryParams.eventType"
+            placeholder="请输入事件类型"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="死亡日期" prop="deathDate">
+        <el-date-picker clearable
+                        v-model="queryParams.deathDate"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择死亡日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="死淘去向" prop="disposalDirection">
+        <el-select v-model="queryParams.disposalDirection" placeholder="请选择死淘去向" clearable>
+          <el-option label="深埋" value="深埋" />
+          <el-option label="无害化" value="无害化" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="技术员" prop="technician">
+        <el-input
+            v-model="queryParams.technician"
+            placeholder="请输入技术员"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="处理人" prop="handler">
+        <el-input
+            v-model="queryParams.handler"
+            placeholder="请输入处理人"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="班组" prop="workGroup">
+        <el-input
+            v-model="queryParams.workGroup"
+            placeholder="请输入班组"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+            type="primary"
+            plain
+            icon="Plus"
+            @click="handleAdd"
+            v-hasPermi="['sheep_death:death:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['sheep_death:death:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['sheep_death:death:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['sheep_death:death:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deathList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <!-- 日期作为第一列 -->
+      <el-table-column label="死亡日期" align="center" prop="deathDate" width="120" fixed="left">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.deathDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="主键ID" align="center" prop="id" width="80"/>
+      <el-table-column label="管理耳号" align="center" prop="manageTags" width="120"/>
+      <el-table-column label="品种" align="center" prop="variety" width="100"/>
+      <el-table-column label="事件类型" align="center" prop="eventType" width="100"/>
+      <el-table-column label="死亡时羊只类别" align="center" prop="sheepType" width="130"/>
+      <el-table-column label="性别" align="center" prop="gender" width="80">
+        <template #default="scope">
+          <span>{{ scope.row.gender === 1 ? '母' : scope.row.gender === 2 ? '公' : '' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="日龄" align="center" prop="dayAge" width="80"/>
+      <el-table-column label="胎次" align="center" prop="parity" width="80"/>
+      <el-table-column label="疾病类型ID" align="center" prop="diseaseTypeId" width="120"/>
+      <el-table-column label="疾病子类型ID" align="center" prop="diseaseSubtypeId" width="130"/>
+      <el-table-column label="死淘去向" align="center" prop="disposalDirection" width="100"/>
+      <el-table-column label="技术员" align="center" prop="technician" width="100"/>
+      <el-table-column label="处理人" align="center" prop="handler" width="100"/>
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" width="120"/>
+      <el-table-column label="班组" align="center" prop="workGroup" width="100"/>
+      <el-table-column label="繁育状态" align="center" prop="breedStatus" width="100"/>
+      <el-table-column label="死亡时产后天数" align="center" prop="postLambingDay" width="130"/>
+      <el-table-column label="死亡时泌乳天数" align="center" prop="lactationDay" width="130"/>
+      <el-table-column label="死亡时怀孕天数" align="center" prop="gestationDay" width="130"/>
+      <el-table-column label="创建人" align="center" prop="createBy" width="100"/>
+      <el-table-column label="创建日期" align="center" prop="createTime" width="120">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="comment" width="150"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['sheep_death:death:edit']">修改
+          </el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['sheep_death:death: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="600px" append-to-body>
+      <el-form ref="deathRef" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="管理耳号" prop="manageTags">
+              <el-input
+                  v-model="form.manageTags"
+                  placeholder="请输入管理耳号"
+                  @blur="validateManageTagsInForm"
+                  :loading="validatingTags"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="死亡日期" prop="deathDate">
+              <el-date-picker clearable
+                              v-model="form.deathDate"
+                              type="date"
+                              value-format="YYYY-MM-DD"
+                              placeholder="请选择死亡日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="疾病类型ID" prop="diseaseTypeId">
+              <el-input-number v-model="form.diseaseTypeId" placeholder="请输入疾病类型ID" :min="0"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="疾病子类型ID" prop="diseaseSubtypeId">
+              <el-input-number v-model="form.diseaseSubtypeId" placeholder="请输入疾病子类型ID" :min="0"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="死淘去向" prop="disposalDirection">
+              <el-select v-model="form.disposalDirection" placeholder="请选择死淘去向">
+                <el-option label="深埋" value="深埋"/>
+                <el-option label="无害化" value="无害化"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="技术员" prop="technician">
+              <el-input v-model="form.technician" placeholder="请输入技术员"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="处理人" prop="handler">
+              <el-input v-model="form.handler" placeholder="请输入处理人"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="班组" prop="workGroup">
+              <el-input v-model="form.workGroup" placeholder="请输入班组"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="comment">
+              <el-input v-model="form.comment" type="textarea" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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="Death">
+import {listDeath, getDeath, delDeath, addDeath, updateDeath, getSheepInfo} from "@/api/sheep_death/death"
+
+const {proxy} = getCurrentInstance()
+
+const deathList = 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 validatingTags = ref(false) // 验证管理耳号的loading状态
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    manageTags: null,
+    eventType: null,
+    deathDate: null,
+    diseaseTypeId: null,
+    diseaseSubtypeId: null,
+    disposalDirection: null,
+    technician: null,
+    handler: null,
+    workGroup: null,
+    comment: null,
+    isDelete: null
+  },
+  rules: {
+    manageTags: [
+      {required: true, message: "管理耳号不能为空", trigger: "blur"}
+    ],
+    deathDate: [
+      {required: true, message: "死亡日期不能为空", trigger: "blur"}
+    ],
+  }
+})
+
+const {queryParams, form, rules} = toRefs(data)
+
+/** 查询羊只死淘记录列表 */
+function getList() {
+  loading.value = true
+  listDeath(queryParams.value).then(response => {
+    deathList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+/** 验证查询条件中的管理耳号 */
+function validateManageTagsInQuery() {
+  const manageTags = queryParams.value.manageTags
+  if (manageTags && manageTags.trim()) {
+    validateManageTags(manageTags.trim(), 'query')
+  }
+}
+
+/** 验证表单中的管理耳号 */
+function validateManageTagsInForm() {
+  const manageTags = form.value.manageTags
+  if (manageTags && manageTags.trim()) {
+    validateManageTags(manageTags.trim(), 'form')
+  }
+}
+
+/** 验证管理耳号是否存在 */
+function validateManageTags(manageTags, source) {
+  if (validatingTags.value) return // 防止重复请求
+
+  validatingTags.value = true
+
+  getSheepInfo(manageTags).then(response => {
+    if (response.code === 200 && response.data) {
+      if (source === 'form') {
+        proxy.$modal.msgSuccess("羊只验证成功")
+      } else {
+        proxy.$modal.msgSuccess("耳号验证成功")
+      }
+    } else {
+      // 耳号不存在时清除输入并提示
+      if (source === 'form') {
+        form.value.manageTags = null
+      } else {
+        queryParams.value.manageTags = null
+      }
+      proxy.$modal.msgError("该耳号不存在")
+    }
+  }).catch(error => {
+    // 验证失败时清除输入并提示
+    if (source === 'form') {
+      form.value.manageTags = null
+    } else {
+      queryParams.value.manageTags = null
+    }
+    proxy.$modal.msgError("该耳号不存在")
+  }).finally(() => {
+    validatingTags.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    manageTags: null,
+    eventType: "死亡", // 默认事件类型
+    deathDate: new Date().toISOString().split('T')[0], // 默认今日
+    diseaseTypeId: null,
+    diseaseSubtypeId: null,
+    disposalDirection: null,
+    technician: null,
+    handler: null,
+    workGroup: null,
+    comment: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    isDelete: null
+  }
+  proxy.resetForm("deathRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getDeath(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改羊只死淘记录"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["deathRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateDeath(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addDeath(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 delDeath(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {
+  })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('sheep_death/death/export', {
+    ...queryParams.value
+  }, `death_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/stock/in/index.vue b/src/views/stock/in/index.vue
new file mode 100644
index 0000000..2e69780
--- /dev/null
+++ b/src/views/stock/in/index.vue
@@ -0,0 +1,318 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="单据日期" prop="docDate">
+        <!-- <el-input v-model="queryParams.docDate" placeholder="请输入单据日期" clearable @keyup.enter="handleQuery" /> -->
+        <el-date-picker clearable v-model="queryParams.docDate" type="date" value-format="YYYY-MM-DD"
+          placeholder="请选择时间" @change="handleQuery">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="业务类型" prop="businessType">
+        <el-input v-model="queryParams.businessType" placeholder="请输入业务类型" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="仓库" prop="repositoryName">
+        <el-input v-model="queryParams.repositoryName" placeholder="请输入仓库" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="存货" prop="materialName">
+        <el-input v-model="queryParams.materialName" placeholder="请输入存货" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['stock:in:add']"
+          v-show="false">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['stock:in:edit']" v-show="false">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['stock:in:remove']" v-show="false">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['stock:in:export']">导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['stock:in:import']">导入</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="inList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="stockInCode" />
+      <el-table-column label="单据日期" align="center" prop="docDate" />
+      <el-table-column label="创建时间" align="center" prop="createDate" />
+      <el-table-column label="单据编号" align="center" prop="docId" />
+      <el-table-column label="业务类型" align="center" prop="businessType" />
+      <el-table-column label="仓库编码" align="center" prop="repositoryId" />
+      <el-table-column label="仓库" align="center" prop="repositoryName" />
+      <el-table-column label="入库类别" align="center" prop="stockInType" />
+      <el-table-column label="供应商编码" align="center" prop="supplierId" />
+      <el-table-column label="供应商" align="center" prop="supplierName" />
+      <el-table-column label="部门编码" align="center" prop="departmentId" />
+      <el-table-column label="部门" align="center" prop="departmentName" />
+      <el-table-column label="经手人编码" align="center" prop="operatorId" />
+      <el-table-column label="经手人" align="center" prop="operatorName" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="制单人" align="center" prop="single" />
+      <el-table-column label="审核人" align="center" prop="reviewer" />
+      <el-table-column label="存货编码" align="center" prop="materialId" />
+      <el-table-column label="存货" align="center" prop="materialName" />
+      <el-table-column label="规格型号" align="center" prop="materialSpecification" />
+      <el-table-column label="计量单位" align="center" prop="materialUnit" />
+      <el-table-column label="实收数量" align="center" prop="count" />
+      <el-table-column label="入库调整" align="center" prop="stockInAdjustRemark" />
+      <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="['stock:in:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['stock:in: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="inRef" :model="form" :rules="rules" label-width="80px">
+      </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>
+
+    <!-- 入库记录导入对话框 -->
+    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="In">
+  import { listIn, getIn, delIn, addIn, updateIn } from "@/api/stock/in"
+  import { getToken } from "@/utils/auth"
+  import { isVisible } from "element-plus/es/utils/index.mjs"
+  const { proxy } = getCurrentInstance()
+
+  const inList = 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,
+      docDate: null,
+      businessType: null,
+      repositoryName: null,
+      materialName: null,
+    },
+    rules: {
+    }
+  })
+
+  /*** 用户导入参数 */
+  const upload = reactive({
+    // 是否显示弹出层（用户导入）
+    open: false,
+    // 弹出层标题（用户导入）
+    title: "",
+    // 是否禁用上传
+    isUploading: false,
+    // 是否更新已经存在的用户数据
+    updateSupport: 0,
+    // 设置上传的请求头部
+    headers: { Authorization: "Bearer " + getToken() },
+    // 上传的地址
+    url: import.meta.env.VITE_APP_BASE_API + "/stock/in/importData"
+  })
+
+  /** 导入按钮操作 */
+  function handleImport() {
+    upload.title = "入库记录导入"
+    upload.open = true
+  }
+  /** 提交上传文件 */
+  function submitFileForm() {
+    proxy.$refs["uploadRef"].submit()
+  }
+
+  /**文件上传中处理 */
+  const handleFileUploadProgress = (event, file, fileList) => {
+    upload.isUploading = true
+  }
+
+  /** 文件上传成功处理 */
+  const handleFileSuccess = (response, file, fileList) => {
+    upload.open = false
+    upload.isUploading = false
+    proxy.$refs["uploadRef"].handleRemove(file)
+    proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+    getList()
+  }
+
+  const { queryParams, form, rules } = toRefs(data)
+
+  /** 查询入库记录列表 */
+  function getList() {
+    loading.value = true
+    listIn(queryParams.value).then(response => {
+      inList.value = response.rows
+      total.value = response.total
+      loading.value = false
+    })
+  }
+
+  // 取消按钮
+  function cancel() {
+    open.value = false
+    reset()
+  }
+
+  // 表单重置
+  function reset() {
+    form.value = {
+      stockInCode: null,
+      docDate: null,
+      createDate: null,
+      docId: null,
+      businessType: null,
+      repositoryId: null,
+      repositoryName: null,
+      stockInType: null,
+      supplierId: null,
+      supplierName: null,
+      departmentId: null,
+      departmentName: null,
+      operatorId: null,
+      operatorName: null,
+      remark: null,
+      single: null,
+      reviewer: null,
+      materialId: null,
+      materialName: null,
+      materialSpecification: null,
+      materialUnit: null,
+      count: null,
+      stockInAdjustRemark: null
+    }
+    proxy.resetForm("inRef")
+  }
+
+  /** 搜索按钮操作 */
+  function handleQuery() {
+    queryParams.value.pageNum = 1
+    getList()
+  }
+
+  /** 重置按钮操作 */
+  function resetQuery() {
+    proxy.resetForm("queryRef")
+    handleQuery()
+  }
+
+  // 多选框选中数据
+  function handleSelectionChange(selection) {
+    ids.value = selection.map(item => item.stockInCode)
+    single.value = selection.length != 1
+    multiple.value = !selection.length
+  }
+
+  /** 新增按钮操作 */
+  function handleAdd() {
+    reset()
+    open.value = true
+    title.value = "添加入库记录"
+  }
+
+  /** 修改按钮操作 */
+  function handleUpdate(row) {
+    reset()
+    const _stockInCode = row.stockInCode || ids.value
+    getIn(_stockInCode).then(response => {
+      form.value = response.data
+      open.value = true
+      title.value = "修改入库记录"
+    })
+  }
+
+  /** 提交按钮 */
+  function submitForm() {
+    proxy.$refs["inRef"].validate(valid => {
+      if (valid) {
+        if (form.value.stockInCode != null) {
+          updateIn(form.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功")
+            open.value = false
+            getList()
+          })
+        } else {
+          addIn(form.value).then(response => {
+            proxy.$modal.msgSuccess("新增成功")
+            open.value = false
+            getList()
+          })
+        }
+      }
+    })
+  }
+
+  /** 删除按钮操作 */
+  function handleDelete(row) {
+    const _stockInCodes = row.stockInCode || ids.value
+    proxy.$modal.confirm('是否确认删除入库记录编号为"' + _stockInCodes + '"的数据项？').then(function () {
+      return delIn(_stockInCodes)
+    }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+    }).catch(() => { })
+  }
+
+  /** 导出按钮操作 */
+  function handleExport() {
+    proxy.download('stock/in/export', {
+      ...queryParams.value
+    }, `in_${new Date().getTime()}.xlsx`)
+  }
+
+  getList()
+</script>
diff --git a/src/views/stock/management/index.vue b/src/views/stock/management/index.vue
new file mode 100644
index 0000000..418b222
--- /dev/null
+++ b/src/views/stock/management/index.vue
@@ -0,0 +1,319 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="存货" prop="materialName">
+        <el-input v-model="queryParams.materialName" placeholder="请输入存货" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="生产日期" prop="productionDate">
+        <!-- <el-input v-model="queryParams.productionDate" placeholder="请输入生产日期" clearable @keyup.enter="handleQuery" /> -->
+        <el-date-picker clearable v-model="queryParams.productionDate" type="date" value-format="YYYY-MM-DD"
+          placeholder="请输入生产日期" @change="handleQuery">
+        </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="['stock:management:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['stock:management:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['stock:management:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['stock:management:export']">导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Upload" @click="handleImport"
+          v-hasPermi="['stock:management:import']">导入</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="materialManagementCode" />
+      <el-table-column label="存货编码" align="center" prop="materialId" />
+      <el-table-column label="存货" align="center" prop="materialName" />
+      <el-table-column label="批号" align="center" prop="batchId" />
+      <el-table-column label="规格型号" align="center" prop="materialSpecification" />
+      <el-table-column label="主计量" align="center" prop="materialUnit" />
+      <el-table-column label="现存量(主)" align="center" prop="currentStock" />
+      <el-table-column label="库存预警" align="center" prop="stockAlarm" />
+      <el-table-column label="生产日期" align="center" prop="productionDate" />
+      <el-table-column label="失效日期" align="center" prop="expirationDate" />
+      <el-table-column label="失效预警" align="center" prop="expirationAlarm" />
+      <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="['stock:management:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['stock:management: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="managementRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="存货编码" prop="materialId">
+          <el-input v-model="form.materialId" placeholder="请输入存货编码" />
+        </el-form-item>
+        <el-form-item label="存货" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入存货名称" />
+        </el-form-item>
+        <el-form-item label="批号" prop="batchId">
+          <el-input v-model="form.batchId" placeholder="请输入批号" />
+        </el-form-item>
+        <el-form-item label="规格型号" prop="materialSpecification">
+          <el-input v-model="form.materialSpecification" placeholder="请输入规格型号" />
+        </el-form-item>
+        <el-form-item label="主计量" prop="materialUnit">
+          <el-input v-model="form.materialUnit" placeholder="请输入计量单位" />
+        </el-form-item>
+        <el-form-item label="现存量" prop="currentStock">
+          <el-input v-model="form.currentStock" placeholder="请输入现存量" />
+        </el-form-item>
+        <el-form-item label="生产日期" prop="productionDate">
+          <el-date-picker clearable v-model="form.productionDate" type="date" value-format="YYYY-MM-DD"
+            placeholder="请选择生产日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="失效日期" prop="expirationDate">
+          <el-date-picker clearable v-model="form.expirationDate" type="date" value-format="YYYY-MM-DD"
+            placeholder="请选择失效日期">
+          </el-date-picker>
+        </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>
+
+    <!-- 物资管理记录导入对话框 -->
+    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Management">
+  import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
+  import { getToken } from "@/utils/auth"
+  const { proxy } = getCurrentInstance()
+
+  const managementList = 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,
+      materialName: null,
+      productionDate: null,
+    },
+    rules: {
+      materialId: [
+        { required: true, message: "存货编码不能为空", trigger: "blur" }
+      ],
+      materialName: [
+        { required: true, message: "存货不能为空", trigger: "blur" }
+      ],
+    }
+  })
+
+  /*** 用户导入参数 */
+  const upload = reactive({
+    // 是否显示弹出层（用户导入）
+    open: false,
+    // 弹出层标题（用户导入）
+    title: "",
+    // 是否禁用上传
+    isUploading: false,
+    // 是否更新已经存在的用户数据
+    updateSupport: 0,
+    // 设置上传的请求头部
+    headers: { Authorization: "Bearer " + getToken() },
+    // 上传的地址
+    url: import.meta.env.VITE_APP_BASE_API + "/stock/management/importData"
+  })
+
+  /** 导入按钮操作 */
+  function handleImport() {
+    upload.title = "物资记录导入"
+    upload.open = true
+  }
+  /** 提交上传文件 */
+  function submitFileForm() {
+    proxy.$refs["uploadRef"].submit()
+  }
+
+  /**文件上传中处理 */
+  const handleFileUploadProgress = (event, file, fileList) => {
+    upload.isUploading = true
+  }
+
+  /** 文件上传成功处理 */
+  const handleFileSuccess = (response, file, fileList) => {
+    upload.open = false
+    upload.isUploading = false
+    proxy.$refs["uploadRef"].handleRemove(file)
+    proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+    getList()
+  }
+  const { queryParams, form, rules } = toRefs(data)
+
+  /** 查询物资管理列表 */
+  function getList() {
+    loading.value = true
+    listManagement(queryParams.value).then(response => {
+      managementList.value = response.rows
+      total.value = response.total
+      loading.value = false
+    })
+  }
+
+  // 取消按钮
+  function cancel() {
+    open.value = false
+    reset()
+  }
+
+  // 表单重置
+  function reset() {
+    form.value = {
+      materialManagementCode: null,
+      materialId: null,
+      materialName: null,
+      batchId: null,
+      materialSpecification: null,
+      materialUnit: null,
+      currentStock: null,
+      stockAlarm: null,
+      productionDate: null,
+      expirationDate: null,
+      expirationAlarm: null
+    }
+    proxy.resetForm("managementRef")
+  }
+
+  /** 搜索按钮操作 */
+  function handleQuery() {
+    queryParams.value.pageNum = 1
+    getList()
+  }
+
+  /** 重置按钮操作 */
+  function resetQuery() {
+    proxy.resetForm("queryRef")
+    handleQuery()
+  }
+
+  // 多选框选中数据
+  function handleSelectionChange(selection) {
+    ids.value = selection.map(item => item.materialManagementCode)
+    single.value = selection.length != 1
+    multiple.value = !selection.length
+  }
+
+  /** 新增按钮操作 */
+  function handleAdd() {
+    reset()
+    open.value = true
+    title.value = "添加物资管理"
+  }
+
+  /** 修改按钮操作 */
+  function handleUpdate(row) {
+    reset()
+    const _materialManagementCode = row.materialManagementCode || ids.value
+    getManagement(_materialManagementCode).then(response => {
+      form.value = response.data
+      open.value = true
+      title.value = "修改物资管理"
+    })
+  }
+
+  /** 提交按钮 */
+  function submitForm() {
+    proxy.$refs["managementRef"].validate(valid => {
+      if (valid) {
+        if (form.value.materialManagementCode != null) {
+          updateManagement(form.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功")
+            open.value = false
+            getList()
+          })
+        } else {
+          addManagement(form.value).then(response => {
+            proxy.$modal.msgSuccess("新增成功")
+            open.value = false
+            getList()
+          })
+        }
+      }
+    })
+  }
+
+  /** 删除按钮操作 */
+  function handleDelete(row) {
+    const _materialManagementCodes = row.materialManagementCode || ids.value
+    proxy.$modal.confirm('是否确认删除物资管理编号为"' + _materialManagementCodes + '"的数据项？').then(function () {
+      return delManagement(_materialManagementCodes)
+    }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+    }).catch(() => { })
+  }
+
+  /** 导出按钮操作 */
+  function handleExport() {
+    proxy.download('stock/management/export', {
+      ...queryParams.value
+    }, `management_${new Date().getTime()}.xlsx`)
+  }
+
+  getList()
+</script>
diff --git a/src/views/stock/out/index.vue b/src/views/stock/out/index.vue
new file mode 100644
index 0000000..4eefd81
--- /dev/null
+++ b/src/views/stock/out/index.vue
@@ -0,0 +1,330 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="仓库名称" prop="repositoryName">
+        <el-input v-model="queryParams.repositoryName" placeholder="请输入仓库名称" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="项目" prop="projectName">
+        <el-input v-model="queryParams.projectName" placeholder="请输入项目" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="生产车间" prop="departmentName">
+        <el-input v-model="queryParams.departmentName" placeholder="请输入生产车间" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="材料名称" prop="materialName">
+        <el-input v-model="queryParams.materialName" placeholder="请输入材料名称" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['stock:out:add']" v-show="false">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['stock:out:edit']" v-show="false">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['stock:out:remove']" v-show="false">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['stock:out:export']">导出</el-button>
+      </el-col>
+            <el-col :span="1.5">
+        <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['stock:out:import']">导入</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="outList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="stockOutCode" />
+      <el-table-column label="单据日期" align="center" prop="docDate" />
+      <el-table-column label="创建时间" align="center" prop="createDate" />
+      <el-table-column label="单据编号" align="center" prop="docId" />
+      <el-table-column label="业务类型" align="center" prop="businessType" />
+      <el-table-column label="仓库编码" align="center" prop="repositoryId" />
+      <el-table-column label="仓库名称" align="center" prop="repositoryName" />
+      <el-table-column label="项目分类" align="center" prop="projectClassification" />
+      <el-table-column label="项目编码" align="center" prop="projectId" />
+      <el-table-column label="项目" align="center" prop="projectName" />
+      <el-table-column label="生产车间编码" align="center" prop="departmentId" />
+      <el-table-column label="生产车间" align="center" prop="departmentName" />
+      <el-table-column label="领用人编码" align="center" prop="receiverId" />
+      <el-table-column label="领用人" align="center" prop="receiver" />
+      <el-table-column label="制单人" align="center" prop="single" />
+      <el-table-column label="审核人" align="center" prop="reviewer" />
+      <el-table-column label="审核时间" align="center" prop="reviewDate" />
+      <el-table-column label="修改人" align="center" prop="modifier" />
+      <el-table-column label="材料分类编码" align="center" prop="materialClassId" />
+      <el-table-column label="材料分类" align="center" prop="materialClassName" />
+      <el-table-column label="材料编码" align="center" prop="materialId" />
+      <el-table-column label="材料名称" align="center" prop="materialName" />
+      <el-table-column label="材料规格" align="center" prop="materialSpecification" />
+      <el-table-column label="计量单位" align="center" prop="materialUnit" />
+      <el-table-column label="数量" align="center" prop="count" />
+      <el-table-column label="批号" align="center" prop="batchId" />
+      <el-table-column label="生产日期" align="center" prop="productionDate" />
+      <el-table-column label="保质期" align="center" prop="shelfLife" />
+      <el-table-column label="保质期单位" align="center" prop="shelfLifeUnit" />
+      <el-table-column label="失效日期" align="center" prop="expirationDate" />
+      <el-table-column label="代理人" align="center" prop="agent" />
+      <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="['stock:out:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['stock:out: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="outRef" :model="form" :rules="rules" label-width="80px">
+      </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>
+
+     <!-- 入库记录导入对话框 -->
+    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Out">
+  import { listOut, getOut, delOut, addOut, updateOut } from "@/api/stock/out"
+  import { getToken } from "@/utils/auth"
+  const { proxy } = getCurrentInstance()
+
+  const outList = 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,
+      businessType: null,
+      repositoryName: null,
+      projectName: null,
+      departmentName: null,
+      materialName: null,
+    },
+    rules: {
+    }
+  })
+  /*** 用户导入参数 */
+  const upload = reactive({
+    // 是否显示弹出层（用户导入）
+    open: false,
+    // 弹出层标题（用户导入）
+    title: "",
+    // 是否禁用上传
+    isUploading: false,
+    // 是否更新已经存在的用户数据
+    updateSupport: 0,
+    // 设置上传的请求头部
+    headers: { Authorization: "Bearer " + getToken() },
+    // 上传的地址
+    url: import.meta.env.VITE_APP_BASE_API + "/stock/out/importData"
+  })
+
+  /** 导入按钮操作 */
+  function handleImport() {
+    upload.title = "出库记录导入"
+    upload.open = true
+  }
+  /** 提交上传文件 */
+  function submitFileForm() {
+    proxy.$refs["uploadRef"].submit()
+  }
+
+  /**文件上传中处理 */
+  const handleFileUploadProgress = (event, file, fileList) => {
+    upload.isUploading = true
+  }
+
+  /** 文件上传成功处理 */
+  const handleFileSuccess = (response, file, fileList) => {
+    upload.open = false
+    upload.isUploading = false
+    proxy.$refs["uploadRef"].handleRemove(file)
+    proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+    getList()
+  }
+
+
+  const { queryParams, form, rules } = toRefs(data)
+
+  /** 查询出库记录列表 */
+  function getList() {
+    loading.value = true
+    listOut(queryParams.value).then(response => {
+      outList.value = response.rows
+      total.value = response.total
+      loading.value = false
+    })
+  }
+
+  // 取消按钮
+  function cancel() {
+    open.value = false
+    reset()
+  }
+
+  // 表单重置
+  function reset() {
+    form.value = {
+      stockOutCode: null,
+      docDate: null,
+      createDate: null,
+      docId: null,
+      businessType: null,
+      repositoryId: null,
+      repositoryName: null,
+      projectClassification: null,
+      projectId: null,
+      projectName: null,
+      departmentId: null,
+      departmentName: null,
+      receiverId: null,
+      receiver: null,
+      single: null,
+      reviewer: null,
+      reviewDate: null,
+      modifier: null,
+      materialClassId: null,
+      materialId: null,
+      materialClassName: null,
+      materialName: null,
+      materialSpecification: null,
+      materialUnit: null,
+      count: null,
+      batchId: null,
+      productionDate: null,
+      shelfLife: null,
+      shelfLifeUnit: null,
+      expirationDate: null,
+      agent: null
+    }
+    proxy.resetForm("outRef")
+  }
+
+  /** 搜索按钮操作 */
+  function handleQuery() {
+    queryParams.value.pageNum = 1
+    getList()
+  }
+
+  /** 重置按钮操作 */
+  function resetQuery() {
+    proxy.resetForm("queryRef")
+    handleQuery()
+  }
+
+  // 多选框选中数据
+  function handleSelectionChange(selection) {
+    ids.value = selection.map(item => item.stockOutCode)
+    single.value = selection.length != 1
+    multiple.value = !selection.length
+  }
+
+  /** 新增按钮操作 */
+  function handleAdd() {
+    reset()
+    open.value = true
+    title.value = "添加出库记录"
+  }
+
+  /** 修改按钮操作 */
+  function handleUpdate(row) {
+    reset()
+    const _stockOutCode = row.stockOutCode || ids.value
+    getOut(_stockOutCode).then(response => {
+      form.value = response.data
+      open.value = true
+      title.value = "修改出库记录"
+    })
+  }
+
+  /** 提交按钮 */
+  function submitForm() {
+    proxy.$refs["outRef"].validate(valid => {
+      if (valid) {
+        if (form.value.stockOutCode != null) {
+          updateOut(form.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功")
+            open.value = false
+            getList()
+          })
+        } else {
+          addOut(form.value).then(response => {
+            proxy.$modal.msgSuccess("新增成功")
+            open.value = false
+            getList()
+          })
+        }
+      }
+    })
+  }
+
+  /** 删除按钮操作 */
+  function handleDelete(row) {
+    const _stockOutCodes = row.stockOutCode || ids.value
+    proxy.$modal.confirm('是否确认删除出库记录编号为"' + _stockOutCodes + '"的数据项？').then(function () {
+      return delOut(_stockOutCodes)
+    }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+    }).catch(() => { })
+  }
+
+  /** 导出按钮操作 */
+  function handleExport() {
+    proxy.download('stock/out/export', {
+      ...queryParams.value
+    }, `out_${new Date().getTime()}.xlsx`)
+  }
+
+  getList()
+</script>
diff --git a/vite.config.js b/vite.config.js
index 0543884..4f566a6 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,7 +2,7 @@ import path from 'path'
 import { defineConfig, loadEnv } from 'vite'
 import createVitePlugins from './vite/plugins'
 
-const baseUrl = 'http://localhost:8080' // 后端接口
+const baseUrl = 'http://127.0.0.1:8080' // 后端接口
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {