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/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/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/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/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

@@ -1,23 +1,13 @@
+<!-- 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
+        <el-input v-model="queryParams.sheepId" placeholder="请输入耳号" clearable @keyup.enter="handleQuery" />
-          v-model="queryParams.sheepId"
-          placeholder="请输入羊只"
-          clearable
-          @keyup.enter="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="检疫日期" style="width: 308px">
-        <el-date-picker
+        <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          v-model="daterangeDatetime"
+          start-placeholder="开始日期" end-placeholder="结束日期" />
-          value-format="YYYY-MM-DD"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -27,44 +17,8 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="Plus" @click="openDialog()">新增</el-button>
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['bisosafety:quarantine:add']"
-        >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['bisosafety:quarantine:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['bisosafety:quarantine:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['bisosafety:quarantine:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="quarantineList" @selection-change="handleSelectionChange">
@@ -75,8 +29,7 @@
           <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="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" />
@@ -86,248 +39,77 @@
       <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"/>
+          <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"/>
+          <dict-tag :options="quar_status" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
+      <el-table-column label="操作" align="center" width="200">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['bisosafety:quarantine:edit']">检疫</el-button>
+          <el-button link type="primary" @click="openDialog(scope.row)">检疫</el-button>
-          <el-button link type="success" icon="Edit" @click="gotoTreatment(scope.row)" v-if="scope.row.result == 1">治疗</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['bisosafety:quarantine:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
 
-    <!-- 添加或修改检疫记录对话框 -->
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
-      <el-form ref="quarantineRef" :model="form" :rules="rules" label-width="80px">
+
-        <el-form-item label="羊只" prop="sheepId">
+    <!-- 弹窗组件 -->
-          <el-input v-model="form.sheepId" placeholder="请输入羊只" />
+    <add ref="dialogRef" @success="getList" />
-        </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="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-option>
-          </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>
-        <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="Quarantine">
+<script setup name="QuarantineList">
-import { listQuarantine, getQuarantine, delQuarantine, addQuarantine, updateQuarantine } from "@/api/biosafety/quarantine"
+import { listQuarantine } from '@/api/biosafety/quarantine'
-import { listItems } from "@/api/biosafety/items"
+import add from './add.vue'
-import { listSample } from "@/api/biosafety/sample"
-import { useRoute,useRouter } from "vue-router"
-const route = useRoute()
-const router = useRouter()
-
 const { proxy } = getCurrentInstance()
 const { quar_result, quar_status } = proxy.useDict('quar_result', 'quar_status')
 
+const dialogRef = ref()
 const quarantineList = 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({
+const queryParams = reactive({
-  form: {},
+  pageNum: 1,
-  queryParams: {
+  pageSize: 10,
-    pageNum: 1,
+  sheepId: null,
-    pageSize: 10,
+  params: {}
-    sheepId: null,
-    datetime: null,
-    quarItem: null,
-    sampleType: null,
-    sampler: null,
-    quarOfficer: null,
-    result: null,
-    status: null,
-  },
-  rules: {
-    sheepId: [
-      { required: true, message: "羊只不能为空", trigger: "blur" }
-    ],
-    quarItem: [
-      { required: true, message: "检疫项目不能为空", trigger: "change" }
-    ],
-    sampleType: [
-      { required: true, message: "样品类型不能为空", trigger: "change" }
-    ],
-  }
 })
 
-const { queryParams, form, rules } = toRefs(data)
-
-/** 查询检疫记录列表 */
 function getList() {
   loading.value = true
-  queryParams.value.params = {}
+  queryParams.params = {}
-  if (null != daterangeDatetime && '' != daterangeDatetime) {
+  if (daterangeDatetime.value && daterangeDatetime.value.length === 2) {
-    queryParams.value.params["beginDatetime"] = daterangeDatetime.value[0]
+    queryParams.params.beginDatetime = daterangeDatetime.value[0]
-    queryParams.value.params["endDatetime"] = daterangeDatetime.value[1]
+    queryParams.params.endDatetime = daterangeDatetime.value[1]
   }
-  listQuarantine(queryParams.value).then(response => {
+  listQuarantine(queryParams).then(res => {
-    quarantineList.value = response.rows
+    quarantineList.value = res.rows
-    total.value = response.total
+    total.value = res.total
     loading.value = false
   })
 }
 
-// 取消按钮
+function openDialog(row = null) {
-function cancel() {
+  dialogRef.value.open(row)
-  open.value = false
-  reset()
 }
 
-// 表单重置
-function reset() {
-  form.value = {
-    id: null,
-    sheepId: null,
-    datetime: null,
-    quarItem: null,
-    sampleType: null,
-    sampler: null,
-    quarOfficer: null,
-    result: null,
-    status: null,
-    updateBy: null,
-    updateTime: null,
-    createBy: null,
-    createTime: null
-  }
-  proxy.resetForm("quarantineRef")
-}
-
-/** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1
+  queryParams.pageNum = 1
   getList()
 }
 
-/** 重置按钮操作 */
 function resetQuery() {
+  proxy.resetForm('queryRef')
   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
-  getQuarantine(_id).then(response => {
-    form.value = response.data
-    open.value = true
-    title.value = "修改检疫记录"
-  })
-}
-
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["quarantineRef"].validate(valid => {
-    if (valid) {
-      if (form.value.id != null) {
-        updateQuarantine(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addQuarantine(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 delQuarantine(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
-}
-
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('bisosafety/quarantine/export', {
-    ...queryParams.value
-  }, `quarantine_${new Date().getTime()}.xlsx`)
-}
-
-function gotoTreatment(row) {
-  router.push({ path: 'biosafety/treatment/hanld', query: { qId: row.id,_mt: '治疗' } })
-}
-
-
 getList()
-</script>
+</script>

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/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

@@ -151,7 +151,13 @@
 </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')

src/views/dairyProducts/weightCorrection/index.vue

@@ -141,7 +141,7 @@
 </template>
 
 <script setup name="WeightCorrection">
-import { listWeightCorrection, getWeightCorrection, delWeightCorrection, addWeightCorrection, updateWeightCorrection } from "@/api/weightCorrection/weightCorrection"
+ import { listWeightCorrection, getWeightCorrection, delWeightCorrection, addWeightCorrection, updateWeightCorrection } from "@/api/dairyProducts/weightCorrection/weightCorrection.js"
 
 const { proxy } = getCurrentInstance()
 const { da_ranch } = proxy.useDict('da_ranch')

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>