Merge branch 'main' of http://e19510c831.iok.la/admin/zhyc-sheep-ui

src/api/Weaning/weaning_record.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询断奶记录列表
+export function listWeaning_record(query) {
+  return request({
+    url: '/Weaning/weaning_record/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询断奶记录详细
+export function getWeaning_record(id) {
+  return request({
+    url: '/Weaning/weaning_record/' + id,
+    method: 'get'
+  })
+}
+
+// 新增断奶记录
+export function addWeaning_record(data) {
+  return request({
+    url: '/Weaning/weaning_record',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改断奶记录
+export function updateWeaning_record(data) {
+  return request({
+    url: '/Weaning/weaning_record',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除断奶记录
+export function delWeaning_record(id) {
+  return request({
+    url: '/Weaning/weaning_record/' + id,
+    method: 'delete'
+  })
+}
+
+// 根据耳号查询羊只ID
+export function getSheepIdByEarNumber(earNumber) {
+  return request({
+    url: '/Weaning/weaning_record/sheepId/' + earNumber,
+    method: 'get'
+  })
+}

src/api/biosafety/deworm.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询驱虫列表
+export function listDeworm(query) {
+  return request({
+    url: '/biosafety/deworm/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询驱虫详细
+export function getDeworm(id) {
+  return request({
+    url: '/biosafety/deworm/' + id,
+    method: 'get'
+  })
+}
+
+// 新增驱虫
+export function addDeworm(data) {
+  return request({
+    url: '/biosafety/deworm',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改驱虫
+export function updateDeworm(data) {
+  return request({
+    url: '/biosafety/deworm',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除驱虫
+export function delDeworm(id) {
+  return request({
+    url: '/biosafety/deworm/' + id,
+    method: 'delete'
+  })
+}

src/api/biosafety/disinfect.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询消毒记录列表
+export function listDisinfect(query) {
+  return request({
+    url: '/biosafety/disinfect/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询消毒记录详细
+export function getDisinfect(id) {
+  return request({
+    url: '/biosafety/disinfect/' + id,
+    method: 'get'
+  })
+}
+
+// 新增消毒记录
+export function addDisinfect(data) {
+  return request({
+    url: '/biosafety/disinfect',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改消毒记录
+export function updateDisinfect(data) {
+  return request({
+    url: '/biosafety/disinfect',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除消毒记录
+export function delDisinfect(id) {
+  return request({
+    url: '/biosafety/disinfect/' + id,
+    method: 'delete'
+  })
+}

src/api/biosafety/health.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询保健列表
+export function listHealth(query) {
+  return request({
+    url: '/biosafety/health/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询保健详细
+export function getHealth(id) {
+  return request({
+    url: '/biosafety/health/' + id,
+    method: 'get'
+  })
+}
+
+// 新增保健
+export function addHealth(data) {
+  return request({
+    url: '/biosafety/health',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改保健
+export function updateHealth(data) {
+  return request({
+    url: '/biosafety/health',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除保健
+export function delHealth(id) {
+  return request({
+    url: '/biosafety/health/' + id,
+    method: 'delete'
+  })
+}

src/api/biosafety/immunity.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询免疫列表
+export function listImmunity(query) {
+  return request({
+    url: '/biosafety/immunity/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询免疫详细
+export function getImmunity(id) {
+  return request({
+    url: '/biosafety/immunity/' + id,
+    method: 'get'
+  })
+}
+
+// 新增免疫
+export function addImmunity(data) {
+  return request({
+    url: '/biosafety/immunity',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改免疫
+export function updateImmunity(data) {
+  return request({
+    url: '/biosafety/immunity',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除免疫
+export function delImmunity(id) {
+  return request({
+    url: '/biosafety/immunity/' + id,
+    method: 'delete'
+  })
+}

src/api/biosafety/items.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询检疫项目列表
+export function listItems(query) {
+  return request({
+    url: '/biosafety/items/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询检疫项目详细
+export function getItems(id) {
+  return request({
+    url: '/biosafety/items/' + id,
+    method: 'get'
+  })
+}
+
+// 新增检疫项目
+export function addItems(data) {
+  return request({
+    url: '/biosafety/items',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改检疫项目
+export function updateItems(data) {
+  return request({
+    url: '/biosafety/items',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除检疫项目
+export function delItems(id) {
+  return request({
+    url: '/biosafety/items/' + id,
+    method: 'delete'
+  })
+}

src/api/biosafety/quarantine.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询检疫记录列表
+export function listQuarantine(query) {
+  return request({
+    url: '/bisosafety/quarantine/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询检疫记录详细
+export function getQuarantine(id) {
+  return request({
+    url: '/bisosafety/quarantine/' + id,
+    method: 'get'
+  })
+}
+
+// 新增检疫记录
+export function addQuarantine(data) {
+  return request({
+    url: '/bisosafety/quarantine',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改检疫记录
+export function updateQuarantine(data) {
+  return request({
+    url: '/bisosafety/quarantine',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除检疫记录
+export function delQuarantine(id) {
+  return request({
+    url: '/bisosafety/quarantine/' + id,
+    method: 'delete'
+  })
+}

src/api/biosafety/sample.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询样品类型列表
+export function listSample(query) {
+  return request({
+    url: '/biosafety/sample/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询样品类型详细
+export function getSample(id) {
+  return request({
+    url: '/biosafety/sample/' + id,
+    method: 'get'
+  })
+}
+
+// 新增样品类型
+export function addSample(data) {
+  return request({
+    url: '/biosafety/sample',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改样品类型
+export function updateSample(data) {
+  return request({
+    url: '/biosafety/sample',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除样品类型
+export function delSample(id) {
+  return request({
+    url: '/biosafety/sample/' + id,
+    method: 'delete'
+  })
+}

src/api/breed/lambing_records.js

@@ -0,0 +1,80 @@
+import request from '@/utils/request'
+
+// 查询产羔记录列表（包含关联信息）
+export function listLambing_records(query) {
+  return request({
+    url: '/breed/lambing_records/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询产羔记录详细
+export function getLambing_records(id) {
+  return request({
+    url: '/breed/lambing_records/' + id,
+    method: 'get'
+  })
+}
+
+// 新增产羔记录（包含羔羊信息）
+export function addLambing_records(data) {
+  return request({
+    url: '/breed/lambing_records',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改产羔记录
+export function updateLambing_records(data) {
+  return request({
+    url: '/breed/lambing_records',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除产羔记录
+export function delLambing_records(id) {
+  return request({
+    url: '/breed/lambing_records/' + id,
+    method: 'delete'
+  })
+}
+
+// 查询产羔详情（从羊只信息表查询羔羊信息）
+export function getLambDetail(lambingRecordId) {
+  return request({
+    url: '/breed/lambing_records/lamb_detail/' + lambingRecordId,
+    method: 'get'
+  })
+}
+
+// 根据羊只ID查询羊只基础信息
+export function getSheepInfo(sheepId) {
+  return request({
+    url: '/breed/sheep/info/' + sheepId,
+    method: 'get'
+  })
+}
+
+// 根据羊只ID查询配种记录
+export function getBreedingRecord(sheepId, parity) {
+  return request({
+    url: '/breed/breeding_records/by_sheep/' + sheepId + '/' + parity,
+    method: 'get'
+  })
+}
+
+// 获取品种列表
+export function getVarietyList() {
+  return request({
+    url: '/base/variety/list',
+    method: 'get',
+    params: {
+      pageNum: 1,
+      pageSize: 1000  // 获取所有品种
+    }
+  })
+}

src/api/dairyProducts/dryMatterCorrection/dryMatterCorrection.js

@@ -5,9 +5,7 @@ export function listDryMatterCorrection(query) {
   return request({
     url: '/dryMatterCorrection/dryMatterCorrection/list',
     method: 'get',
-    params: {
-      datetime: query.datetime // 只传递年月参数
-    }
+    params: query
   })
 }
 
@@ -43,4 +41,4 @@ export function delDryMatterCorrection(id) {
     url: '/dryMatterCorrection/dryMatterCorrection/' + id,
     method: 'delete'
   })
-}
+}

src/api/dairyProducts/parityCorrection/parityCorrection.js

@@ -0,0 +1,46 @@
+// 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

src/api/dairyProducts/rawMilkTest/rawMilkTest.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询生乳检验记录列表
+export function listRawMilkTest(query) {
+  return request({
+    url: '/rawMilkTest/rawMilkTest/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询生乳检验记录详细
+export function getRawMilkTest(id) {
+  return request({
+    url: '/rawMilkTest/rawMilkTest/' + id,
+    method: 'get'
+  })
+}
+
+// 新增生乳检验记录
+export function addRawMilkTest(data) {
+  return request({
+    url: '/rawMilkTest/rawMilkTest',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改生乳检验记录
+export function updateRawMilkTest(data) {
+  return request({
+    url: '/rawMilkTest/rawMilkTest',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除生乳检验记录
+export function delRawMilkTest(id) {
+  return request({
+    url: '/rawMilkTest/rawMilkTest/' + id,
+    method: 'delete'
+  })
+}

src/api/dairyProducts/weightCorrection/weightCorrection.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询称重校正列表
+export function listWeightCorrection(query) {
+  return request({
+    url: '/weightCorrection/weightCorrection/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询称重校正详细
+export function getWeightCorrection(id) {
+  return request({
+    url: '/weightCorrection/weightCorrection/' + id,
+    method: 'get'
+  })
+}
+
+// 新增称重校正
+export function addWeightCorrection(data) {
+  return request({
+    url: '/weightCorrection/weightCorrection',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改称重校正
+export function updateWeightCorrection(data) {
+  return request({
+    url: '/weightCorrection/weightCorrection',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除称重校正
+export function delWeightCorrection(id) {
+  return request({
+    url: '/weightCorrection/weightCorrection/' + id,
+    method: 'delete'
+  })
+}

src/api/diagnosis/diagnosis.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询诊疗结果列表
+export function listDiagnosis(query) {
+  return request({
+    url: '/diagnosis/diagnosis/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询诊疗结果详细
+export function getDiagnosis(id) {
+  return request({
+    url: '/diagnosis/diagnosis/' + id,
+    method: 'get'
+  })
+}
+
+// 新增诊疗结果
+export function addDiagnosis(data) {
+  return request({
+    url: '/diagnosis/diagnosis',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改诊疗结果
+export function updateDiagnosis(data) {
+  return request({
+    url: '/diagnosis/diagnosis',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除诊疗结果
+export function delDiagnosis(id) {
+  return request({
+    url: '/diagnosis/diagnosis/' + id,
+    method: 'delete'
+  })
+}

src/api/fileManagement/group_management.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询分组管理列表
+export function listGroup_management(query) {
+  return request({
+    url: '/group_management/group_management/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询分组管理详细
+export function getGroup_management(groupId) {
+  return request({
+    url: '/group_management/group_management/' + groupId,
+    method: 'get'
+  })
+}
+
+// 新增分组管理
+export function addGroup_management(data) {
+  return request({
+    url: '/group_management/group_management',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改分组管理
+export function updateGroup_management(data) {
+  return request({
+    url: '/group_management/group_management',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除分组管理
+export function delGroup_management(groupId) {
+  return request({
+    url: '/group_management/group_management/' + groupId,
+    method: 'delete'
+  })
+}

src/api/fileManagement/sheep_file.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询羊只基本信息列表
+// 查询羊只档案列表
 export function listSheep_file(query) {
   return request({
     url: '/sheep_file/sheep_file/list',
@@ -9,7 +9,7 @@ export function listSheep_file(query) {
   })
 }
 
-// 查询羊只基本信息详细
+// 查询羊只档案详细
 export function getSheep_file(id) {
   return request({
     url: '/sheep_file/sheep_file/' + id,
@@ -17,25 +17,8 @@ export function getSheep_file(id) {
   })
 }
 
-// 新增羊只基本信息
-export function addSheep_file(data) {
-  return request({
-    url: '/sheep_file/sheep_file',
-    method: 'post',
-    data: data
-  })
-}
 
-// 修改羊只基本信息
-export function updateSheep_file(data) {
-  return request({
-    url: '/sheep_file/sheep_file',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除羊只基本信息
+// 删除羊只档案
 export function delSheep_file(id) {
   return request({
     url: '/sheep_file/sheep_file/' + id,

src/api/fileManagement/sheepfold_management.js

@@ -42,3 +42,16 @@ export function delSheepfold_management(id) {
     method: 'delete'
   })
 }
+
+// 检查羊舍编号是否已存在
+export function checkSheepfoldNoExist(ranchId, sheepfoldTypeId, sheepfoldNo) {
+  return request({
+    url: '/sheepfold_management/sheepfold_management/checkSheepfoldNoExist',
+    method: 'get',
+    params: {
+      ranchId: ranchId,
+      sheepfoldTypeId: sheepfoldTypeId,
+      sheepfoldNo: sheepfoldNo
+    }
+  })
+}

src/api/treatment/treatment.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询治疗记录列表
+export function listTreatment(query) {
+  return request({
+    url: '/treatment/treatment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询治疗记录详细
+export function getTreatment(id) {
+  return request({
+    url: '/treatment/treatment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增治疗记录
+export function addTreatment(data) {
+  return request({
+    url: '/treatment/treatment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改治疗记录
+export function updateTreatment(data) {
+  return request({
+    url: '/treatment/treatment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除治疗记录
+export function delTreatment(id) {
+  return request({
+    url: '/treatment/treatment/' + id,
+    method: 'delete'
+  })
+}

src/api/variety/variety.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询羊只品种列表
+export function listVariety(query) {
+  return request({
+    url: '/variety/variety/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询羊只品种详细
+export function getVariety(id) {
+  return request({
+    url: '/variety/variety/' + id,
+    method: 'get'
+  })
+}
+
+// 新增羊只品种
+export function addVariety(data) {
+  return request({
+    url: '/variety/variety',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改羊只品种
+export function updateVariety(data) {
+  return request({
+    url: '/variety/variety',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除羊只品种
+export function delVariety(id) {
+  return request({
+    url: '/variety/variety/' + id,
+    method: 'delete'
+  })
+}

src/router/index.js

@@ -84,6 +84,7 @@ export const constantRoutes = [
       }
     ]
   }
+  
 ]
 
 // 动态路由，基于用户权限动态去加载
@@ -157,7 +158,7 @@ export const dynamicRoutes = [
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }
     ]
-  }
+  },
 ]
 
 const router = createRouter({

src/views/Weaning/weaning_record/index.vue

@@ -0,0 +1,433 @@
+<template>
+  <div class="app-container">
+    <!-- 查询表单 -->
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="耳号" prop="earNumber">
+        <el-input
+            v-model="queryParams.earNumber"
+            placeholder="请输入耳号"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="品种" prop="breed">
+        <el-input
+            v-model="queryParams.breed"
+            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="gender">
+        <el-select v-model="queryParams.gender" placeholder="请选择性别" clearable>
+          <el-option label="公" value="公"></el-option>
+          <el-option label="母" value="母"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="父号" prop="fatherNumber">
+        <el-input
+            v-model="queryParams.fatherNumber"
+            placeholder="请输入父号"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="母号" prop="motherNumber">
+        <el-input
+            v-model="queryParams.motherNumber"
+            placeholder="请输入母号"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否留养" prop="status">
+        <el-select v-model="queryParams.status" 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="sheepPen">
+        <el-input
+            v-model="queryParams.sheepPen"
+            placeholder="请输入羊舍"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </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="breedingStatus">
+        <el-select v-model="queryParams.breedingStatus" placeholder="请选择繁育状态" clearable>
+          <el-option label="未配种" value="未配种"></el-option>
+          <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>
+        <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="['Weaning:weaning_record:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['Weaning:weaning_record:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['Weaning:weaning_record:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['Weaning:weaning_record:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 数据表格 -->
+    <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">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <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" />
+      <el-table-column label="月龄" align="center" prop="monthAge" width="80" />
+      <el-table-column label="出生重量(kg)" align="center" prop="birthWeight" width="120" />
+      <el-table-column label="断奶重量(kg)" align="center" prop="weight" width="120" />
+      <el-table-column label="是否留养" align="center" prop="status" width="100">
+        <template #default="scope">
+          <el-tag :type="scope.row.status == '1' ? 'success' : 'danger'">
+            {{ scope.row.status == '1' ? '留养' : '不留养' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="电子耳号" align="center" prop="electronicTags" width="120" />
+      <el-table-column label="羊舍" align="center" prop="sheepPen" width="100" />
+      <el-table-column label="技术员" align="center" prop="technician" width="100" />
+      <el-table-column label="繁育状态" align="center" prop="breedingStatus" width="100" />
+      <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" fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['Weaning:weaning_record:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['Weaning:weaning_record: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="weaning_recordRef" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="耳号" prop="earNumber">
+              <el-input v-model="form.earNumber" placeholder="请输入耳号" @blur="handleEarNumberBlur" />
+            </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="断奶重量(kg)" prop="weight">
+              <el-input-number v-model="form.weight" :precision="2" :step="0.1" placeholder="请输入断奶重量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否留养" prop="status">
+              <el-select v-model="form.status" placeholder="请选择是否留养">
+                <el-option label="留养" value="1"></el-option>
+                <el-option label="不留养" value="0"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <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="electronicTags">
+              <el-input v-model="form.electronicTags" 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="Weaning_record">
+import { listWeaning_record, getWeaning_record, delWeaning_record, addWeaning_record, updateWeaning_record, getSheepIdByEarNumber } from "@/api/Weaning/weaning_record"
+
+const { proxy } = getCurrentInstance()
+
+const weaning_recordList = 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,
+    earNumber: null,
+    breed: null,
+    datetime: null,
+    weight: null,
+    status: null,
+    technician: null,
+    comment: null,
+    createBy: null,
+    createTime: null,
+    electronicTags: null,
+    gender: null,
+    fatherNumber: null,
+    motherNumber: null,
+    sheepPen: null,
+    breedingStatus: null
+  },
+  rules: {
+    earNumber: [
+      { required: true, message: "耳号不能为空", trigger: "blur" }
+    ],
+    datetime: [
+      { required: true, message: "断奶日期不能为空", trigger: "blur" }
+    ],
+    weight: [
+      { required: true, message: "断奶重量不能为空", trigger: "blur" }
+    ],
+    status: [
+      { required: true, message: "是否留养不能为空", trigger: "change" }
+    ]
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询断奶记录列表 */
+function getList() {
+  loading.value = true
+  listWeaning_record(queryParams.value).then(response => {
+    weaning_recordList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    earNumber: null,
+    datetime: null,
+    weight: null,
+    status: null,
+    technician: null,
+    comment: null,
+    createBy: null,
+    createTime: null,
+    electronicTags: null
+  }
+  proxy.resetForm("weaning_recordRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getWeaning_record(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改断奶记录"
+  })
+}
+
+/** 处理耳号失焦事件 */
+function handleEarNumberBlur() {
+  if (form.value.earNumber) {
+    getSheepIdByEarNumber(form.value.earNumber).then(response => {
+      if (response.data) {
+        form.value.sheepId = response.data
+      } else {
+        proxy.$modal.msgError("未找到对应的羊只信息")
+        form.value.earNumber = null
+      }
+    })
+  }
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["weaning_recordRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateWeaning_record(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addWeaning_record(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 delWeaning_record(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {
+  })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('Weaning/weaning_record/export', {
+    ...queryParams.value
+  }, `weaning_record_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+</style>

src/views/biosafety/deworm/index.vue

@@ -0,0 +1,309 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="羊只id" prop="sheepId">
+        <el-input
+          v-model="queryParams.sheepId"
+          placeholder="请输入羊只id"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="驱虫日期" 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="technical">
+        <el-input
+          v-model="queryParams.technical"
+          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="['biosafety:deworm:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['biosafety:deworm:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['biosafety:deworm:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['biosafety:deworm:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dewormList" @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="usageId" />
+      <el-table-column label="品种" align="center" prop="variety" />
+      <el-table-column label="羊只类别" align="center" prop="sheepType" />
+      <el-table-column label="性别" align="center" prop="gender" />
+      <el-table-column label="月龄" align="center" prop="monthAge" />
+      <el-table-column label="胎次" align="center" prop="parity" />
+      <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="technical" />
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['biosafety:deworm:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['biosafety:deworm: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="dewormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="羊只id" prop="sheepId">
+          <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+        </el-form-item>
+        <el-form-item label="药品使用记录" prop="usageId">
+          <el-input v-model="form.usageId" placeholder="请输入药品使用记录" />
+        </el-form-item>
+        <el-form-item label="品种" prop="variety">
+          <el-input v-model="form.variety" placeholder="请输入品种" />
+        </el-form-item>
+        <el-form-item label="性别" prop="gender">
+          <el-input v-model="form.gender" placeholder="请输入性别" />
+        </el-form-item>
+        <el-form-item label="月龄" prop="monthAge">
+          <el-input v-model="form.monthAge" placeholder="请输入月龄" />
+        </el-form-item>
+        <el-form-item label="胎次" prop="parity">
+          <el-input v-model="form.parity" placeholder="请输入胎次" />
+        </el-form-item>
+        <el-form-item label="驱虫日期" prop="datetime">
+          <el-date-picker clearable
+            v-model="form.datetime"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择驱虫日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="技术员" prop="technical">
+          <el-input v-model="form.technical" placeholder="请输入技术员" />
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Deworm">
+import { listDeworm, getDeworm, delDeworm, addDeworm, updateDeworm } from "@/api/biosafety/deworm"
+
+const { proxy } = getCurrentInstance()
+
+const dewormList = 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 daterangeDatetime = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    sheepId: null,
+    datetime: null,
+    technical: null,
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询驱虫列表 */
+function getList() {
+  loading.value = true
+  queryParams.value.params = {}
+  if (null != daterangeDatetime && '' != daterangeDatetime) {
+    queryParams.value.params["beginDatetime"] = daterangeDatetime.value[0]
+    queryParams.value.params["endDatetime"] = daterangeDatetime.value[1]
+  }
+  listDeworm(queryParams.value).then(response => {
+    dewormList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    usageId: null,
+    variety: null,
+    sheepType: null,
+    gender: null,
+    monthAge: null,
+    parity: null,
+    datetime: null,
+    technical: null,
+    comment: null,
+    updateBy: null,
+    updateTime: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("dewormRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  daterangeDatetime.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加驱虫"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getDeworm(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改驱虫"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["dewormRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateDeworm(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addDeworm(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 delDeworm(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('biosafety/deworm/export', {
+    ...queryParams.value
+  }, `deworm_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>

src/views/biosafety/diagnosis/index.vue

@@ -0,0 +1,372 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="羊只id" prop="sheepId">
+        <el-input
+          v-model="queryParams.sheepId"
+          placeholder="请输入羊只id"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="时间日期" 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="diseasePid">
+        <el-input
+          v-model="queryParams.diseasePid"
+          placeholder="请输入疾病类型"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="子疾病" prop="diseaseId">
+        <el-input
+          v-model="queryParams.diseaseId"
+          placeholder="请输入子疾病"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="诊疗结果" prop="result">
+        <el-input
+          v-model="queryParams.result"
+          placeholder="请输入诊疗结果"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="治疗天数" prop="treatDay">
+        <el-input
+          v-model="queryParams.treatDay"
+          placeholder="请输入治疗天数"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="羊舍id" prop="sheepfoldId">
+        <el-input
+          v-model="queryParams.sheepfoldId"
+          placeholder="请输入羊舍id"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <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="['diagnosis:diagnosis:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['diagnosis:diagnosis:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['diagnosis:diagnosis:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['diagnosis:diagnosis:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="diagnosisList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="治疗记录id" align="center" prop="treatId" />
+      <el-table-column label="羊只id" align="center" prop="sheepId" />
+      <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="sheepType" />
+      <el-table-column label="性别" align="center" prop="gender" />
+      <el-table-column label="胎次" align="center" prop="parity" />
+      <el-table-column label="疾病类型" align="center" prop="diseasePid" />
+      <el-table-column label="子疾病" align="center" prop="diseaseId" />
+      <el-table-column label="诊疗结果" align="center" prop="result" />
+      <el-table-column label="开始时间" align="center" prop="begindate" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.begindate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="enddate" width="180">
+        <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="羊舍id" align="center" prop="sheepfoldId" />
+      <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="['diagnosis:diagnosis:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['diagnosis:diagnosis: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="diagnosisRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="羊只id" prop="sheepId">
+          <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+        </el-form-item>
+        <el-form-item label="时间日期" prop="datetime">
+          <el-date-picker clearable
+            v-model="form.datetime"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择时间日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="性别" prop="gender">
+          <el-input v-model="form.gender" placeholder="请输入性别" />
+        </el-form-item>
+        <el-form-item label="胎次" prop="parity">
+          <el-input v-model="form.parity" placeholder="请输入胎次" />
+        </el-form-item>
+        <el-form-item label="疾病类型" prop="diseasePid">
+          <el-input v-model="form.diseasePid" placeholder="请输入疾病类型" />
+        </el-form-item>
+        <el-form-item label="子疾病" prop="diseaseId">
+          <el-input v-model="form.diseaseId" placeholder="请输入子疾病" />
+        </el-form-item>
+        <el-form-item label="诊疗结果" prop="result">
+          <el-input v-model="form.result" placeholder="请输入诊疗结果" />
+        </el-form-item>
+        <el-form-item label="开始时间" prop="begindate">
+          <el-date-picker clearable
+            v-model="form.begindate"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="enddate">
+          <el-date-picker clearable
+            v-model="form.enddate"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="治疗天数" prop="treatDay">
+          <el-input v-model="form.treatDay" placeholder="请输入治疗天数" />
+        </el-form-item>
+        <el-form-item label="羊舍id" prop="sheepfoldId">
+          <el-input v-model="form.sheepfoldId" placeholder="请输入羊舍id" />
+        </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="Diagnosis">
+import { listDiagnosis, getDiagnosis, delDiagnosis, addDiagnosis, updateDiagnosis } from "@/api/diagnosis/diagnosis"
+
+const { proxy } = getCurrentInstance()
+
+const diagnosisList = 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 daterangeDatetime = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    sheepId: null,
+    datetime: null,
+    diseasePid: null,
+    diseaseId: null,
+    result: null,
+    treatDay: null,
+    sheepfoldId: null,
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询诊疗结果列表 */
+function getList() {
+  loading.value = true
+  queryParams.value.params = {}
+  if (null != daterangeDatetime && '' != daterangeDatetime) {
+    queryParams.value.params["beginDatetime"] = daterangeDatetime.value[0]
+    queryParams.value.params["endDatetime"] = daterangeDatetime.value[1]
+  }
+  listDiagnosis(queryParams.value).then(response => {
+    diagnosisList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    treatId: null,
+    sheepId: null,
+    datetime: null,
+    sheepType: null,
+    gender: null,
+    parity: null,
+    diseasePid: null,
+    diseaseId: null,
+    result: null,
+    begindate: null,
+    enddate: null,
+    treatDay: null,
+    sheepfoldId: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("diagnosisRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  daterangeDatetime.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加诊疗结果"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getDiagnosis(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改诊疗结果"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["diagnosisRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateDiagnosis(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addDiagnosis(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 delDiagnosis(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('diagnosis/diagnosis/export', {
+    ...queryParams.value
+  }, `diagnosis_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>

src/views/biosafety/disinfect/index.vue

@@ -0,0 +1,324 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="羊舍id" prop="sheepfoldId">
+        <el-input
+          v-model="queryParams.sheepfoldId"
+          placeholder="请输入羊舍id"
+          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="technician">
+        <el-input
+          v-model="queryParams.technician"
+          placeholder="请输入技术员"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="消毒方式" prop="way">
+        <el-input
+          v-model="queryParams.way"
+          placeholder="请输入消毒方式"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="药品使用记录id" prop="usageId">
+        <el-input
+          v-model="queryParams.usageId"
+          placeholder="请输入药品使用记录id"
+          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 label="备注" prop="comment">
+        <el-input
+          v-model="queryParams.comment"
+          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="['biosafety:disinfect:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['biosafety:disinfect:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['biosafety:disinfect:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['biosafety:disinfect:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="disinfectList" @selection-change="handleSelectionChange">
+      <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="sheepfoldId" />
+      <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="technician" />
+      <el-table-column label="消毒方式" align="center" prop="way" />
+      <el-table-column label="药品使用记录id" align="center" prop="usageId" />
+      <el-table-column label="比例" align="center" prop="ratio" />
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['biosafety:disinfect:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['biosafety:disinfect: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="disinfectRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="羊舍id" prop="sheepfoldId">
+          <el-input v-model="form.sheepfoldId" placeholder="请输入羊舍id" />
+        </el-form-item>
+        <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-form-item label="技术员" prop="technician">
+          <el-input v-model="form.technician" placeholder="请输入技术员" />
+        </el-form-item>
+        <el-form-item label="消毒方式" prop="way">
+          <el-input v-model="form.way" placeholder="请输入消毒方式" />
+        </el-form-item>
+        <el-form-item label="药品使用记录id" prop="usageId">
+          <el-input v-model="form.usageId" placeholder="请输入药品使用记录id" />
+        </el-form-item>
+        <el-form-item label="比例" prop="ratio">
+          <el-input v-model="form.ratio" placeholder="请输入比例" />
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Disinfect">
+import { listDisinfect, getDisinfect, delDisinfect, addDisinfect, updateDisinfect } from "@/api/biosafety/disinfect"
+
+const { proxy } = getCurrentInstance()
+
+const disinfectList = 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,
+    sheepfoldId: null,
+    datetime: null,
+    technician: null,
+    way: null,
+    usageId: null,
+    ratio: null,
+    comment: null,
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询消毒记录列表 */
+function getList() {
+  loading.value = true
+  listDisinfect(queryParams.value).then(response => {
+    disinfectList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepfoldId: null,
+    datetime: null,
+    technician: null,
+    way: null,
+    usageId: null,
+    ratio: null,
+    comment: null,
+    updateBy: null,
+    updateTime: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("disinfectRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getDisinfect(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改消毒记录"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["disinfectRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateDisinfect(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addDisinfect(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 delDisinfect(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('biosafety/disinfect/export', {
+    ...queryParams.value
+  }, `disinfect_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>

src/views/biosafety/health/index.vue

@@ -0,0 +1,296 @@
+<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
+          v-model="queryParams.datetime"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择保健日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="技术员" prop="technical">
+        <el-input
+          v-model="queryParams.technical"
+          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="['biosafety:health:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['biosafety:health:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['biosafety:health:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['biosafety:health:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="healthList" @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="保健日期" 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="羊只id" align="center" prop="sheepId" />
+      <el-table-column label="用药记录" align="center" prop="usageId" />
+      <el-table-column label="品种" align="center" prop="variety" />
+      <el-table-column label="羊只类别" align="center" prop="sheepType" />
+      <el-table-column label="性别" align="center" prop="gender" />
+      <el-table-column label="月龄" align="center" prop="monthAge" />
+      <el-table-column label="胎次" align="center" prop="parity" />
+      <el-table-column label="羊舍id" align="center" prop="sheepfoldId" />
+      <el-table-column label="技术员" align="center" prop="technical" />
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['biosafety:health:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['biosafety:health: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="healthRef" :model="form" :rules="rules" label-width="80px">
+        <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-form-item label="羊只id" prop="sheepId">
+          <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+        </el-form-item>
+        <el-form-item label="用药记录" prop="usageId">
+          <el-input v-model="form.usageId" placeholder="请输入用药记录" />
+        </el-form-item>
+        <el-form-item label="品种" prop="variety">
+          <el-input v-model="form.variety" placeholder="请输入品种" />
+        </el-form-item>
+        <el-form-item label="性别" prop="gender">
+          <el-input v-model="form.gender" placeholder="请输入性别" />
+        </el-form-item>
+        <el-form-item label="月龄" prop="monthAge">
+          <el-input v-model="form.monthAge" placeholder="请输入月龄" />
+        </el-form-item>
+        <el-form-item label="胎次" prop="parity">
+          <el-input v-model="form.parity" placeholder="请输入胎次" />
+        </el-form-item>
+        <el-form-item label="羊舍id" prop="sheepfoldId">
+          <el-input v-model="form.sheepfoldId" placeholder="请输入羊舍id" />
+        </el-form-item>
+        <el-form-item label="技术员" prop="technical">
+          <el-input v-model="form.technical" placeholder="请输入技术员" />
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Health">
+import { listHealth, getHealth, delHealth, addHealth, updateHealth } from "@/api/biosafety/health"
+
+const { proxy } = getCurrentInstance()
+
+const healthList = 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,
+    datetime: null,
+    technical: null,
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询保健列表 */
+function getList() {
+  loading.value = true
+  listHealth(queryParams.value).then(response => {
+    healthList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    datetime: null,
+    sheepId: null,
+    usageId: null,
+    variety: null,
+    sheepType: null,
+    gender: null,
+    monthAge: null,
+    parity: null,
+    sheepfoldId: null,
+    technical: null,
+    comment: null,
+    updateBy: null,
+    updateTime: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("healthRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getHealth(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改保健"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["healthRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateHealth(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addHealth(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 delHealth(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('biosafety/health/export', {
+    ...queryParams.value
+  }, `health_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>

src/views/biosafety/immunity/index.vue

@@ -0,0 +1,312 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="羊只id" prop="sheepId">
+        <el-input
+          v-model="queryParams.sheepId"
+          placeholder="请输入羊只id"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="免疫日期" 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="technical">
+        <el-input
+          v-model="queryParams.technical"
+          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="['biosafety:immunity:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['biosafety:immunity:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['biosafety:immunity:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['biosafety:immunity:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="immunityList" @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="usageId" />
+      <el-table-column label="品种" align="center" prop="variety" />
+      <el-table-column label="羊只类型" align="center" prop="sheepType" />
+      <el-table-column label="羊只性别" align="center" prop="gender" />
+      <el-table-column label="月龄" align="center" prop="monthAge" />
+      <el-table-column label="胎次" align="center" prop="parity" />
+      <el-table-column label="羊舍id" align="center" prop="sheepfoldId" />
+      <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="technical" />
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['biosafety:immunity:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['biosafety:immunity: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="immunityRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="羊只id" prop="sheepId">
+          <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+        </el-form-item>
+        <el-form-item label="品种" prop="variety">
+          <el-input v-model="form.variety" placeholder="请输入品种" />
+        </el-form-item>
+        <el-form-item label="羊只性别" prop="gender">
+          <el-input v-model="form.gender" placeholder="请输入羊只性别" />
+        </el-form-item>
+        <el-form-item label="月龄" prop="monthAge">
+          <el-input v-model="form.monthAge" placeholder="请输入月龄" />
+        </el-form-item>
+        <el-form-item label="胎次" prop="parity">
+          <el-input v-model="form.parity" placeholder="请输入胎次" />
+        </el-form-item>
+        <el-form-item label="羊舍id" prop="sheepfoldId">
+          <el-input v-model="form.sheepfoldId" placeholder="请输入羊舍id" />
+        </el-form-item>
+        <el-form-item label="免疫日期" prop="datetime">
+          <el-date-picker clearable
+            v-model="form.datetime"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择免疫日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="技术员" prop="technical">
+          <el-input v-model="form.technical" placeholder="请输入技术员" />
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Immunity">
+import { listImmunity, getImmunity, delImmunity, addImmunity, updateImmunity } from "@/api/biosafety/immunity"
+
+const { proxy } = getCurrentInstance()
+
+const immunityList = 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 daterangeDatetime = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    sheepId: null,
+    sheepType: null,
+    datetime: null,
+    technical: null,
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询免疫列表 */
+function getList() {
+  loading.value = true
+  queryParams.value.params = {}
+  if (null != daterangeDatetime && '' != daterangeDatetime) {
+    queryParams.value.params["beginDatetime"] = daterangeDatetime.value[0]
+    queryParams.value.params["endDatetime"] = daterangeDatetime.value[1]
+  }
+  listImmunity(queryParams.value).then(response => {
+    immunityList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    usageId: null,
+    variety: null,
+    sheepType: null,
+    gender: null,
+    monthAge: null,
+    parity: null,
+    sheepfoldId: null,
+    datetime: null,
+    technical: null,
+    comment: null,
+    updateBy: null,
+    updateTime: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("immunityRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  daterangeDatetime.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加免疫"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getImmunity(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改免疫"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["immunityRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateImmunity(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addImmunity(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 delImmunity(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('biosafety/immunity/export', {
+    ...queryParams.value
+  }, `immunity_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>

src/views/biosafety/quarantine/add.vue

@@ -0,0 +1,151 @@
+<!-- QuarantineFormDialog.vue -->
+<template>
+    <el-dialog :title="title" v-model="visible" width="500px" append-to-body @close="reset">
+        <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+            <el-form-item label="羊只耳号" prop="sheepNo">
+                <el-input v-model="form.sheepNo" placeholder="请输入耳号" @blur="fetchSheepInfo" />
+            </el-form-item>
+
+            <el-form-item label="羊只性别">
+                <el-input v-model="form.gender" readonly />
+            </el-form-item>
+
+            <el-form-item label="羊只类别">
+                <el-input v-model="form.sheepType" readonly />
+            </el-form-item>
+
+            <el-form-item label="月龄">
+                <el-input v-model="form.monthAge" readonly />
+            </el-form-item>
+
+            <el-form-item label="繁育状态">
+                <el-input v-model="form.breed" readonly />
+            </el-form-item>
+
+            <el-form-item label="检疫日期" prop="datetime">
+                <el-date-picker v-model="form.datetime" type="date" value-format="YYYY-MM-DD" placeholder="请选择日期" />
+            </el-form-item>
+
+            <el-form-item label="检疫结果" prop="result">
+                <el-select v-model="form.result" placeholder="请选择">
+                    <el-option v-for="dict in quar_result" :key="dict.value" :label="dict.label"
+                        :value="parseInt(dict.value)" />
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="状态" prop="status">
+                <el-radio-group v-model="form.status">
+                    <el-radio v-for="dict in quar_status" :key="dict.value" :label="parseInt(dict.value)">
+                        {{ dict.label }}
+                    </el-radio>
+                </el-radio-group>
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <el-button @click="cancel">取 消</el-button>
+            <el-button type="primary" @click="submit">确 定</el-button>
+        </template>
+    </el-dialog>
+</template>
+
+<script setup name="QuarantineFormDialog">
+import { ref, reactive, nextTick } from 'vue'
+import { getQuarantine, addQuarantine, updateQuarantine } from '@/api/biosafety/quarantine'
+
+
+
+const { proxy } = getCurrentInstance()
+const { pres_status, pres_type } = proxy.useDict('pres_status', 'pres_type')
+
+
+const emit = defineEmits(['success'])
+
+const visible = ref(false)
+const title = ref('')
+const formRef = ref()
+const form = reactive({
+    id: null,
+    sheepId: null,
+    sheepNo: '',
+    gender: '',
+    sheepType: '',
+    monthAge: '',
+    breed: '',
+    datetime: '',
+    result: null,
+    status: null
+})
+
+const rules = {
+    sheepNo: [{ required: true, message: '请输入耳号', trigger: 'blur' }],
+    datetime: [{ required: true, message: '请选择日期', trigger: 'change' }],
+    result: [{ required: true, message: '请选择结果', trigger: 'change' }],
+    status: [{ required: true, message: '请选择状态', trigger: 'change' }]
+}
+
+function open(row = null) {
+    reset()
+    if (row && row.id) {
+        title.value = '修改检疫记录'
+        getQuarantine(row.id).then(res => {
+            Object.assign(form, res.data)
+            visible.value = true
+        })
+    } else {
+        title.value = '新增检疫记录'
+        visible.value = true
+    }
+}
+
+function fetchSheepInfo() {
+    if (!form.sheepNo) return
+    getSheepByEarNo(form.sheepNo).then(res => {
+        if (res.data) {
+            Object.assign(form, {
+                sheepId: res.data.id,
+                gender: res.data.gender,
+                sheepType: res.data.sheepType,
+                monthAge: res.data.monthAge,
+                breed: res.data.breed
+            })
+        } else {
+            proxy.$modal.msgError('未找到该耳号对应的羊只')
+        }
+    })
+}
+
+function submit() {
+    formRef.value.validate(valid => {
+        if (!valid) return
+        const api = form.id ? updateQuarantine : addQuarantine
+        api(form).then(() => {
+            proxy.$modal.msgSuccess(form.id ? '修改成功' : '新增成功')
+            visible.value = false
+            emit('success')
+        })
+    })
+}
+
+function reset() {
+    Object.assign(form, {
+        id: null,
+        sheepId: null,
+        sheepNo: '',
+        gender: '',
+        sheepType: '',
+        monthAge: '',
+        breed: '',
+        datetime: '',
+        result: null,
+        status: null
+    })
+    nextTick(() => formRef.value?.clearValidate())
+}
+
+function cancel() {
+    visible.value = false
+}
+
+defineExpose({ open })
+</script>

src/views/biosafety/quarantine/index.vue

@@ -0,0 +1,115 @@
+<!-- QuarantineList.vue -->
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="羊只" prop="sheepId">
+        <el-input v-model="queryParams.sheepId" placeholder="请输入耳号" clearable @keyup.enter="handleQuery" />
+      </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>
+        <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="openDialog()">新增</el-button>
+      </el-col>
+    </el-row>
+
+    <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">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="羊只性别" align="center" prop="gender" />
+      <el-table-column label="羊只类别" align="center" prop="sheepType" />
+      <el-table-column label="月龄" align="center" prop="monthAge" />
+      <el-table-column label="繁育状态" align="center" prop="breed" />
+      <el-table-column label="检疫项目" align="center" prop="itemName" />
+      <el-table-column label="样品类型" align="center" prop="sample" />
+      <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>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="quar_status" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="200">
+        <template #default="scope">
+          <el-button link type="primary" @click="openDialog(scope.row)">检疫</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 弹窗组件 -->
+    <add ref="dialogRef" @success="getList" />
+  </div>
+</template>
+
+<script setup name="QuarantineList">
+import { listQuarantine } from '@/api/biosafety/quarantine'
+import add from './add.vue'
+const { proxy } = getCurrentInstance()
+const { quar_result, quar_status } = proxy.useDict('quar_result', 'quar_status')
+
+const dialogRef = ref()
+const quarantineList = ref([])
+const loading = ref(true)
+const showSearch = ref(true)
+const total = ref(0)
+const daterangeDatetime = ref([])
+
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  sheepId: null,
+  params: {}
+})
+
+function getList() {
+  loading.value = true
+  queryParams.params = {}
+  if (daterangeDatetime.value && daterangeDatetime.value.length === 2) {
+    queryParams.params.beginDatetime = daterangeDatetime.value[0]
+    queryParams.params.endDatetime = daterangeDatetime.value[1]
+  }
+  listQuarantine(queryParams).then(res => {
+    quarantineList.value = res.rows
+    total.value = res.total
+    loading.value = false
+  })
+}
+
+function openDialog(row = null) {
+  dialogRef.value.open(row)
+}
+
+function handleQuery() {
+  queryParams.pageNum = 1
+  getList()
+}
+
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  daterangeDatetime.value = []
+  handleQuery()
+}
+
+getList()
+</script>

src/views/biosafety/quarantine/items.vue

@@ -0,0 +1,192 @@
+<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="['biosafety:items:add']"
+        >新增</el-button>
+      </el-col>
+  
+      
+    </el-row>
+
+    <el-table v-loading="loading" :data="itemsList" @selection-change="handleSelectionChange">
+    
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['biosafety:items:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['biosafety:items: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="itemsRef" :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>
+      <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="Items">
+import { listItems, getItems, delItems, addItems, updateItems } from "@/api/biosafety/items"
+
+const { proxy } = getCurrentInstance()
+
+const itemsList = 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,
+    name: null
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询检疫项目列表 */
+function getList() {
+  loading.value = true
+  listItems(queryParams.value).then(response => {
+    itemsList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    name: null
+  }
+  proxy.resetForm("itemsRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getItems(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改检疫项目"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["itemsRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateItems(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addItems(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 delItems(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+getList()
+</script>

src/views/biosafety/quarantine/sample.vue

@@ -0,0 +1,192 @@
+<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="['biosafety:sample:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="sampleList" @selection-change="handleSelectionChange">
+
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="样品类型" align="center" prop="name" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['biosafety:sample:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['biosafety:sample: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="sampleRef" :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>
+      <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="Sample">
+import { listSample, getSample, delSample, addSample, updateSample } from "@/api/biosafety/sample"
+
+const { proxy } = getCurrentInstance()
+
+const sampleList = 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,
+    name: null
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询样品类型列表 */
+function getList() {
+  loading.value = true
+  listSample(queryParams.value).then(response => {
+    sampleList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    name: null
+  }
+  proxy.resetForm("sampleRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getSample(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改样品类型"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["sampleRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateSample(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addSample(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 delSample(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+
+getList()
+</script>

src/views/biosafety/treatment/hanld.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+    hanld
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>

src/views/biosafety/treatment/index.vue

@@ -0,0 +1,331 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="羊只耳号" prop="sheepId">
+        <el-input
+          v-model="queryParams.sheepId"
+          placeholder="请输入羊只耳号"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </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="veterinary">
+        <el-input
+          v-model="queryParams.veterinary"
+          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="['treatment:treatment:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['treatment:treatment:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['treatment:treatment:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['treatment:treatment:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <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="sheepId" />
+      <el-table-column label="品种" align="center" prop="variety" />
+      <el-table-column label="羊只类别" align="center" prop="sheepType" />
+      <el-table-column label="月龄" align="center" prop="monthAge" />
+      <el-table-column label="性别" align="center" prop="gender" />
+      <el-table-column label="胎次" align="center" prop="parity" />
+      <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="diseaseId" />
+      <el-table-column label="父疾病" align="center" prop="diseasePid" />
+      <el-table-column label="兽医" align="center" prop="veterinary" />
+      <el-table-column label="备注" align="center" prop="comment" />
+      <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="['treatment:treatment:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['treatment:treatment: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="treatmentRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="羊只耳号" prop="sheepId">
+          <el-input v-model="form.sheepId" placeholder="请输入羊只耳号" />
+        </el-form-item>
+        <el-form-item label="品种" prop="variety">
+          <el-input v-model="form.variety" placeholder="请输入品种" />
+        </el-form-item>
+        <el-form-item label="月龄" prop="monthAge">
+          <el-input v-model="form.monthAge" placeholder="请输入月龄" />
+        </el-form-item>
+        <el-form-item label="性别" prop="gender">
+          <el-input v-model="form.gender" placeholder="请输入性别" />
+        </el-form-item>
+        <el-form-item label="胎次" prop="parity">
+          <el-input v-model="form.parity" placeholder="请输入胎次" />
+        </el-form-item>
+        <el-form-item label="繁殖状态" prop="breed">
+          <el-input v-model="form.breed" placeholder="请输入繁殖状态" />
+        </el-form-item>
+        <el-form-item label="泌乳天数" prop="lactDay">
+          <el-input v-model="form.lactDay" placeholder="请输入泌乳天数" />
+        </el-form-item>
+        <el-form-item label="怀孕天数" prop="gestDay">
+          <el-input v-model="form.gestDay" placeholder="请输入怀孕天数" />
+        </el-form-item>
+        <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-form-item label="父疾病" prop="diseasePid">
+          <el-input v-model="form.diseasePid" placeholder="请输入父疾病" />
+        </el-form-item>
+        <el-form-item label="兽医" prop="veterinary">
+          <el-input v-model="form.veterinary" placeholder="请输入兽医" />
+        </el-form-item>
+        <el-form-item label="药品使用记录id" prop="usageId">
+          <el-input v-model="form.usageId" placeholder="请输入药品使用记录id" />
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Treatment">
+import { listTreatment, getTreatment, delTreatment, addTreatment, updateTreatment } from "@/api/treatment/treatment"
+
+const { proxy } = getCurrentInstance()
+
+const treatmentList = 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 daterangeDatetime = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    sheepId: null,
+    datetime: null,
+    diseaseId: null,
+    veterinary: null,
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询治疗记录列表 */
+function getList() {
+  loading.value = true
+  queryParams.value.params = {}
+  if (null != daterangeDatetime && '' != daterangeDatetime) {
+    queryParams.value.params["beginDatetime"] = daterangeDatetime.value[0]
+    queryParams.value.params["endDatetime"] = daterangeDatetime.value[1]
+  }
+  listTreatment(queryParams.value).then(response => {
+    treatmentList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    diagId: null,
+    sheepId: null,
+    variety: null,
+    sheepType: null,
+    monthAge: null,
+    gender: null,
+    parity: null,
+    breed: null,
+    lactDay: null,
+    gestDay: null,
+    datetime: null,
+    diseaseId: null,
+    diseasePid: null,
+    veterinary: null,
+    usageId: null,
+    comment: null,
+    updateBy: null,
+    updateTime: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("treatmentRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  daterangeDatetime.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加治疗记录"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getTreatment(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改治疗记录"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["treatmentRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateTreatment(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addTreatment(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 delTreatment(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('treatment/treatment/export', {
+    ...queryParams.value
+  }, `treatment_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>

src/views/biosafety/usageInfo/index.vue

@@ -22,6 +22,7 @@
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+    
 
     <!-- 工具栏 -->
     <el-row :gutter="10" class="mb8">

src/views/breed/lambing_records/index.vue

@@ -0,0 +1,661 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="母羊耳号" prop="femaleEarNumber">
+        <el-input
+            v-model="queryParams.femaleEarNumber"
+            placeholder="请输入母羊耳号"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="母羊品种" prop="femaleBreed">
+        <el-input
+            v-model="queryParams.femaleBreed"
+            placeholder="请输入母羊品种"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="胎次" prop="parity">
+        <el-input
+            v-model="queryParams.parity"
+            placeholder="请输入胎次"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="技术员" prop="technician">
+        <el-input
+            v-model="queryParams.technician"
+            placeholder="请输入技术员"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所在牧场" prop="farm">
+        <el-input
+            v-model="queryParams.farm"
+            placeholder="请输入所在牧场"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="配种日期" prop="breedingDate">
+        <el-date-picker
+            v-model="queryParams.breedingDate"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="YYYY-MM-DD">
+        </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="['breed:lambing_records:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['breed:lambing_records:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['breed:lambing_records:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['breed:lambing_records:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="lambing_recordsList" @selection-change="handleSelectionChange" row-key="id">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="母羊耳号" align="center" prop="femaleEarNumber" width="120" fixed="left" />
+      <el-table-column label="母羊品种" align="center" prop="femaleBreed" width="100" />
+      <el-table-column label="配种日期" align="center" prop="breedingDate" width="110">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.breedingDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="胎次" align="center" prop="parity" width="80" />
+      <el-table-column label="公羊耳号" align="center" prop="maleEarNumber" width="120" />
+      <el-table-column label="公羊品种" align="center" prop="maleBreed" width="120" />
+      <el-table-column label="产羔数量" align="center" prop="lambsBorn" width="90" />
+      <el-table-column label="活羔数量" align="center" prop="survival" width="90" />
+      <el-table-column label="折损数" align="center" prop="loss" width="80">
+        <template #default="scope">
+          <span>{{ (scope.row.lambsBorn || 0) - (scope.row.survival || 0) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="技术员" align="center" prop="technician" width="100" />
+      <el-table-column label="月龄" align="center" prop="monthAge" width="80" />
+      <el-table-column label="产羔评分" align="center" prop="score" width="90" />
+      <el-table-column label="公羔数量" align="center" prop="maleCount" width="90" />
+      <el-table-column label="母羔数量" align="center" prop="femaleCount" width="90" />
+      <el-table-column label="留养公羔数量" align="center" prop="retainedMaleCount" width="130" />
+      <el-table-column label="留养母羔数量" align="center" prop="retainedFemaleCount" width="130" />
+      <el-table-column label="未留养公羔数量" align="center" prop="unretainedMaleCount" width="140" />
+      <el-table-column label="未留养母羔数量" align="center" prop="unretainedFemaleCount" width="140" />
+      <el-table-column label="产羔时怀孕天数" align="center" prop="pregnancyDays" width="140" />
+      <el-table-column label="当前羊舍" align="center" prop="currentShed" width="100" />
+      <el-table-column label="创建人" align="center" prop="createBy" width="100" />
+      <el-table-column label="创建日期" align="center" prop="createTime" width="110">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="所在牧场" align="center" prop="farm" width="100" />
+      <el-table-column label="备注" align="center" prop="comment" width="120" show-overflow-tooltip />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" icon="View" @click="handleLambDetail(scope.row)" size="small">产羔详情</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['breed:lambing_records:edit']" size="small">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['breed:lambing_records:remove']" size="small">删除</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="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>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="胎次" prop="parity">
+              <el-input v-model="form.parity" placeholder="请输入胎次" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="产羔数量" prop="lambsBorn">
+              <el-input
+                  v-model.number="form.lambsBorn"
+                  placeholder="请输入产羔数量"
+                  type="number"
+                  @input="handleLambsBornChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="活羔数量" prop="survival">
+              <el-input v-model.number="form.survival" placeholder="请输入活羔数量" type="number" />
+            </el-form-item>
+          </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-date-picker
+                  clearable
+                  v-model="form.createTime"
+                  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="comment">
+              <el-input v-model="form.comment" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 羔羊信息录入 -->
+        <div v-if="form.lambsBorn > 0 && showLambForms">
+          <el-divider content-position="left">羔羊信息录入</el-divider>
+          <div v-for="(lamb, index) in lambForms" :key="index" class="lamb-form-item">
+            <div class="lamb-form-header">
+              <span class="lamb-title">第{{ index + 1 }}只羔羊</span>
+            </div>
+            <el-row :gutter="20" class="lamb-form-content">
+              <el-col :span="8">
+                <el-form-item :label="`羔羊耳号`" :prop="`lambForms.${index}.lambEarNumber`">
+                  <el-input v-model="lamb.lambEarNumber" placeholder="请输入羔羊耳号" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item :label="`性别`" :prop="`lambForms.${index}.gender`">
+                  <el-select v-model="lamb.gender" placeholder="请选择性别">
+                    <el-option label="公" value="male"></el-option>
+                    <el-option label="母" value="female"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item :label="`是否留养`" :prop="`lambForms.${index}.isRetained`">
+                  <el-switch
+                      v-model="lamb.isRetained"
+                      active-text="是"
+                      inactive-text="否">
+                  </el-switch>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20" class="lamb-form-content">
+              <el-col :span="8">
+                <el-form-item :label="`体重(kg)`" :prop="`lambForms.${index}.birthWeight`">
+                  <el-input v-model.number="lamb.birthWeight" placeholder="请输入体重" type="number" step="0.1" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item :label="`品种`" :prop="`lambForms.${index}.lambBreed`">
+                  <el-select
+                      v-model="lamb.lambBreed"
+                      placeholder="请选择品种"
+                      filterable
+                      clearable
+                      style="width: 100%"
+                  >
+                    <el-option
+                        v-for="variety in varietyList"
+                        :key="variety.id"
+                        :label="variety.variety"
+                        :value="variety.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item :label="`家系`" :prop="`lambForms.${index}.lineage`">
+                  <el-input v-model="lamb.lineage" placeholder="请输入家系" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20" class="lamb-form-content">
+              <el-col :span="8">
+                <el-form-item :label="`生日`" :prop="`lambForms.${index}.birthday`">
+                  <el-date-picker
+                      v-model="lamb.birthday"
+                      type="date"
+                      value-format="YYYY-MM-DD"
+                      placeholder="请选择生日">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </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>
+
+    <!-- 产羔详情对话框 -->
+    <el-dialog title="产羔详情" v-model="detailOpen" width="1000px" append-to-body>
+      <el-descriptions :column="3" border>
+        <el-descriptions-item label="母羊耳号">{{ detailData.femaleEarNumber }}</el-descriptions-item>
+        <el-descriptions-item label="母羊品种">{{ detailData.femaleBreed }}</el-descriptions-item>
+        <el-descriptions-item label="胎次">{{ detailData.parity }}</el-descriptions-item>
+        <el-descriptions-item label="公羊耳号">{{ detailData.maleEarNumber }}</el-descriptions-item>
+        <el-descriptions-item label="公羊品种">{{ detailData.maleBreed }}</el-descriptions-item>
+        <el-descriptions-item label="配种日期">{{ parseTime(detailData.breedingDate, '{y}-{m}-{d}') }}</el-descriptions-item>
+        <el-descriptions-item label="产羔数量">{{ detailData.lambsBorn }}</el-descriptions-item>
+        <el-descriptions-item label="活羔数量">{{ detailData.survival }}</el-descriptions-item>
+        <el-descriptions-item label="技术员">{{ detailData.technician }}</el-descriptions-item>
+      </el-descriptions>
+
+      <el-divider content-position="left">羔羊信息</el-divider>
+      <el-table :data="lambDetailList" border>
+        <el-table-column label="序号" type="index" width="60" align="center" />
+        <el-table-column label="羔羊耳号" prop="lambEarNumber" align="center" />
+        <el-table-column label="羔羊品种" prop="lambBreed" align="center">
+          <template #default="scope">
+            <span>{{ getVarietyName(scope.row.lambBreed) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="性别" prop="gender" align="center">
+          <template #default="scope">
+            <el-tag :type="getGenderDisplay(scope.row.gender).type">
+              {{ getGenderDisplay(scope.row.gender).label }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="出生重(kg)" prop="birthWeight" align="center" />
+        <el-table-column label="是否留养" prop="isRetained" align="center">
+          <template #default="scope">
+            <el-tag :type="scope.row.isRetained ? 'success' : 'danger'">
+              {{ scope.row.isRetained ? '是' : '否' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="家系" prop="lineage" align="center" />
+        <el-table-column label="生日" prop="birthday" align="center">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Lambing_records">
+import { listLambing_records, getLambing_records, delLambing_records, addLambing_records, updateLambing_records, getLambDetail, getVarietyList } from "@/api/breed/lambing_records"
+
+const { proxy } = getCurrentInstance()
+
+const lambing_recordsList = ref([])
+const open = ref(false)
+const detailOpen = 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 showLambForms = ref(false)
+const lambForms = ref([])
+const detailData = ref({})
+const lambDetailList = ref([])
+const varietyList = ref([]) // 品种列表
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    femaleEarNumber: null,
+    femaleBreed: null,
+    sheepId: null,
+    parity: null,
+    lambsBorn: null,
+    survival: null,
+    technician: null,
+    score: null,
+    comment: null,
+    createBy: null,
+    createTime: null,
+    farm: null,
+    breedingDate: []
+  },
+  rules: {
+    sheepId: [
+      { required: true, message: "羊只id不能为空", trigger: "blur" }
+    ],
+    lambsBorn: [
+      { required: true, message: "产羔数量不能为空", trigger: "blur" }
+    ]
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 获取品种列表 */
+function getVarietyData() {
+  return getVarietyList().then(response => {
+    console.log('品种列表数据:', response) // 调试日志
+    varietyList.value = response.rows || []
+    console.log('处理后的品种列表:', varietyList.value) // 调试日志
+    console.log('第一个品种数据结构:', varietyList.value[0]) // 查看字段结构
+  }).catch(error => {
+    console.error('获取品种列表失败:', error)
+    varietyList.value = []
+  })
+}
+
+/** 根据品种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 字段
+}
+
+/** 性别转换函数 - 前端显示转后端数值 */
+function genderToNumber(gender) {
+  if (gender === 'male') return 0
+  if (gender === 'female') return 1
+  return gender
+}
+
+/** 性别显示函数 - 后端数值转前端显示 */
+function getGenderDisplay(gender) {
+  if (gender === 0 || gender === 'male') {
+    return { label: '公', type: 'primary' }
+  } else if (gender === 1 || gender === 'female') {
+    return { label: '母', type: 'success' }
+  }
+  return { label: '未知', type: 'info' }
+}
+
+/** 查询产羔记录列表 */
+function getList() {
+  loading.value = true
+  listLambing_records(queryParams.value).then(response => {
+    lambing_recordsList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    parity: null,
+    lambsBorn: null,
+    survival: null,
+    technician: null,
+    score: null,
+    comment: null,
+    createBy: null,
+    createTime: null
+  }
+  showLambForms.value = false
+  lambForms.value = []
+  proxy.resetForm("lambing_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
+  getLambing_records(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改产羔记录"
+    // 如果是修改，不显示羔羊录入表单
+    showLambForms.value = false
+  })
+}
+
+/** 产羔数量变化处理 */
+function handleLambsBornChange() {
+  const count = parseInt(form.value.lambsBorn) || 0
+  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
+    }))
+  } else {
+    showLambForms.value = false
+    lambForms.value = []
+  }
+}
+
+/** 查看产羔详情 */
+function handleLambDetail(row) {
+  detailData.value = row
+  // 调用API获取羔羊详情列表
+  getLambDetail(row.id).then(response => {
+    // 后端返回的是ScLambDetail对象列表，字段名称已经匹配
+    lambDetailList.value = response.data || []
+    detailOpen.value = true
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["lambing_recordsRef"].validate(valid => {
+    if (valid) {
+      const submitData = { ...form.value }
+
+      // 处理日期格式
+      if (submitData.createTime && typeof submitData.createTime === 'string') {
+        if (submitData.createTime.length === 10) {
+          submitData.createTime = submitData.createTime + ' 00:00:00'
+        }
+      }
+
+      // 处理羔羊详情
+      if (showLambForms.value && lambForms.value.length > 0) {
+        // 过滤掉空的羔羊信息
+        const validLambDetails = lambForms.value.filter(lamb =>
+            lamb.lambEarNumber && lamb.lambEarNumber.trim() !== ''
+        )
+
+        // 处理羔羊详情的日期格式和数据类型
+        validLambDetails.forEach(lamb => {
+          if (lamb.birthday && typeof lamb.birthday === 'string' && lamb.birthday.length === 10) {
+            // 保持日期格式为 YYYY-MM-DD，后端会自动处理
+          }
+          // 确保体重为数字类型
+          if (lamb.birthWeight && typeof lamb.birthWeight === 'string') {
+            lamb.birthWeight = parseFloat(lamb.birthWeight)
+          }
+          // 性别转换：'male' -> 0, 'female' -> 1
+          lamb.gender = genderToNumber(lamb.gender)
+          // 品种ID已经是数字，无需转换
+        })
+
+        submitData.lambDetails = validLambDetails
+      }
+
+      if (form.value.id != null) {
+        updateLambing_records(submitData).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addLambing_records(submitData).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 delLambing_records(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('breed/lambing_records/export', {
+    ...queryParams.value
+  }, `lambing_records_${new Date().getTime()}.xlsx`)
+}
+
+// 页面初始化
+onMounted(() => {
+  console.log('页面初始化开始')
+  getVarietyData() // 先获取品种列表
+      .then(() => {
+        console.log('品种列表加载完成，开始获取产羔记录')
+        getList() // 然后获取产羔记录列表
+      })
+})
+</script>
+
+<style scoped>
+.lamb-form-item {
+  margin-bottom: 20px;
+  padding: 15px;
+  border: 1px solid #e4e7ed;
+  border-radius: 4px;
+  background-color: #fafafa;
+}
+
+.lamb-form-header {
+  margin-bottom: 15px;
+}
+
+.lamb-title {
+  font-weight: bold;
+  color: #409eff;
+  font-size: 14px;
+}
+
+.lamb-form-content {
+  margin-bottom: 10px;
+}
+
+.lamb-form-content:last-child {
+  margin-bottom: 0;
+}
+</style>

src/views/dairyProducts/dryMatterCorrection/index.vue

@@ -4,11 +4,21 @@
       <el-form-item label="年月" prop="datetime">
         <el-date-picker clearable
           v-model="queryParams.datetime"
-          type="date"
-          value-format="YYYY-MM-DD"
+          type="month"
+          value-format="YYYY-MM"
           placeholder="请选择年月">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="厂区" prop="factory">
+        <el-select v-model="queryParams.factory" placeholder="请选择厂区" clearable>
+          <el-option
+            v-for="dict in da_ranch"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -57,23 +67,31 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dryMatterCorrectionList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="年月" align="center" prop="datetime" width="180">
+    <!-- 修改表格列宽设置 -->
+    <el-table 
+      v-loading="loading" 
+      :data="dryMatterCorrectionList" 
+      @selection-change="handleSelectionChange"
+      style="width: 100%">
+      <el-table-column type="selection" align="center" />
+      <el-table-column label="年月" align="center" prop="datetime">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.datetime, '{y}-{m}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="厂区" align="center" prop="factory">
+        <template #default="scope">
+          <dict-tag :options="da_ranch" :value="scope.row.factory"/>
         </template>
       </el-table-column>
-      <el-table-column label="厂区" align="center" prop="factory" />
       <el-table-column label="干物质含量" align="center" prop="content" />
       <el-table-column label="干物质标准" align="center" prop="standard" />
-      <!-- 新增干物质系数列 -->
-      <el-table-column label="干物质系数" align="center">
+      <el-table-column label="干物质系数" align="center" prop="coefficient">
         <template #default="scope">
-          <span>{{ calculateCoefficient(scope.row.content, scope.row.standard) }}</span>
+          <span>{{ scope.row.coefficient != null ? scope.row.coefficient.toFixed(4) : '' }}</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" width="150">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dryMatterCorrection:dryMatterCorrection:edit']">修改</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dryMatterCorrection:dryMatterCorrection:remove']">删除</el-button>
@@ -91,28 +109,35 @@
 
     <!-- 添加或修改干物质校正对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="dryMatterCorrectionRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="dryMatterCorrectionRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="年月" prop="datetime">
           <el-date-picker clearable
             v-model="form.datetime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择年月">
+            type="month"
+            value-format="YYYY-MM"
+            placeholder="请选择年月"
+            style="width: 100%">
           </el-date-picker>
         </el-form-item>
-        <!-- 新增厂区字段 -->
         <el-form-item label="厂区" prop="factory">
-          <el-input v-model="form.factory" placeholder="请输入厂区" />
+          <el-select v-model="form.factory" placeholder="请选择厂区" style="width: 100%">
+            <el-option
+              v-for="dict in da_ranch"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="干物质含量" prop="content">
-          <el-input v-model="form.content" placeholder="请输入干物质含量" @input="calculateCoefficientInForm" />
+          <el-input v-model="form.content" placeholder="请输入干物质含量" @input="calculateCoefficient" />
         </el-form-item>
         <el-form-item label="干物质标准" prop="standard">
-          <el-input v-model="form.standard" placeholder="请输入干物质标准" @input="calculateCoefficientInForm" />
+          <el-input v-model="form.standard" placeholder="请输入干物质标准" @input="calculateCoefficient" />
         </el-form-item>
-        <!-- 显示计算后的干物质系数 -->
         <el-form-item label="干物质系数">
-          <el-input v-model="form.coefficient" placeholder="自动计算" readonly />
+          <el-input :value="form.coefficient != null ? form.coefficient.toFixed(4) : ''" placeholder="自动计算" readonly>
+          </el-input>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -126,9 +151,16 @@
 </template>
 
 <script setup name="DryMatterCorrection">
-import { listDryMatterCorrection, getDryMatterCorrection, delDryMatterCorrection, addDryMatterCorrection, updateDryMatterCorrection } from "@/api/dryMatterCorrection/dryMatterCorrection"
+import { 
+  listDryMatterCorrection, 
+  getDryMatterCorrection, 
+  delDryMatterCorrection, 
+  addDryMatterCorrection, 
+  updateDryMatterCorrection 
+} from "@/api/dairyProducts/dryMatterCorrection/dryMatterCorrection.js"
 
 const { proxy } = getCurrentInstance()
+const { da_ranch } = proxy.useDict('da_ranch')
 
 const dryMatterCorrectionList = ref([])
 const open = ref(false)
@@ -141,33 +173,47 @@ const total = ref(0)
 const title = ref("")
 
 const data = reactive({
-  form: {},
+  form: {
+    coefficient: null
+  },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     datetime: null,
     factory: null,
-    content: null,
-    standard: 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" }
+      { required: true, message: "干物质含量不能为空", trigger: "blur" },
+      { pattern: /^\d+(\.\d+)?$/, message: "请输入有效数字", trigger: "blur" }
     ],
     standard: [
-      { required: true, message: "干物质标准不能为空", trigger: "blur" }
+      { required: true, message: "干物质标准不能为空", trigger: "blur" },
+      { pattern: /^\d+(\.\d+)?$/, message: "请输入有效数字", trigger: "blur" },
+      { validator: (rule, value, callback) => {
+          if (value == 0) {
+            callback(new Error("干物质标准不能为零"));
+          } else {
+            callback();
+          }
+        }, trigger: "blur" }
     ]
   }
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
+/** 计算干物质系数 */
+function calculateCoefficient() {
+  if (form.value.content && form.value.standard && form.value.standard != 0) {
+    form.value.coefficient = parseFloat(form.value.content) / parseFloat(form.value.standard);
+  } else {
+    form.value.coefficient = null;
+  }
+}
+
 /** 查询干物质校正列表 */
 function getList() {
   loading.value = true
@@ -192,7 +238,7 @@ function reset() {
     factory: null,
     content: null,
     standard: null,
-    coefficient: null // 新增系数字段
+    coefficient: null
   }
   proxy.resetForm("dryMatterCorrectionRef")
 }
@@ -229,47 +275,26 @@ function handleUpdate(row) {
   const _id = row.id || ids.value
   getDryMatterCorrection(_id).then(response => {
     form.value = response.data
-    // 计算修改时的干物质系数
-    form.value.coefficient = calculateCoefficient(form.value.content, form.value.standard)
+    // 确保系数已计算
+    if (form.value.content && form.value.standard) {
+      form.value.coefficient = form.value.content / form.value.standard;
+    }
+    // 将日期转换为年月格式
+    if (form.value.datetime) {
+      form.value.datetime = proxy.parseTime(form.value.datetime, "{y}-{m}");
+    }
     open.value = true
     title.value = "修改干物质校正"
   })
 }
 
-/** 表单中计算干物质系数 */
-function calculateCoefficientInForm() {
-  if (form.value.content && form.value.standard) {
-    const content = parseFloat(form.value.content)
-    const standard = parseFloat(form.value.standard)
-    if (!isNaN(content) && !isNaN(standard) && standard !== 0) {
-      form.value.coefficient = (content / standard).toFixed(4)
-    } else {
-      form.value.coefficient = null
-    }
-  } else {
-    form.value.coefficient = null
-  }
-}
-
-/** 表格中计算干物质系数 */
-function calculateCoefficient(content, standard) {
-  if (content && standard) {
-    const contentVal = parseFloat(content)
-    const standardVal = parseFloat(standard)
-    if (!isNaN(contentVal) && !isNaN(standardVal) && standardVal !== 0) {
-      return (contentVal / standardVal).toFixed(4)
-    }
-  }
-  return 'N/A'
-}
-
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs["dryMatterCorrectionRef"].validate(valid => {
     if (valid) {
-      // 提交前确保系数已计算
-      if (!form.value.coefficient) {
-        calculateCoefficientInForm()
+      // 确保系数已计算
+      if (form.value.content && form.value.standard && form.value.standard != 0) {
+        form.value.coefficient = form.value.content / form.value.standard;
       }
       
       if (form.value.id != null) {
@@ -304,8 +329,44 @@ function handleDelete(row) {
 function handleExport() {
   proxy.download('dryMatterCorrection/dryMatterCorrection/export', {
     ...queryParams.value
-  }, `dryMatterCorrection_${new Date().getTime()}.xlsx`)
+  }, `干物质校正数据_${new Date().getTime()}.xlsx`)
 }
 
 getList()
-</script>
+</script>
+
+<style scoped>
+/* 添加表格样式 */
+.el-table {
+  font-size: 14px;
+}
+
+.el-table th {
+  background-color: #f5f7fa;
+  color: #606266;
+  font-weight: bold;
+}
+
+.el-table td, .el-table th {
+  padding: 12px 0;
+}
+
+.el-table .cell {
+  padding: 0 15px;
+}
+
+/* 调整操作列按钮间距 */
+.el-button + .el-button {
+  margin-left: 5px;
+}
+
+/* 调整表单元素宽度 */
+.el-input, .el-select {
+  width: 100%;
+}
+
+/* 调整搜索表单布局 */
+.el-form-item {
+  margin-bottom: 15px;
+}
+</style>

src/views/dairyProducts/parityCorrection/index.vue

@@ -0,0 +1,59 @@
+<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-table>
+  </div>
+</template>
+
+<script setup name="ParityCorrection">
+import { ref, onMounted } from 'vue'
+
+const loading = ref(false)
+const parityCorrectionList = ref([])
+
+// 预定义胎次校正数据（1-8胎次）
+const fixedParityData = [
+  { id: 1, parity: 1, coef: 1.2 },
+  { id: 2, parity: 2, coef: 1.0 },
+  { id: 3, parity: 3, coef: 0.96 },
+  { id: 4, parity: 4, coef: 0.96 },
+  { id: 5, parity: 5, coef: 1.0 },
+  { id: 6, parity: 6, coef: 1.0 },
+  { id: 7, parity: 7, coef: 1.0 },
+  { id: 8, parity: 8, coef: 1.0 }
+]
+
+// 组件挂载时加载数据
+onMounted(() => {
+  loading.value = true
+  // 模拟异步加载
+  setTimeout(() => {
+    parityCorrectionList.value = fixedParityData
+    loading.value = false
+  }, 500)
+})
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+</style>

src/views/dairyProducts/rawMilkTest/rawMilkTest/index.vue

@@ -0,0 +1,496 @@
+<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
+          v-model="queryParams.datetime"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择检测日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="来源" prop="source">
+        <el-input
+          v-model="queryParams.source"
+          placeholder="请输入来源"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="冰点" prop="freeze">
+        <el-input
+          v-model="queryParams.freeze"
+          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="脂肪g/100g" prop="fat">
+        <el-input
+          v-model="queryParams.fat"
+          placeholder="请输入脂肪g/100g"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="蛋白质g/100g" prop="protein">
+        <el-input
+          v-model="queryParams.protein"
+          placeholder="请输入蛋白质g/100g"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="非脂g/100g" prop="nonFat">
+        <el-input
+          v-model="queryParams.nonFat"
+          placeholder="请输入非脂g/100g"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="干物质mg/100g" prop="dryMatter">
+        <el-input
+          v-model="queryParams.dryMatter"
+          placeholder="请输入干物质mg/100g"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="杂物质mg/100g" prop="impurity">
+        <el-input
+          v-model="queryParams.impurity"
+          placeholder="请输入杂物质mg/100g"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="乳糖g/100g" prop="lactose">
+        <el-input
+          v-model="queryParams.lactose"
+          placeholder="请输入乳糖g/100g"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="酸度" prop="acidity">
+        <el-input
+          v-model="queryParams.acidity"
+          placeholder="请输入酸度"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="ph" prop="ph">
+        <el-input
+          v-model="queryParams.ph"
+          placeholder="请输入ph"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="菌落总数" prop="bacterialColony">
+        <el-input
+          v-model="queryParams.bacterialColony"
+          placeholder="请输入菌落总数"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="乳铁蛋白" prop="lactoferrin">
+        <el-input
+          v-model="queryParams.lactoferrin"
+          placeholder="请输入乳铁蛋白"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="免疫球蛋白" prop="ig">
+        <el-input
+          v-model="queryParams.ig"
+          placeholder="请输入免疫球蛋白"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="体细胞" prop="somaticCell">
+        <el-input
+          v-model="queryParams.somaticCell"
+          placeholder="请输入体细胞"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="尿素氮" prop="usea">
+        <el-input
+          v-model="queryParams.usea"
+          placeholder="请输入尿素氮"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="脂蛋比" prop="fatRatio">
+        <el-input
+          v-model="queryParams.fatRatio"
+          placeholder="请输入脂蛋比"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="comment">
+        <el-input
+          v-model="queryParams.comment"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <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="['rawMilkTest:rawMilkTest:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['rawMilkTest:rawMilkTest:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['rawMilkTest:rawMilkTest:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['rawMilkTest:rawMilkTest:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="rawMilkTestList" @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="检测日期" 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="source" />
+      <el-table-column label="冰点" align="center" prop="freeze" />
+      <el-table-column label="相对密度" align="center" prop="density" />
+      <el-table-column label="脂肪g/100g" align="center" prop="fat" />
+      <el-table-column label="蛋白质g/100g" align="center" prop="protein" />
+      <el-table-column label="非脂g/100g" align="center" prop="nonFat" />
+      <el-table-column label="干物质mg/100g" align="center" prop="dryMatter" />
+      <el-table-column label="杂物质mg/100g" align="center" prop="impurity" />
+      <el-table-column label="乳糖g/100g" align="center" prop="lactose" />
+      <el-table-column label="灰度g/100g" align="center" prop="ashContent" />
+      <el-table-column label="酸度" align="center" prop="acidity" />
+      <el-table-column label="ph" align="center" prop="ph" />
+      <el-table-column label="菌落总数" align="center" prop="bacterialColony" />
+      <el-table-column label="乳铁蛋白" align="center" prop="lactoferrin" />
+      <el-table-column label="免疫球蛋白" align="center" prop="ig" />
+      <el-table-column label="体细胞" align="center" prop="somaticCell" />
+      <el-table-column label="尿素氮" align="center" prop="usea" />
+      <el-table-column label="脂蛋比" align="center" prop="fatRatio" />
+      <el-table-column label="备注" align="center" prop="comment" />
+      <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="['rawMilkTest:rawMilkTest:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['rawMilkTest:rawMilkTest: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="rawMilkTestRef" :model="form" :rules="rules" label-width="80px">
+        <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-form-item label="来源" prop="source">
+          <el-input v-model="form.source" placeholder="请输入来源" />
+        </el-form-item>
+        <el-form-item label="冰点" prop="freeze">
+          <el-input v-model="form.freeze" placeholder="请输入冰点" />
+        </el-form-item>
+        <el-form-item label="相对密度" prop="density">
+          <el-input v-model="form.density" placeholder="请输入相对密度" />
+        </el-form-item>
+        <el-form-item label="脂肪g/100g" prop="fat">
+          <el-input v-model="form.fat" placeholder="请输入脂肪g/100g" />
+        </el-form-item>
+        <el-form-item label="蛋白质g/100g" prop="protein">
+          <el-input v-model="form.protein" placeholder="请输入蛋白质g/100g" />
+        </el-form-item>
+        <el-form-item label="非脂g/100g" prop="nonFat">
+          <el-input v-model="form.nonFat" placeholder="请输入非脂g/100g" />
+        </el-form-item>
+        <el-form-item label="干物质mg/100g" prop="dryMatter">
+          <el-input v-model="form.dryMatter" placeholder="请输入干物质mg/100g" />
+        </el-form-item>
+        <el-form-item label="杂物质mg/100g" prop="impurity">
+          <el-input v-model="form.impurity" placeholder="请输入杂物质mg/100g" />
+        </el-form-item>
+        <el-form-item label="乳糖g/100g" prop="lactose">
+          <el-input v-model="form.lactose" placeholder="请输入乳糖g/100g" />
+        </el-form-item>
+        <el-form-item label="灰度g/100g">
+          <editor v-model="form.ashContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="酸度" prop="acidity">
+          <el-input v-model="form.acidity" placeholder="请输入酸度" />
+        </el-form-item>
+        <el-form-item label="ph" prop="ph">
+          <el-input v-model="form.ph" placeholder="请输入ph" />
+        </el-form-item>
+        <el-form-item label="菌落总数" prop="bacterialColony">
+          <el-input v-model="form.bacterialColony" placeholder="请输入菌落总数" />
+        </el-form-item>
+        <el-form-item label="乳铁蛋白" prop="lactoferrin">
+          <el-input v-model="form.lactoferrin" placeholder="请输入乳铁蛋白" />
+        </el-form-item>
+        <el-form-item label="免疫球蛋白" prop="ig">
+          <el-input v-model="form.ig" placeholder="请输入免疫球蛋白" />
+        </el-form-item>
+        <el-form-item label="体细胞" prop="somaticCell">
+          <el-input v-model="form.somaticCell" placeholder="请输入体细胞" />
+        </el-form-item>
+        <el-form-item label="尿素氮" prop="usea">
+          <el-input v-model="form.usea" placeholder="请输入尿素氮" />
+        </el-form-item>
+        <el-form-item label="脂蛋比" prop="fatRatio">
+          <el-input v-model="form.fatRatio" placeholder="请输入脂蛋比" />
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="RawMilkTest">
+import { listRawMilkTest, getRawMilkTest, delRawMilkTest, addRawMilkTest, updateRawMilkTest } from "@/api/dairyProducts/rawMilkTest/rawMilkTest.js"
+
+const { proxy } = getCurrentInstance()
+
+const rawMilkTestList = 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,
+    datetime: null,
+    source: null,
+    freeze: null,
+    density: null,
+    fat: null,
+    protein: null,
+    nonFat: null,
+    dryMatter: null,
+    impurity: null,
+    lactose: null,
+    ashContent: null,
+    acidity: null,
+    ph: null,
+    bacterialColony: null,
+    lactoferrin: null,
+    ig: null,
+    somaticCell: null,
+    usea: null,
+    fatRatio: null,
+    comment: null,
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询生乳检验记录列表 */
+function getList() {
+  loading.value = true
+  listRawMilkTest(queryParams.value).then(response => {
+    rawMilkTestList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    datetime: null,
+    source: null,
+    freeze: null,
+    density: null,
+    fat: null,
+    protein: null,
+    nonFat: null,
+    dryMatter: null,
+    impurity: null,
+    lactose: null,
+    ashContent: null,
+    acidity: null,
+    ph: null,
+    bacterialColony: null,
+    lactoferrin: null,
+    ig: null,
+    somaticCell: null,
+    usea: null,
+    fatRatio: null,
+    comment: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("rawMilkTestRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getRawMilkTest(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改生乳检验记录"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["rawMilkTestRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateRawMilkTest(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addRawMilkTest(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 delRawMilkTest(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('rawMilkTest/rawMilkTest/export', {
+    ...queryParams.value
+  }, `rawMilkTest_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>

src/views/dairyProducts/weightCorrection/index.vue

@@ -0,0 +1,292 @@
+<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
+          v-model="queryParams.datetime"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="厂区" prop="factory">
+        <el-select v-model="queryParams.factory" placeholder="请选择厂区" clearable>
+          <el-option
+            v-for="dict in da_ranch"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['weightCorrection:weightCorrection:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['weightCorrection:weightCorrection:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['weightCorrection:weightCorrection:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['weightCorrection:weightCorrection:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="weightCorrectionList" @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="factory">
+        <template #default="scope">
+          <dict-tag :options="da_ranch" :value="scope.row.factory"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="实际奶量" align="center" prop="actual" />
+      <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>
+        </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="['weightCorrection:weightCorrection:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['weightCorrection:weightCorrection: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="weightCorrectionRef" :model="form" :rules="rules" label-width="80px">
+        <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-form-item label="厂区" prop="factory">
+          <el-select v-model="form.factory" placeholder="请选择厂区">
+            <el-option
+              v-for="dict in da_ranch"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实际奶量" prop="actual">
+          <el-input v-model="form.actual" placeholder="请输入实际奶量" type="number" step="0.01" min="0" />
+        </el-form-item>
+        <el-form-item label="系统奶量" prop="systemMilk"> <!-- 修改这里 -->
+          <el-input v-model="form.systemMilk" placeholder="请输入系统奶量" type="number" step="0.01" min="0" />
+        </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="WeightCorrection">
+ import { listWeightCorrection, getWeightCorrection, delWeightCorrection, addWeightCorrection, updateWeightCorrection } from "@/api/dairyProducts/weightCorrection/weightCorrection.js"
+
+const { proxy } = getCurrentInstance()
+const { da_ranch } = proxy.useDict('da_ranch')
+
+const weightCorrectionList = 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,
+    datetime: null,
+    factory: null
+  },
+  rules: {
+    datetime: [{ required: true, message: "日期不能为空", trigger: "blur" }],
+    factory: [{ required: true, message: "厂区不能为空", trigger: "change" }],
+    actual: [
+      { required: true, message: "实际奶量不能为空", trigger: "blur" },
+      { type: 'number', min: 0, message: "实际奶量必须大于0", trigger: "blur", transform: value => Number(value) }
+    ],
+    systemMilk: [ // 修改这里
+      { required: true, message: "系统奶量不能为空", trigger: "blur" },
+      { type: 'number', min: 0, message: "系统奶量必须大于0", trigger: "blur", transform: value => Number(value) }
+    ]
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询称重校正列表 */
+function getList() {
+  loading.value = true
+  listWeightCorrection(queryParams.value).then(response => {
+    weightCorrectionList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    datetime: null,
+    factory: null,
+    actual: null,
+    systemMilk: null // 修改这里
+  }
+  proxy.resetForm("weightCorrectionRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getWeightCorrection(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改称重校正"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["weightCorrectionRef"].validate(valid => {
+    if (valid) {
+      // 确保数值类型正确
+      form.value.actual = parseFloat(form.value.actual)
+      form.value.systemMilk = parseFloat(form.value.systemMilk) // 修改这里
+      
+      if (form.value.id != null) {
+        updateWeightCorrection(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addWeightCorrection(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 delWeightCorrection(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('weightCorrection/weightCorrection/export', {
+    ...queryParams.value
+  }, `weightCorrection_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>

src/views/fileManagement/group_management/index.vue

@@ -0,0 +1,304 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="分组名称" prop="groupName">
+        <el-input
+          v-model="queryParams.groupName"
+          placeholder="请输入分组名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <!-- 单选框 -->
+        <el-radio-group v-model="queryParams.status">
+          <el-radio
+            v-for="dict in group_status"
+            :key="dict.value"
+            :label="dict.value"
+          >{{dict.label}}</el-radio>
+        </el-radio-group>
+      </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="['group_management:group_management:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Sort"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="group_managementList"
+      row-key="groupId"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <!-- <el-table-column label="上级分组" prop="parentId" /> -->
+      <el-table-column label="分组名称" align="center" prop="groupName" />
+      <!-- <el-table-column label="祖级列表" align="center" prop="ancestors" /> -->
+      <el-table-column label="所属分组" align="center" prop="ancestorNames" />
+      <!-- <el-table-column label="是否为叶子结点" align="center" prop="isLeaf" /> -->
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="group_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <!-- <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="updateBy" /> -->
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+        <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">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['group_management:group_management:edit']">修改</el-button>
+          <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['group_management:group_management:add']">新增</el-button>
+          <el-button v-if="scope.row.isLeaf === true" link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['group_management:group_management:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改分组管理对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="group_managementRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="上级分组" prop="parentId">
+          <el-tree-select
+            v-model="form.parentId"
+            :data="group_managementOptions"
+            :props="{ value: 'groupId', label: 'groupName', children: 'children' }"
+            value-key="groupId"
+            placeholder="请选择上级分组"
+            check-strictly
+            :disabled="title === '修改分组管理'"
+          />
+        </el-form-item>
+        <el-form-item label="分组名称" prop="groupName">
+          <el-input v-model="form.groupName" placeholder="请输入分组名称" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in group_status"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </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="Group_management">
+import { listGroup_management, getGroup_management, delGroup_management, addGroup_management, updateGroup_management } from "@/api/fileManagement/group_management"
+
+const { proxy } = getCurrentInstance()
+const { group_status } = proxy.useDict('group_status')
+
+const group_managementList = ref([])
+const group_managementOptions = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const title = ref("")
+const isExpandAll = ref(true)
+const refreshTable = ref(true)
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    groupName: null,
+    status: '0', // 默认启用状态
+  },
+  rules: {
+    parentId: [
+      { required: true, message: "上级分组不能为空", trigger: "blur" }
+    ],
+    groupName: [
+      { required: true, message: "分组名称不能为空", trigger: "blur" }
+    ],
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询分组管理列表 */
+function getList() {
+  loading.value = true
+  listGroup_management(queryParams.value).then(response => {
+    group_managementList.value = proxy.handleTree(response.data, "groupId", "parentId")
+    loading.value = false
+  })
+}
+
+/** 查询分组管理下拉树结构 */
+function getTreeselect() {
+  listGroup_management().then(response => {
+    group_managementOptions.value = []
+    const data = { groupId: 0, groupName: '顶级节点', ancestors:"0",children: [] }
+    data.children = proxy.handleTree(response.data, "groupId", "parentId")
+    group_managementOptions.value.push(data)
+  })
+}
+
+// 新增：递归查找节点函数
+function findNode(tree, id) {
+  let result = null
+  for (const node of tree) {
+    if (node.groupId === id) return node
+    if (node.children && node.children.length) {
+      result = findNode(node.children, id)
+      if (result) return result
+    }
+  }
+  return result
+}
+	
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    groupId: null,
+    parentId: null,
+    groupName: null,
+    ancestors: null,
+    status: '0', // 默认启用状态
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null
+  }
+  proxy.resetForm("group_managementRef")
+}
+
+/** 搜索功能 */
+function handleQuery() {
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+/** 新增按钮操作 */
+function handleAdd(row) {
+  reset()
+  getTreeselect()
+  if (row != null && row.groupId) {
+    form.value.parentId = row.groupId
+  } else {
+    form.value.parentId = 0
+  }
+  open.value = true
+  title.value = "添加分组管理"
+}
+
+/** 展开/折叠操作 */
+function toggleExpandAll() {
+  refreshTable.value = false
+  isExpandAll.value = !isExpandAll.value
+  nextTick(() => {
+    refreshTable.value = true
+  })
+}
+
+/** 修改按钮操作 */
+async function handleUpdate(row) {
+  reset()
+  await getTreeselect()
+  if (row != null) {
+    form.value.parentId = row.parentId
+  }
+  getGroup_management(row.groupId).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改分组管理"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["group_managementRef"].validate(valid => {
+    if (valid) {
+      // 新增：计算祖先路径
+      if (form.value.parentId === 0) {
+        form.value.ancestors = "0"
+      } else {
+        const parentNode = findNode(group_managementOptions.value, form.value.parentId)
+        if (parentNode) {
+          form.value.ancestors = `${parentNode.ancestors},${parentNode.groupId}`
+        } else {
+          // 找不到父节点时使用默认值
+          form.value.ancestors = "0"
+        }
+      }
+
+      if (form.value.groupId != null) {
+        updateGroup_management(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addGroup_management(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  proxy.$modal.confirm('是否确认删除分组管理编号为"' + row.groupId + '"的数据项？').then(function() {
+    return delGroup_management(row.groupId)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+getList()
+</script>

src/views/fileManagement/sheepfold_management/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="牧场id" prop="ranchId">
-        <el-select v-model="queryParams.ranchId" placeholder="请选择牧场id" clearable>
+      <el-form-item label="牧场" prop="ranchId">
+        <el-select v-model="queryParams.ranchId" placeholder="请选择牧场" style="width:200px" clearable>
           <el-option
             v-for="dict in da_ranch"
             :key="dict.value"
@@ -11,8 +11,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="羊舍类型id" prop="sheepfoldTypeId">
-        <el-select v-model="queryParams.sheepfoldTypeId" placeholder="请选择羊舍类型id" clearable>
+      <el-form-item label="羊舍类型" prop="sheepfoldTypeId">
+        <el-select v-model="queryParams.sheepfoldTypeId" placeholder="请选择羊舍类型"  style="width:200px"  clearable>
           <el-option
             v-for="dict in bas_sheepfold_type"
             :key="dict.value"
@@ -37,7 +37,7 @@
           v-hasPermi="['sheepfold_management:sheepfold_management:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -46,7 +46,7 @@
           @click="handleUpdate"
           v-hasPermi="['sheepfold_management:sheepfold_management:edit']"
         >修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -69,28 +69,27 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="sheepfold_managementList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="sheepfold_managementList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="羊舍id" align="center" prop="id" />
-      <el-table-column label="牧场id" align="center" prop="ranchId">
+      <el-table-column label="羊舍id" align="center" prop="id" sortable/>
+      <el-table-column label="牧场" align="center" prop="ranchId" sortable>
         <template #default="scope">
           <dict-tag :options="da_ranch" :value="scope.row.ranchId"/>
         </template>
       </el-table-column>
-      <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
-      <el-table-column label="羊舍类型id" align="center" prop="sheepfoldTypeId">
+      <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" sortable/>
+      <el-table-column label="羊舍类型" align="center" prop="sheepfoldTypeId" sortable>
         <template #default="scope">
           <dict-tag :options="bas_sheepfold_type" :value="scope.row.sheepfoldTypeId"/>
         </template>
       </el-table-column>
-      <el-table-column label="羊舍编号" align="center" prop="sheepfoldNo" />
-      <el-table-column label="排号" align="center" prop="rowNo" />
-      <el-table-column label="栏数" align="center" prop="columns" />
-      <el-table-column label="备注" align="center" prop="comment" />
-      <el-table-column label="是否删除" align="center" prop="isDelete" />
+      <el-table-column label="羊舍编号" align="center" prop="sheepfoldNo" sortable/>
+      <el-table-column label="排号" align="center" prop="rowNo" sortable/>
+      <el-table-column label="栏号" align="center" prop="columns" sortable/>
+      <el-table-column label="备注" align="center" prop="comment" sortable/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['sheepfold_management:sheepfold_management:edit']">修改</el-button>
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['sheepfold_management:sheepfold_management:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['sheepfold_management:sheepfold_management:remove']">删除</el-button>
         </template>
       </el-table-column>
@@ -107,8 +106,8 @@
     <!-- 添加或修改羊舍管理对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="sheepfold_managementRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="牧场id" prop="ranchId">
-          <el-select v-model="form.ranchId" placeholder="请选择牧场id">
+        <el-form-item label="牧场" prop="ranchId">
+          <el-select v-model="form.ranchId" placeholder="请选择牧场">
             <el-option
               v-for="dict in da_ranch"
               :key="dict.value"
@@ -117,11 +116,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="羊舍名称" prop="sheepfoldName">
+        <!-- <el-form-item label="羊舍名称" prop="sheepfoldName">
           <el-input v-model="form.sheepfoldName" placeholder="请输入羊舍名称" />
-        </el-form-item>
-        <el-form-item label="羊舍类型id" prop="sheepfoldTypeId">
-          <el-select v-model="form.sheepfoldTypeId" placeholder="请选择羊舍类型id">
+        </el-form-item> -->
+        <el-form-item label="羊舍类型" prop="sheepfoldTypeId">
+          <el-select v-model="form.sheepfoldTypeId" placeholder="请选择羊舍类型">
             <el-option
               v-for="dict in bas_sheepfold_type"
               :key="dict.value"
@@ -131,20 +130,54 @@
           </el-select>
         </el-form-item>
         <el-form-item label="羊舍编号" prop="sheepfoldNo">
-          <el-input v-model="form.sheepfoldNo" placeholder="请输入羊舍编号" />
+          <el-input v-model="form.sheepfoldNo" placeholder="请输入羊舍编号" @input="validateSheepfoldNo" />
+            <div v-if="sheepfoldNoExists" style="color: red; font-size: 12px; margin-top: 5px;">
+              该羊舍编号已存在
+            </div>
         </el-form-item>
-        <el-form-item label="排号" prop="rowNo">
+        <!-- <el-form-item label="排号" prop="rowNo">
           <el-input v-model="form.rowNo" placeholder="请输入排号" />
+        </el-form-item> -->
+
+        <el-form-item label="排数" prop="rowCount">
+          <el-input-number 
+            v-model="form.rowCount" 
+            :min="1" 
+            :max="10" 
+            @change="handleRowCountChange"
+            placeholder="请输入排数" 
+          />
         </el-form-item>
-        <el-form-item label="栏数" prop="columns">
+
+        <!-- <el-form-item label="栏号" prop="columns">
           <el-input v-model="form.columns" placeholder="请输入栏数" />
-        </el-form-item>
+        </el-form-item> -->
+
+
+        <!-- 动态栏位数配置 -->
+        <div v-for="(row, index) in form.rowsConfig" :key="index" class="row-config">
+          <el-form-item 
+            :label="`${String.fromCharCode(65 + index)}排栏位数`" 
+            :prop="`rowsConfig.${index}.columnCount`" 
+            :rules="{
+              required: true, 
+              message: `请填写${String.fromCharCode(65 + index)}排栏位数`, 
+              trigger: 'blur'
+            }"
+          >
+            <el-input-number 
+              v-model="row.columnCount" 
+              :min="1" 
+              :max="99" 
+              placeholder="请输入栏位数" 
+            />
+          </el-form-item>
+        </div>
+
+
         <el-form-item label="备注" prop="comment">
           <el-input v-model="form.comment" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="是否删除" prop="isDelete">
-          <el-input v-model="form.isDelete" placeholder="请输入是否删除" />
-        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -157,7 +190,7 @@
 </template>
 
 <script setup name="Sheepfold_management">
-import { listSheepfold_management, getSheepfold_management, delSheepfold_management, addSheepfold_management, updateSheepfold_management } from "@/api/sheepfold_management/sheepfold_management"
+import { listSheepfold_management, getSheepfold_management, delSheepfold_management, addSheepfold_management, updateSheepfold_management,checkSheepfoldNoExist } from "@/api/fileManagement/sheepfold_management"
 
 const { proxy } = getCurrentInstance()
 const { bas_sheepfold_type, da_ranch } = proxy.useDict('bas_sheepfold_type', 'da_ranch')
@@ -171,21 +204,62 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
+const sheepfoldNoExists = ref(false) // 用于显示羊舍编号是否存在
 
 const data = reactive({
-  form: {},
+    form: {
+    id: null,
+    ranchId: null,
+    sheepfoldName: null,
+    sheepfoldTypeId: null,
+    sheepfoldNo: null,
+    rowCount: 1, // 默认1排
+    rowsConfig: [{ columnCount: 1 }], // 默认1栏
+    comment: null
+  },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     ranchId: null,
     sheepfoldTypeId: null,
   },
-  rules: {
+   rules: {
+    rowCount: [
+      { required: true, message: "排数不能为空", trigger: "blur" },
+      { type: 'number', min: 1, max: 10, message: '排数在1-10之间', trigger: 'blur' }
+    ],
+    sheepfoldNo: [
+      { required: true, message: "羊舍编号不能为空", trigger: "blur" },
+      { pattern: /^\d*$/, message: "羊舍编号必须为数字", trigger: "blur" }
+    ],
+    ranchId: [
+      { required: true, message: "牧场不能为空", trigger: "blur" }
+    ],
+    sheepfoldTypeId: [
+      { required: true, message: "羊舍类型不能为空", trigger: "blur" }
+    ]
   }
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
+// 排数变化处理
+const handleRowCountChange = (count) => {
+  // 确保count是数字
+  count = Number(count)
+  
+  // 重置rowsConfig
+  form.value.rowsConfig = []
+  
+  // 根据排数生成配置项
+  for (let i = 0; i < count; i++) {
+    form.value.rowsConfig.push({
+      rowLetter: String.fromCharCode(65 + i), // A, B, C...
+      columnCount: 1 // 默认1栏
+    })
+  }
+}
+
 /** 查询羊舍管理列表 */
 function getList() {
   loading.value = true
@@ -210,10 +284,9 @@ function reset() {
     sheepfoldName: null,
     sheepfoldTypeId: null,
     sheepfoldNo: null,
-    rowNo: null,
-    columns: null,
-    comment: null,
-    isDelete: null
+    rowCount: 1,
+    rowsConfig: [{ columnCount: 1 }],
+    comment: null
   }
   proxy.resetForm("sheepfold_managementRef")
 }
@@ -241,36 +314,119 @@ function handleSelectionChange(selection) {
 function handleAdd() {
   reset()
   open.value = true
+  sheepfoldNoExists.value = false
   title.value = "添加羊舍管理"
 }
 
 /** 修改按钮操作 */
-function handleUpdate(row) {
-  reset()
-  const _id = row.id || ids.value
-  getSheepfold_management(_id).then(response => {
-    form.value = response.data
-    open.value = true
-    title.value = "修改羊舍管理"
-  })
+// function handleUpdate(row) {
+//   reset()
+//   const _id = row.id || ids.value
+//   getSheepfold_management(_id).then(response => {
+//     form.value = response.data
+//     // 修改时不需要rowsConfig
+//     if (form.value.rowsConfig) {
+//       delete form.value.rowsConfig
+//       delete form.value.rowCount
+//     }
+//     open.value = true
+//     title.value = "修改羊舍管理"
+//   })
+// }
+/**查找字典 */
+function findDictLabelByValue(dictOptions, value) {
+  const formattedValue = String(value);
+  const foundOption = dictOptions.value.find(option => option.value === formattedValue);
+  return foundOption ? foundOption.label : '';
+}
+
+// 验证羊舍编号，确保只能输入数字
+function validateSheepfoldNo() {
+  const sheepfoldNo = form.value.sheepfoldNo
+  if (sheepfoldNo) {
+    // 移除非数字字符
+    const cleanedInput = sheepfoldNo.replace(/\D/g, '')
+    if (cleanedInput !== sheepfoldNo) {
+      form.value.sheepfoldNo = cleanedInput
+      proxy.$modal.msgWarning("羊舍编号只能输入数字")
+    }
+  }
+}
+
+// 检查羊舍编号是否已存在
+async function checkSheepfoldNoExistence() {
+
+  if (!form.value.sheepfoldNo || !form.value.ranchId || !form.value.sheepfoldTypeId) {
+    sheepfoldNoExists.value = false
+    return
+  }
+  try {
+    const exist = await checkSheepfoldNoExist(form.value.ranchId, form.value.sheepfoldTypeId, form.value.sheepfoldNo)
+
+    sheepfoldNoExists.value = exist.data
+  } catch (error) {
+    proxy.$modal.msgError("检查羊舍编号时出错：" + error.message)
+    sheepfoldNoExists.value = false
+  }
 }
 
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["sheepfold_managementRef"].validate(valid => {
+  proxy.$refs["sheepfold_managementRef"].validate(async valid => {
     if (valid) {
+   // 检查羊舍编号是否已存在
+      await checkSheepfoldNoExistence()
+      if (sheepfoldNoExists.value) {
+        proxy.$modal.msgError("该羊舍编号已存在，无法重复添加")
+        return
+      }
+
+
       if (form.value.id != null) {
+        // 修改操作 - 单条记录
         updateSheepfold_management(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        addSheepfold_management(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
+        // 新增操作 - 多条记录
+        const requests = []
+        const ranchName = findDictLabelByValue(da_ranch, form.value.ranchId)
+        const typeName = findDictLabelByValue(bas_sheepfold_type, form.value.sheepfoldTypeId)
+        
+        // 生成每条记录的数据
+        form.value.rowsConfig.forEach((rowConfig, rowIndex) => {
+          // 使用行索引 + 1 作为排号
+          const rowNo = String.fromCharCode(65 + rowIndex) // A, B, C...
+          
+          for (let i = 1; i <= rowConfig.columnCount; i++) {
+            const columnNo = i.toString().padStart(2, '0') // 01, 02, 03...
+            const record = {
+              ranchId: form.value.ranchId,
+              sheepfoldTypeId: form.value.sheepfoldTypeId,
+              sheepfoldNo: form.value.sheepfoldNo,
+              rowNo: rowNo, // 使用正确的排号
+              columns: columnNo,
+              comment: form.value.comment,
+              // 自动生成羊舍名称：羊舍编号 + 类型 + 排号栏号
+              sheepfoldName: `${form.value.sheepfoldNo}号-${typeName}-${rowNo}${columnNo}`
+            }
+            requests.push(addSheepfold_management(record))
+          }
         })
+        
+        
+        // 执行所有新增请求
+        Promise.all(requests)
+          .then(() => {
+            proxy.$modal.msgSuccess(`新增成功，共添加${requests.length}条记录`)
+            open.value = false
+            getList()
+          })
+          .catch(error => {
+            proxy.$modal.msgError("部分记录添加失败：" + error.message)
+          })
       }
     }
   })
@@ -296,3 +452,14 @@ function handleExport() {
 
 getList()
 </script>
+
+
+<style scoped>
+.row-config {
+  margin-bottom: 15px;
+  padding: 10px;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  background-color: #f5f7fa;
+}
+</style>

src/views/sheep_file/sheep_file/index.vue

@@ -1,771 +0,0 @@
-<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="牧场id" prop="ranchId">
-        <el-input
-          v-model="queryParams.ranchId"
-          placeholder="请输入牧场id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="羊舍id" prop="sheepfoldId">
-        <el-input
-          v-model="queryParams.sheepfoldId"
-          placeholder="请输入羊舍id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="电子耳号" prop="electronicTags">
-        <el-input
-          v-model="queryParams.electronicTags"
-          placeholder="请输入电子耳号"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="品种id" prop="varietyId">
-        <el-input
-          v-model="queryParams.varietyId"
-          placeholder="请输入品种id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="家系" prop="family">
-        <el-input
-          v-model="queryParams.family"
-          placeholder="请输入家系"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="羊只类别" prop="typeId">
-        <el-input
-          v-model="queryParams.typeId"
-          placeholder="请输入羊只类别"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="性别" prop="gender">
-        <el-input
-          v-model="queryParams.gender"
-          placeholder="请输入性别"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="出生日期" prop="birthday">
-        <el-date-picker clearable
-          v-model="queryParams.birthday"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择出生日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="出生体重" prop="birthWeight">
-        <el-input
-          v-model="queryParams.birthWeight"
-          placeholder="请输入出生体重"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="胎次" prop="parity">
-        <el-input
-          v-model="queryParams.parity"
-          placeholder="请输入胎次"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="羊只状态" prop="statusId">
-        <el-input
-          v-model="queryParams.statusId"
-          placeholder="请输入羊只状态"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="断奶日期" prop="weaningDate">
-        <el-date-picker clearable
-          v-model="queryParams.weaningDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择断奶日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="断奶体重" prop="weaningWeight">
-        <el-input
-          v-model="queryParams.weaningWeight"
-          placeholder="请输入断奶体重"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="繁育状态id" prop="breedStatusId">
-        <el-input
-          v-model="queryParams.breedStatusId"
-          placeholder="请输入繁育状态id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="父号id" prop="fatherId">
-        <el-input
-          v-model="queryParams.fatherId"
-          placeholder="请输入父号id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="母号id" prop="motherId">
-        <el-input
-          v-model="queryParams.motherId"
-          placeholder="请输入母号id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="受体id" prop="receptorId">
-        <el-input
-          v-model="queryParams.receptorId"
-          placeholder="请输入受体id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="配种日期" prop="matingDate">
-        <el-date-picker clearable
-          v-model="queryParams.matingDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择配种日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="配种类型" prop="matingTypeId">
-        <el-input
-          v-model="queryParams.matingTypeId"
-          placeholder="请输入配种类型"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="孕检日期" prop="pregDate">
-        <el-date-picker clearable
-          v-model="queryParams.pregDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择孕检日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="产羔日期" prop="lambingDate">
-        <el-date-picker clearable
-          v-model="queryParams.lambingDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择产羔日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="产羔时怀孕天数" prop="lambingDay">
-        <el-input
-          v-model="queryParams.lambingDay"
-          placeholder="请输入产羔时怀孕天数"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="预产日期" prop="expectedDate">
-        <el-date-picker clearable
-          v-model="queryParams.expectedDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择预产日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="是否性控" prop="controlled">
-        <el-input
-          v-model="queryParams.controlled"
-          placeholder="请输入是否性控"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="配种次数" prop="matingCounts">
-        <el-input
-          v-model="queryParams.matingCounts"
-          placeholder="请输入配种次数"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="羊只id" prop="matingTotal">
-        <el-input
-          v-model="queryParams.matingTotal"
-          placeholder="请输入羊只id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="累计流产次数" prop="miscarriageCounts">
-        <el-input
-          v-model="queryParams.miscarriageCounts"
-          placeholder="请输入累计流产次数"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="体况评分" prop="body">
-        <el-input
-          v-model="queryParams.body"
-          placeholder="请输入体况评分"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乳房评分" prop="breast">
-        <el-input
-          v-model="queryParams.breast"
-          placeholder="请输入乳房评分"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入群来源" prop="source">
-        <el-input
-          v-model="queryParams.source"
-          placeholder="请输入入群来源"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入群日期" prop="soureDate">
-        <el-date-picker clearable
-          v-model="queryParams.soureDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择入群日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="来源牧场id" prop="sourceRanchId">
-        <el-input
-          v-model="queryParams.sourceRanchId"
-          placeholder="请输入来源牧场id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="comment">
-        <el-input
-          v-model="queryParams.comment"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否删除" prop="isDelete">
-        <el-input
-          v-model="queryParams.isDelete"
-          placeholder="请输入是否删除"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </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_file:sheep_file:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['sheep_file:sheep_file:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['sheep_file:sheep_file:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['sheep_file:sheep_file:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="sheep_fileList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="羊只id" align="center" prop="id" />
-      <el-table-column label="管理耳号" align="center" prop="manageTags" />
-      <el-table-column label="牧场id" align="center" prop="ranchId" />
-      <el-table-column label="羊舍id" align="center" prop="sheepfoldId" />
-      <el-table-column label="电子耳号" align="center" prop="electronicTags" />
-      <el-table-column label="品种id" align="center" prop="varietyId" />
-      <el-table-column label="家系" align="center" prop="family" />
-      <el-table-column label="羊只类别" align="center" prop="typeId" />
-      <el-table-column label="性别" align="center" prop="gender" />
-      <el-table-column label="出生日期" align="center" prop="birthday" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="出生体重" align="center" prop="birthWeight" />
-      <el-table-column label="胎次" align="center" prop="parity" />
-      <el-table-column label="羊只状态" align="center" prop="statusId" />
-      <el-table-column label="断奶日期" align="center" prop="weaningDate" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.weaningDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="断奶体重" align="center" prop="weaningWeight" />
-      <el-table-column label="繁育状态id" align="center" prop="breedStatusId" />
-      <el-table-column label="父号id" align="center" prop="fatherId" />
-      <el-table-column label="母号id" align="center" prop="motherId" />
-      <el-table-column label="受体id" align="center" prop="receptorId" />
-      <el-table-column label="配种日期" align="center" prop="matingDate" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.matingDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="配种类型" align="center" prop="matingTypeId" />
-      <el-table-column label="孕检日期" align="center" prop="pregDate" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.pregDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="产羔日期" align="center" prop="lambingDate" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.lambingDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="产羔时怀孕天数" align="center" prop="lambingDay" />
-      <el-table-column label="预产日期" align="center" prop="expectedDate" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.expectedDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="是否性控" align="center" prop="controlled" />
-      <el-table-column label="配种次数" align="center" prop="matingCounts" />
-      <el-table-column label="羊只id" align="center" prop="matingTotal" />
-      <el-table-column label="累计流产次数" align="center" prop="miscarriageCounts" />
-      <el-table-column label="体况评分" align="center" prop="body" />
-      <el-table-column label="乳房评分" align="center" prop="breast" />
-      <el-table-column label="入群来源" align="center" prop="source" />
-      <el-table-column label="入群日期" align="center" prop="soureDate" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.soureDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="来源牧场id" align="center" prop="sourceRanchId" />
-      <el-table-column label="备注" align="center" prop="comment" />
-      <el-table-column label="是否删除" align="center" prop="isDelete" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['sheep_file:sheep_file:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['sheep_file:sheep_file:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </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="sheep_fileRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="管理耳号" prop="manageTags">
-          <el-input v-model="form.manageTags" placeholder="请输入管理耳号" />
-        </el-form-item>
-        <el-form-item label="牧场id" prop="ranchId">
-          <el-input v-model="form.ranchId" placeholder="请输入牧场id" />
-        </el-form-item>
-        <el-form-item label="羊舍id" prop="sheepfoldId">
-          <el-input v-model="form.sheepfoldId" placeholder="请输入羊舍id" />
-        </el-form-item>
-        <el-form-item label="电子耳号" prop="electronicTags">
-          <el-input v-model="form.electronicTags" placeholder="请输入电子耳号" />
-        </el-form-item>
-        <el-form-item label="品种id" prop="varietyId">
-          <el-input v-model="form.varietyId" placeholder="请输入品种id" />
-        </el-form-item>
-        <el-form-item label="家系" prop="family">
-          <el-input v-model="form.family" placeholder="请输入家系" />
-        </el-form-item>
-        <el-form-item label="羊只类别" prop="typeId">
-          <el-input v-model="form.typeId" placeholder="请输入羊只类别" />
-        </el-form-item>
-        <el-form-item label="性别" prop="gender">
-          <el-input v-model="form.gender" placeholder="请输入性别" />
-        </el-form-item>
-        <el-form-item label="出生日期" prop="birthday">
-          <el-date-picker clearable
-            v-model="form.birthday"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择出生日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="出生体重" prop="birthWeight">
-          <el-input v-model="form.birthWeight" placeholder="请输入出生体重" />
-        </el-form-item>
-        <el-form-item label="胎次" prop="parity">
-          <el-input v-model="form.parity" placeholder="请输入胎次" />
-        </el-form-item>
-        <el-form-item label="羊只状态" prop="statusId">
-          <el-input v-model="form.statusId" placeholder="请输入羊只状态" />
-        </el-form-item>
-        <el-form-item label="断奶日期" prop="weaningDate">
-          <el-date-picker clearable
-            v-model="form.weaningDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择断奶日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="断奶体重" prop="weaningWeight">
-          <el-input v-model="form.weaningWeight" placeholder="请输入断奶体重" />
-        </el-form-item>
-        <el-form-item label="繁育状态id" prop="breedStatusId">
-          <el-input v-model="form.breedStatusId" placeholder="请输入繁育状态id" />
-        </el-form-item>
-        <el-form-item label="父号id" prop="fatherId">
-          <el-input v-model="form.fatherId" placeholder="请输入父号id" />
-        </el-form-item>
-        <el-form-item label="母号id" prop="motherId">
-          <el-input v-model="form.motherId" placeholder="请输入母号id" />
-        </el-form-item>
-        <el-form-item label="受体id" prop="receptorId">
-          <el-input v-model="form.receptorId" placeholder="请输入受体id" />
-        </el-form-item>
-        <el-form-item label="配种日期" prop="matingDate">
-          <el-date-picker clearable
-            v-model="form.matingDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择配种日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="配种类型" prop="matingTypeId">
-          <el-input v-model="form.matingTypeId" placeholder="请输入配种类型" />
-        </el-form-item>
-        <el-form-item label="孕检日期" prop="pregDate">
-          <el-date-picker clearable
-            v-model="form.pregDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择孕检日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="产羔日期" prop="lambingDate">
-          <el-date-picker clearable
-            v-model="form.lambingDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择产羔日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="产羔时怀孕天数" prop="lambingDay">
-          <el-input v-model="form.lambingDay" placeholder="请输入产羔时怀孕天数" />
-        </el-form-item>
-        <el-form-item label="预产日期" prop="expectedDate">
-          <el-date-picker clearable
-            v-model="form.expectedDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择预产日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="是否性控" prop="controlled">
-          <el-input v-model="form.controlled" placeholder="请输入是否性控" />
-        </el-form-item>
-        <el-form-item label="配种次数" prop="matingCounts">
-          <el-input v-model="form.matingCounts" placeholder="请输入配种次数" />
-        </el-form-item>
-        <el-form-item label="羊只id" prop="matingTotal">
-          <el-input v-model="form.matingTotal" placeholder="请输入羊只id" />
-        </el-form-item>
-        <el-form-item label="累计流产次数" prop="miscarriageCounts">
-          <el-input v-model="form.miscarriageCounts" placeholder="请输入累计流产次数" />
-        </el-form-item>
-        <el-form-item label="体况评分" prop="body">
-          <el-input v-model="form.body" placeholder="请输入体况评分" />
-        </el-form-item>
-        <el-form-item label="乳房评分" prop="breast">
-          <el-input v-model="form.breast" placeholder="请输入乳房评分" />
-        </el-form-item>
-        <el-form-item label="入群来源" prop="source">
-          <el-input v-model="form.source" placeholder="请输入入群来源" />
-        </el-form-item>
-        <el-form-item label="入群日期" prop="soureDate">
-          <el-date-picker clearable
-            v-model="form.soureDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择入群日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="来源牧场id" prop="sourceRanchId">
-          <el-input v-model="form.sourceRanchId" placeholder="请输入来源牧场id" />
-        </el-form-item>
-        <el-form-item label="备注" prop="comment">
-          <el-input v-model="form.comment" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="是否删除" prop="isDelete">
-          <el-input v-model="form.isDelete" placeholder="请输入是否删除" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="Sheep_file">
-import { listSheep_file, getSheep_file, delSheep_file, addSheep_file, updateSheep_file } from "@/api/sheep_file/sheep_file"
-
-const { proxy } = getCurrentInstance()
-
-const sheep_fileList = 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,
-    ranchId: null,
-    sheepfoldId: null,
-    electronicTags: null,
-    varietyId: null,
-    family: null,
-    typeId: null,
-    gender: null,
-    birthday: null,
-    birthWeight: null,
-    parity: null,
-    statusId: null,
-    weaningDate: null,
-    weaningWeight: null,
-    breedStatusId: null,
-    fatherId: null,
-    motherId: null,
-    receptorId: null,
-    matingDate: null,
-    matingTypeId: null,
-    pregDate: null,
-    lambingDate: null,
-    lambingDay: null,
-    expectedDate: null,
-    controlled: null,
-    matingCounts: null,
-    matingTotal: null,
-    miscarriageCounts: null,
-    body: null,
-    breast: null,
-    source: null,
-    soureDate: null,
-    sourceRanchId: null,
-    comment: null,
-    isDelete: null
-  },
-  rules: {
-  }
-})
-
-const { queryParams, form, rules } = toRefs(data)
-
-/** 查询羊只基本信息列表 */
-function getList() {
-  loading.value = true
-  console.log(queryParams.value)
-  listSheep_file(queryParams.value).then(response => {
-    sheep_fileList.value = response.rows
-    total.value = response.total
-    loading.value = false
-  })
-}
-
-// 取消按钮
-function cancel() {
-  open.value = false
-  reset()
-}
-
-// 表单重置
-function reset() {
-  form.value = {
-    id: null,
-    manageTags: null,
-    ranchId: null,
-    sheepfoldId: null,
-    electronicTags: null,
-    varietyId: null,
-    family: null,
-    typeId: null,
-    gender: null,
-    birthday: null,
-    birthWeight: null,
-    parity: null,
-    statusId: null,
-    weaningDate: null,
-    weaningWeight: null,
-    breedStatusId: null,
-    fatherId: null,
-    motherId: null,
-    receptorId: null,
-    matingDate: null,
-    matingTypeId: null,
-    pregDate: null,
-    lambingDate: null,
-    lambingDay: null,
-    expectedDate: null,
-    controlled: null,
-    matingCounts: null,
-    matingTotal: null,
-    miscarriageCounts: null,
-    body: null,
-    breast: null,
-    source: null,
-    soureDate: null,
-    sourceRanchId: null,
-    comment: null,
-    updateBy: null,
-    updateTime: null,
-    createBy: null,
-    createTime: null,
-    isDelete: null
-  }
-  proxy.resetForm("sheep_fileRef")
-}
-
-/** 搜索按钮操作 */
-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
-  getSheep_file(_id).then(response => {
-    form.value = response.data
-    open.value = true
-    title.value = "修改羊只基本信息"
-  })
-}
-
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["sheep_fileRef"].validate(valid => {
-    if (valid) {
-      if (form.value.id != null) {
-        updateSheep_file(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addSheep_file(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
-      }
-    }
-  })
-}
-
-/** 删除按钮操作 */
-function handleDelete(row) {
-  const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除羊只基本信息编号为"' + _ids + '"的数据项？').then(function() {
-    return delSheep_file(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
-}
-
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('sheep_file/sheep_file/export', {
-    ...queryParams.value
-  }, `sheep_file_${new Date().getTime()}.xlsx`)
-}
-
-getList()
-</script>

src/views/variety/variety/index.vue

@@ -0,0 +1,227 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="品种" prop="variety">
+        <el-input
+          v-model="queryParams.variety"
+          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="['variety:variety:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['variety:variety:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['variety:variety:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['variety:variety:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="varietyList" @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="品种" align="center" prop="variety" />
+      <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="['variety:variety:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['variety:variety: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="varietyRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="品种" prop="variety">
+          <el-input v-model="form.variety" 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="Variety">
+import { listVariety, getVariety, delVariety, addVariety, updateVariety } from "@/api/variety/variety"
+
+const { proxy } = getCurrentInstance()
+
+const varietyList = 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,
+    variety: null
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询羊只品种列表 */
+function getList() {
+  loading.value = true
+  listVariety(queryParams.value).then(response => {
+    varietyList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    variety: null
+  }
+  proxy.resetForm("varietyRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getVariety(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改羊只品种"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["varietyRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateVariety(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addVariety(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 delVariety(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('variety/variety/export', {
+    ...queryParams.value
+  }, `variety_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>

vite.config.js

@@ -1,5 +1,5 @@
-import { defineConfig, loadEnv } from 'vite'
 import path from 'path'
+import { defineConfig, loadEnv } from 'vite'
 import createVitePlugins from './vite/plugins'
 
 const baseUrl = 'http://localhost:8080' // 后端接口