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

src/api/Pregnancy_Test/Pregnancy_Test.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询孕检记录列表
+export function listPregnancy_Test(query) {
+  return request({
+    url: '/Pregnancy_Test/Pregnancy_Test/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询孕检记录详细
+export function getPregnancy_Test(id) {
+  return request({
+    url: '/Pregnancy_Test/Pregnancy_Test/' + id,
+    method: 'get'
+  })
+}
+
+// 新增孕检记录
+export function addPregnancy_Test(data) {
+  return request({
+    url: '/Pregnancy_Test/Pregnancy_Test',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改孕检记录
+export function updatePregnancy_Test(data) {
+  return request({
+    url: '/Pregnancy_Test/Pregnancy_Test',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除孕检记录
+export function delPregnancy_Test(id) {
+  return request({
+    url: '/Pregnancy_Test/Pregnancy_Test/' + id,
+    method: 'delete'
+  })
+}

src/api/biosafety/quarantine.js

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

src/api/dairyProducts/freshMilkTest/freshMilkTest.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 查询鲜奶生产，成品检验记录列表
+export function listFreshMilkTest(query) {
+  return request({
+    url: '/freshMilkTest/freshMilkTest/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询鲜奶生产，成品检验记录详细
+export function getFreshMilkTest(id) {
+  return request({
+    url: '/freshMilkTest/freshMilkTest/' + id,
+    method: 'get'
+  })
+}
+
+// 新增鲜奶生产，成品检验记录
+export function addFreshMilkTest(data) {
+  return request({
+    url: '/freshMilkTest/freshMilkTest',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改鲜奶生产，成品检验记录
+export function updateFreshMilkTest(data) {
+  return request({
+    url: '/freshMilkTest/freshMilkTest',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除鲜奶生产，成品检验记录
+export function delFreshMilkTest(id) {
+  return request({
+    url: '/freshMilkTest/freshMilkTest/' + id,
+    method: 'delete'
+  })
+}
+

src/api/dairyProducts/yogurtTest/yogurtTest.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询酸奶生产，成品检疫记录列表
+export function listYogurtTest(query) {
+  return request({
+    url: '/yogurtTest/yogurtTest/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询酸奶生产，成品检疫记录详细
+export function getYogurtTest(id) {
+  return request({
+    url: '/yogurtTest/yogurtTest/' + id,
+    method: 'get'
+  })
+}
+
+// 新增酸奶生产，成品检疫记录
+export function addYogurtTest(data) {
+  return request({
+    url: '/yogurtTest/yogurtTest',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改酸奶生产，成品检疫记录
+export function updateYogurtTest(data) {
+  return request({
+    url: '/yogurtTest/yogurtTest',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除酸奶生产，成品检疫记录
+export function delYogurtTest(id) {
+  return request({
+    url: '/yogurtTest/yogurtTest/' + id,
+    method: 'delete'
+  })
+}

src/api/drymilk/drymilk.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询干奶记录列表
+export function listDrymilk(query) {
+  return request({
+    url: '/drymilk/drymilk/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询干奶记录详细
+export function getDrymilk(id) {
+  return request({
+    url: '/drymilk/drymilk/' + id,
+    method: 'get'
+  })
+}
+
+// 根据耳号查询羊只ID
+export function getSheepIdByManageTags(manageTags) {
+  return request({
+    url: '/drymilk/drymilk/sheep/' + manageTags,
+    method: 'get'
+  })
+}
+
+// 新增干奶记录
+export function addDrymilk(data) {
+  return request({
+    url: '/drymilk/drymilk',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改干奶记录
+export function updateDrymilk(data) {
+  return request({
+    url: '/drymilk/drymilk',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除干奶记录
+export function delDrymilk(id) {
+  return request({
+    url: '/drymilk/drymilk/' + id,
+    method: 'delete'
+  })
+}

src/api/fileManagement/sheep_grouping.js

@@ -9,6 +9,16 @@ export function listSheep_grouping(query) {
   })
 }
 
+
+// 查询羊只分组关联列表（联表）
+export function listSheep_grouping_join(query) {
+  return request({
+    url: '/sheep_grouping/sheep_grouping/listJoin',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询羊只分组关联详细
 export function getSheep_grouping(id) {
   return request({
@@ -42,3 +52,12 @@ export function delSheep_grouping(id) {
     method: 'delete'
   })
 }
+
+// 根据耳号批量新增分组映射
+export function addByEarTags(data) {
+  return request({
+    url: '/sheep_grouping/sheep_grouping/addByEarTags',
+    method: 'post',
+    data
+  })
+}

src/api/mating_plan/generate.js

@@ -0,0 +1,85 @@
+import request from '@/utils/request'
+
+// 查询配种计划生成列表
+export function listBreedPlanGenerate(query) {
+    return request({
+        url: '/mating_plan/generate/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询配种计划生成详细
+export function getBreedPlanGenerate(id) {
+    return request({
+        url: '/mating_plan/generate/' + id,
+        method: 'get'
+    })
+}
+
+// 筛选符合条件的母羊
+export function selectEligibleEwe() {
+    return request({
+        url: '/mating_plan/generate/selectEwe',
+        method: 'get'
+    })
+}
+
+// 筛选符合条件的公羊
+export function selectEligibleRam() {
+    return request({
+        url: '/mating_plan/generate/selectRam',
+        method: 'get'
+    })
+}
+
+// 自动生成配种计划
+export function autoGenerateBreedPlan(data) {
+    return request({
+        url: '/mating_plan/generate/auto',
+        method: 'post',
+        data: data
+    })
+}
+
+// 新增配种计划生成
+export function addBreedPlanGenerate(data) {
+    return request({
+        url: '/mating_plan/generate',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改配种计划生成
+export function updateBreedPlanGenerate(data) {
+    return request({
+        url: '/mating_plan/generate',
+        method: 'put',
+        data: data
+    })
+}
+
+// 审批配种计划
+export function approveBreedPlan(id) {
+    return request({
+        url: '/mating_plan/generate/approve/' + id,
+        method: 'put'
+    })
+}
+
+// 查看配种计划详情
+export function viewBreedPlan(id) {
+    return request({
+        url: '/mating_plan/generate/view/' + id,
+        method: 'get'
+    })
+}
+
+// 删除配种计划生成
+export function delBreedPlanGenerate(id) {
+    return request({
+        url: '/mating_plan/generate/' + id,
+        method: 'delete'
+    })
+}

src/api/mating_plan/mating_plan.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询配种计划列表
+export function listMating_plan(query) {
+  return request({
+    url: '/mating_plan/mating_plan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询配种计划详细
+export function getMating_plan(id) {
+  return request({
+    url: '/mating_plan/mating_plan/' + id,
+    method: 'get'
+  })
+}
+
+// 新增配种计划
+export function addMating_plan(data) {
+  return request({
+    url: '/mating_plan/mating_plan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改配种计划
+export function updateMating_plan(data) {
+  return request({
+    url: '/mating_plan/mating_plan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除配种计划
+export function delMating_plan(id) {
+  return request({
+    url: '/mating_plan/mating_plan/' + id,
+    method: 'delete'
+  })
+}

src/views/Pregnancy_Test/Pregnancy_Test/index.vue

@@ -0,0 +1,294 @@
+<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="result">
+        <el-input
+          v-model="queryParams.result"
+          placeholder="请输入孕检结果"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="${comment}" prop="number">
+        <el-input
+          v-model="queryParams.number"
+          placeholder="请输入${comment}"
+          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="${comment}" prop="way">
+        <el-input
+          v-model="queryParams.way"
+          placeholder="请输入${comment}"
+          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="['Pregnancy_Test:Pregnancy_Test:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['Pregnancy_Test:Pregnancy_Test:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['Pregnancy_Test:Pregnancy_Test:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['Pregnancy_Test:Pregnancy_Test:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="Pregnancy_TestList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="孕检日期" align="center" prop="datetime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="孕检结果" align="center" prop="result" />
+      <el-table-column label="${comment}" align="center" prop="number" />
+      <el-table-column label="技术员" align="center" prop="technician" />
+      <el-table-column label="${comment}" align="center" prop="way" />
+      <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="['Pregnancy_Test:Pregnancy_Test:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['Pregnancy_Test:Pregnancy_Test: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="Pregnancy_TestRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="孕检日期" prop="datetime">
+          <el-date-picker clearable
+            v-model="form.datetime"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择孕检日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="孕检结果" prop="result">
+          <el-input v-model="form.result" placeholder="请输入孕检结果" />
+        </el-form-item>
+        <el-form-item label="${comment}" prop="number">
+          <el-input v-model="form.number" placeholder="请输入${comment}" />
+        </el-form-item>
+        <el-form-item label="技术员" prop="technician">
+          <el-input v-model="form.technician" placeholder="请输入技术员" />
+        </el-form-item>
+        <el-form-item label="${comment}" prop="way">
+          <el-input v-model="form.way" placeholder="请输入${comment}" />
+        </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="Pregnancy_Test">
+import { listPregnancy_Test, getPregnancy_Test, delPregnancy_Test, addPregnancy_Test, updatePregnancy_Test } from "@/api/Pregnancy_Test/Pregnancy_Test"
+
+const { proxy } = getCurrentInstance()
+
+const Pregnancy_TestList = 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,
+    result: null,
+    number: null,
+    technician: null,
+    way: null,
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询孕检记录列表 */
+function getList() {
+  loading.value = true
+  listPregnancy_Test(queryParams.value).then(response => {
+    Pregnancy_TestList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    datetime: null,
+    result: null,
+    number: null,
+    technician: null,
+    way: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("Pregnancy_TestRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getPregnancy_Test(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改孕检记录"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["Pregnancy_TestRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updatePregnancy_Test(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addPregnancy_Test(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 delPregnancy_Test(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('Pregnancy_Test/Pregnancy_Test/export', {
+    ...queryParams.value
+  }, `Pregnancy_Test_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>

src/views/biosafety/quarantine/index.vue

@@ -1,49 +1,42 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+    <!-- 查询表单 -->
+    <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
       <el-form-item label="羊只" prop="sheepId">
-        <el-input v-model="queryParams.sheepId" placeholder="请输入羊只" clearable @keyup.enter="handleQuery" />
+        <el-input v-model="queryParams.sheepId" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
       </el-form-item>
-      <el-form-item label="检疫日期" style="width: 308px">
+      <el-form-item label="检疫日期">
-        <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+        <el-date-picker v-model="daterangeDatetime" type="daterange" range-separator="-" start-placeholder="开始日期"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          end-placeholder="结束日期" value-format="YYYY-MM-DD" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="Search" @click="getList">搜索</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="['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 v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
+    <!-- 表格 -->
     <el-table v-loading="loading" :data="quarantineList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="羊只" align="center" prop="sheepNo" />
+      <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
-      <el-table-column label="检疫日期" align="center" prop="datetime" width="180">
+      <el-table-column label="检疫日期" align="center" prop="datetime" width="180"
-        <template #default="scope">
+        :formatter="(_, __, v) => parseTime(v, '{y}-{m}-{d}')" />
-          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+      <el-table-column label="羊只性别" align="center" prop="gender" >
-        </template>
+         <template #default="scope"><dict-tag :options="sheep_gender" :value="scope.row.gender" /></template>
       </el-table-column>
-      <el-table-column label="羊只性别" align="center" prop="gender" />
-
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
       <el-table-column label="月龄" align="center" prop="monthAge" />
       <el-table-column label="繁育状态" align="center" prop="breed" />
@@ -52,235 +45,442 @@
       <el-table-column label="采样员" align="center" prop="sampler" />
       <el-table-column label="检疫员" align="center" prop="quarOfficer" />
       <el-table-column label="检疫结果" align="center" prop="result">
-        <template #default="scope">
+        <template #default="scope"><dict-tag :options="quar_result" :value="scope.row.result" /></template>
-          <dict-tag :options="quar_result" :value="scope.row.result" />
-        </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
-        <template #default="scope">
+        <template #default="scope"><dict-tag :options="quar_status" :value="scope.row.status" /></template>
-          <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" prop="comment" />
+      <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="success" @click="gotoTreatment(scope.row)" v-if="scope.row.result == 1">治疗</el-button>
+          <el-button v-if="String(scope.row.result) === '1'" link type="success" @click="gotoTreatment(scope.row)">
+            治疗
+          </el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['bisosafety:quarantine:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      @pagination="getList" />
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
 
-    <!-- 添加或修改检疫记录对话框 -->
+    <!-- 新增弹窗 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog title="新增检疫记录" v-model="addOpen" width="700px" append-to-body>
-      <el-form ref="quarantineRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="addQuarantineRef" :model="addForm" :rules="addRules" label-width="100px">
-        <el-form-item label="羊只" prop="sheepId">
+        <el-form-item label="羊只耳号" prop="sheepIds" required>
-          <el-input v-model="form.sheepId" placeholder="请输入羊只" />
+          <el-input v-model="addForm.sheepIdInput" placeholder="输入耳号后回车验证" @keyup.enter="validateSheepId">
+            <template #suffix>
+              <div style="display: flex; align-items: center; height: 100%; margin-left: 8px;">
+                <span v-if="invalidSheepId" style="color: red; font-size: 12px;">耳号不存在</span>
+                <span v-else-if="validSheepId" style="color: green; font-size: 12px;">已添加</span>
+                <span v-else-if="alreadySelected" style="color: orange; font-size: 12px;">该羊只已选择</span>
+              </div>
+            </template>
+          </el-input>
+
+          <el-tag v-for="(id, i) in addForm.sheepIds" :key="i" closable @close="addForm.sheepIds.splice(i, 1)"
+            style="margin: 5px 5px 0 0">
+            {{ id }}
+          </el-tag>
         </el-form-item>
+
+        <el-row :gutter="20">
+          <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 v-model="addForm.datetime" type="date" value-format="YYYY-MM-DD" />
-          </el-date-picker>
             </el-form-item>
-        <el-form-item label="检疫结果" prop="result">
+          </el-col>
-          <el-select v-model="form.result" placeholder="请选择检疫结果">
+          <el-col :span="12">
-            <el-option v-for="dict in quar_result" :key="dict.value" :label="dict.label"
+            <el-form-item label="检疫项目" prop="quarItem">
-              :value="parseInt(dict.value)"></el-option>
+              <el-select v-model="addForm.quarItem" placeholder="请选择" filterable clearable>
+                <el-option v-for="i in quarantineItems" :key="i.value" :label="i.label" :value="i.value" />
               </el-select>
             </el-form-item>
-        <el-form-item label="状态" prop="status">
+          </el-col>
-          <el-radio-group v-model="form.status">
+        </el-row>
-            <el-radio v-for="dict in quar_status" :key="dict.value"
+
-              :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
+        <el-row :gutter="20">
-          </el-radio-group>
+          <el-col :span="12">
+            <el-form-item label="样品类型" prop="sampleType">
+              <el-select v-model="addForm.sampleType" placeholder="请选择" filterable clearable>
+                <el-option v-for="i in sampleTypes" :key="i.value" :label="i.label" :value="i.value" />
+              </el-select>
             </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="羊舍" prop="barnIds">
+              <el-select v-model="addForm.barnIds" multiple collapse-tags placeholder="可多选" @change="handleBarnChange">
+                <el-option v-for="b in barns" :key="b.value" :label="b.label" :value="b.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="采样员" prop="sampler"><el-input v-model="addForm.sampler" /></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检疫员" prop="quarOfficer"><el-input v-model="addForm.quarOfficer" /></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检疫结果" prop="result">
+              <el-select v-model="editForm.result" placeholder="检疫结果">
+                <el-option v-for="i in quar_result" :key="i.value" :label="i.label" :value="i.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="22">
+            <el-form-item label="备注" prop="comment">
+              <el-input type="textarea" :rows="3" resize="vertical" v-model="addForm.comment" placeholder="请输入备注信息"
+                maxlength="500" show-word-limit />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
+
       <template #footer>
-        <div class="dialog-footer">
+        <el-button type="primary" @click="submitAddForm">确 定</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="addOpen = false">取 消</el-button>
-          <el-button @click="cancel">取 消</el-button>
+      </template>
-        </div>
+    </el-dialog>
+
+    <el-dialog title="修改检疫记录" v-model="editOpen" width="560px" append-to-body :lock-scroll="false">
+
+      <!-- 2. 表单主体 -->
+      <el-form ref="editQuarantineRef" :model="editForm" :rules="editRules" label-width="72px" size="default">
+        <!-- 1. 羊只基本信息（只读） -->
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="羊只耳号">
+              <span>{{ editForm.sheepNo }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="羊只性别">
+              <dict-tag :options="sheep_gender" :value="editForm.gender" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="羊只类别">
+              <span>{{ editForm.sheepType }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="月龄">
+              <span>{{ editForm.monthAge }} </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="繁育状态">
+              <span>{{ editForm.breed }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="检疫日期">
+              <el-input :value="parseTime(editForm.datetime, '{y}-{m}-{d}')" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检疫项目">
+              <el-select v-model="editForm.quarItem" placeholder="请选择" filterable clearable>
+                <el-option v-for="i in quarantineItems" :key="i.value" :label="i.label" :value="i.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="样品类型">
+              <el-select v-model="editForm.sampleType" placeholder="请选择" filterable clearable>
+                <el-option v-for="i in sampleTypes" :key="i.value" :label="i.label" :value="i.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="采样员">
+              <el-input v-model="editForm.sampler" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="检疫员">
+              <el-input v-model="editForm.quarOfficer" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检疫结果" prop="result">
+              <el-select v-model="editForm.result" placeholder="请选择" clearable style="width: 100%">
+                <el-option v-for="i in quar_result" :key="i.value" :label="i.label" :value="i.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input type="textarea" v-model="editForm.remark" :rows="3" maxlength="200" show-word-limit />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <template #footer>
+        <el-button @click="editOpen = false">取 消</el-button>
+        <el-button type="primary" @click="submitEditForm">确 定</el-button>
       </template>
     </el-dialog>
   </div>
 </template>
 
 <script setup name="Quarantine">
-import { listQuarantine, getQuarantine, delQuarantine, addQuarantine, updateQuarantine } from "@/api/biosafety/quarantine"
+import { listQuarantine, getQuarantine, delQuarantine, addQuarantine, updateQuarantine } from '@/api/biosafety/quarantine'
-import { listItems } from "@/api/biosafety/items"
+import { listItems } from '@/api/biosafety/items'
-import { listSample } from "@/api/biosafety/sample"
+import { listSample } from '@/api/biosafety/sample'
-import { useRoute, useRouter } from "vue-router"
+import request from '@/utils/request'
-const route = useRoute()
+import { parseTime } from '@/utils/ruoyi'
-const router = useRouter()
+import { useRouter } from 'vue-router'
 
 const { proxy } = getCurrentInstance()
-const { quar_result, quar_status } = proxy.useDict('quar_result', 'quar_status')
+const { quar_result, quar_status,sheep_gender} = proxy.useDict('quar_result', 'quar_status',"sheep_gender")
+const router = useRouter()
 
-const quarantineList = ref([])
+/* 基础数据 */
-const open = ref(false)
 const loading = ref(true)
 const showSearch = ref(true)
+const total = ref(0)
+const quarantineList = ref([])
+const daterangeDatetime = ref([])
+
+/* 查询参数 */
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  sheepId: null
+})
+
+/* 多选 */
 const ids = ref([])
 const single = ref(true)
 const multiple = ref(true)
-const total = ref(0)
+function handleSelectionChange(sel) {
-const title = ref("")
+  ids.value = sel.map(s => s.id)
-const daterangeDatetime = ref([])
+  single.value = sel.length !== 1
+  multiple.value = !sel.length
+}
 
-const data = reactive({
+/* 下拉数据 */
-  form: {},
+const quarantineItems = ref([])
-  queryParams: {
+const sampleTypes = ref([])
-    pageNum: 1,
+const barns = ref([])
-    pageSize: 10,
-    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 getItems() {
+  listItems().then(res => quarantineItems.value = res.rows.map(i => ({ label: i.name, value: i.id })))
+}
+function getSample() {
+  listSample().then(res => sampleTypes.value = res.rows.map(i => ({ label: i.name, value: i.id })))
+}
+function getBarns() {
+  request.get('/sheepfold_management/sheepfold_management/list').then(res =>
+    barns.value = res.rows.map(b => ({ label: b.sheepfoldName, value: b.id }))
+  )
+}
 
-/** 查询检疫记录列表 */
+/* 列表查询 */
 function getList() {
   loading.value = true
-  queryParams.value.params = {}
+  queryParams.params = {}
-  if (null != daterangeDatetime && '' != daterangeDatetime) {
+  if (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 cancel() {
-  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
-  getList()
-}
-
-/** 重置按钮操作 */
 function resetQuery() {
   daterangeDatetime.value = []
-  proxy.resetForm("queryRef")
+  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()
+}
+
+/* 新增相关 */
+const addOpen = ref(false)
+const addForm = ref({})
+const addRules = {
+  sheepIds: [{ required: true, message: '请至少添加一个耳号', trigger: 'blur' }],
+  datetime: [{ required: true, message: '请选择日期', trigger: 'change' }],
+  quarItem: [{ required: true, message: '请选择项目', trigger: 'change' }],
+  sampleType: [{ required: true, message: '请选择样品类型', trigger: 'change' }]
+}
+
+const invalidSheepId = ref(false)
+const validSheepId = ref(false)
+const alreadySelected = ref(false)
+
+const barnSheepMap = reactive({})
+
+function handleBarnChange(selectedBarnIds) {
+  const oldBarnIds = Object.keys(barnSheepMap).map(Number)
+  const newBarnIds = selectedBarnIds || []
+
+  // 移除旧羊舍的耳号和ID
+  oldBarnIds.forEach(barnId => {
+    if (!newBarnIds.includes(barnId)) {
+      const { tags = [], ids = [] } = barnSheepMap[barnId] || {}
+      tags.forEach(tag => {
+        const index = addForm.value.sheepIds.indexOf(tag)
+        if (index !== -1) addForm.value.sheepIds.splice(index, 1)
       })
+      ids.forEach(id => {
+        const index = addForm.value.ids.indexOf(id)
+        if (index !== -1) addForm.value.ids.splice(index, 1)
+      })
+      delete barnSheepMap[barnId]
+    }
+  })
+
+  // 添加新羊舍的耳号和ID
+  newBarnIds.forEach(barnId => {
+    if (!barnSheepMap[barnId]) {
+      request.get('/sheepfold_management/sheepfold_management/getSheepById', { params: { id: barnId } })
+        .then(res => {
+          const sheepList = res.data || []
+          const tags = sheepList.map(s => s.manageTags)
+          const ids = sheepList.map(s => s.id)
+
+          barnSheepMap[barnId] = { tags, ids }
+
+          tags.forEach(tag => {
+            if (tag && !addForm.value.sheepIds.includes(tag)) {
+              addForm.value.sheepIds.push(tag)
+            }
+          })
+
+          ids.forEach(id => {
+            if (id && !addForm.value.ids.includes(id)) {
+              addForm.value.ids.push(id)
+            }
+          })
+        })
+    }
+  })
+}
+
+function validateSheepId() {
+  const id = addForm.value.sheepIdInput.trim()
+  if (!id) return
+
+  invalidSheepId.value = false
+  validSheepId.value = false
+  alreadySelected.value = false
+
+  if (addForm.value.sheepIds.includes(id)) {
+    alreadySelected.value = true
+    addForm.value.sheepIdInput = ''
+    return
+  }
+
+  request.get(`/sheep/sheep/byManageTags/${id}`).then(res => {
+    if (res.data) {
+      addForm.value.sheepIds.push(id)
+      validSheepId.value = true
     } else {
-        addQuarantine(form.value).then(response => {
+      invalidSheepId.value = true
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
-      }
     }
+    addForm.value.sheepIdInput = ''
   })
 }
 
-/** 删除按钮操作 */
+function submitAddForm() {
+
+    addQuarantine(addForm.value).then(() => {
+      proxy.$modal.msgSuccess('新增成功')
+      addOpen.value = false
+      getList()
+    })
+
+}
+
+function handleAdd() {
+  Object.assign(addForm.value, {
+    sheepIds: [],
+    ids:[],
+    sheepIdInput: '',
+    datetime: new Date().toISOString().slice(0, 10),
+    quarItems: '',
+    sampleType: '',
+    sampler: '',
+    quarOfficer: '',
+    result: '',}
+  )
+  Object.keys(barnSheepMap).forEach(k => delete barnSheepMap[k])
+  invalidSheepId.value = false
+  validSheepId.value = false
+  alreadySelected.value = false
+  addOpen.value = true
+}
+
+/* 修改相关 */
+const editOpen = ref(false)
+const editForm = ref({})
+const editRules = {
+  status: [{ required: true, message: '请选择状态', trigger: 'change' }],
+  quarantineType: [{ required: true, message: '请选择类型', trigger: 'change' }]
+}
+const editQuarantineRef = ref(null)
+function handleUpdate(row) {
+  Object.assign(editForm.value, row)  
+  editOpen.value = true
+}
+
+function submitEditForm() {
+  editQuarantineRef.value.validate(valid => {
+    if (!valid) return
+    updateQuarantine(editForm.value).then(() => {
+      proxy.$modal.msgSuccess('修改成功')
+      editOpen.value = false
+      getList()
+    })
+  })
+}
+
+/* 删除 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除检疫记录编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm(`是否确认删除记录编号为"${_ids}"的数据？`)
-    return delQuarantine(_ids)
+    .then(() => delQuarantine(_ids))
-  }).then(() => {
+    .then(() => {
       getList()
-    proxy.$modal.msgSuccess("删除成功")
+      proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => { })
+    })
 }
 
-/** 导出按钮操作 */
+/* 导出 */
 function handleExport() {
-  proxy.download('bisosafety/quarantine/export', {
+  proxy.download('bisosafety/quarantine/export', queryParams, `quarantine_${Date.now()}.xlsx`)
-    ...queryParams.value
-  }, `quarantine_${new Date().getTime()}.xlsx`)
 }
 
+/* 跳转治疗 */
 function gotoTreatment(row) {
-  router.push({ path: '/biosafety/treatment/add', query: { qId: row.id,sId:row.sheepId } })
+  router.push({ path: '/biosafety/treatment/add', query: { qId: row.id, sId: row.sheepId } })
 }
 
-
+/* 初始化 */
 getList()
+getItems()
+getSample()
+getBarns()
 </script>

src/views/biosafety/treatment/add.vue

@@ -29,7 +29,7 @@
               <el-row :gutter="20">
                 <el-col :span="8">
                   <div class="info-item">
-                    <strong>羊只类别：</strong>{{ sheepInfo.name || '–' }}
+                    <strong>羊只类别：</strong>{{ sheepInfo.sheepType || '–' }}
                   </div>
                 </el-col>
                 <el-col :span="8">
@@ -52,12 +52,12 @@
                 </el-col>
                 <el-col :span="8">
                   <div class="info-item">
-                    <strong>怀孕天数：</strong>{{ sheepInfo.gestationDay ?? '–' }} &nbsp;天
+                    <strong>怀孕天数：</strong>{{ sheepInfo.gestDay ?? '–' }} &nbsp;天
                   </div>
                 </el-col>
                 <el-col :span="8">
                   <div class="info-item">
-                    <strong>泌乳天数：</strong>{{ sheepInfo.lactationDay ?? '–' }} &nbsp;天
+                    <strong>泌乳天数：</strong>{{ sheepInfo.lactDay ?? '–' }} &nbsp;天
                   </div>
                 </el-col>
               </el-row>
@@ -67,8 +67,8 @@
               class="treatment-form">
               <el-row :gutter="20">
                 <el-col :span="12">
-                  <el-form-item label="事件日期" prop="eventDate">
+                  <el-form-item label="事件日期" prop="datetime">
-                    <el-date-picker v-model="form.eventDate" type="date" placeholder="选择日期" style="width:100%" />
+                    <el-date-picker v-model="form.datetime" type="date" placeholder="选择日期" style="width:100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -218,12 +218,12 @@ const sheepInfo = ref({
   sheepNo: null,
   gender: '',
   variety: '',
-  name: '',
+  sheepType: '',
   monthAge: null,
   parity: null,
   breed: '',
-  lactationDay: null,
+  lactDay: null,
-  gestationDay: null
+  gestDay: null
 })
 
 const units = ref([])   // 单位下拉选项
@@ -265,12 +265,12 @@ function getSheepInfo() {
       sheepNo: data.bsManageTags,
       gender: data.gender,
       variety: data.variety,
-      name: data.name,
+      sheepType: data.name,
       monthAge: data.monthAge,
       parity: data.parity,
       breed: data.breed,
-      lactationDay: data.lactationDay,
+      lactDay: data.lactationDay,
-      gestationDay: data.gestationDay,
+      gestDay: data.gestationDay,
     }
   })
 }
@@ -332,7 +332,7 @@ function handleDiseaseTypeChange(parentId) {
 
 const form = reactive({
   eventType: '诊疗',
-  eventDate: new Date(), // 默认今天
+  datetime: new Date(), // 默认今天
   diseaseParentId: null, // 疾病大类
   diseaseSubtype: null,  // 疾病子类型
   veterinarian: '',
@@ -374,7 +374,7 @@ function submitForm() {
   const submitData = {
     ...sheepInfo.value,
     ...form,
-    eventDate: form.eventDate ? new Date(form.eventDate).getTime() : null,
+    datetime: form.datetime ? new Date(form.datetime).getTime() : null,
     usageDetails: swPresDetailList.value.map(item => ({
       mediId: item.mediId,
       dosage: item.dosage,

src/views/biosafety/treatment/index.vue

@@ -1,31 +1,16 @@
 <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-form-item label="羊只耳号" prop="sheepNo">
-        <el-input
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
-          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 label="兽医" prop="veterinary">
-        <el-input
+        <el-input v-model="queryParams.veterinary" placeholder="请输入兽医" clearable />
-          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>
@@ -33,55 +18,33 @@
       </el-form-item>
     </el-form>
 
+    <!-- 按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</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
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate">修改</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
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</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
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</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>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </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="sheepNo" />
       <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="gender">
+        <template #default="scope"><dict-tag :options="sheep_gender" :value="scope.row.gender" /></template>
+      </el-table-column>
       <el-table-column label="胎次" align="center" prop="parity" />
       <el-table-column label="繁殖状态" align="center" prop="breed" />
       <el-table-column label="泌乳天数" align="center" prop="lactDay" />
@@ -91,241 +54,610 @@
           <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="diseaseName" />
-      <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">
+      <el-table-column label="操作" align="center" width="180">
         <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="Edit" @click="handleUpdate(scope.row)">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['treatment:treatment:remove']">删除</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-show="total>0"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
-      :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-dialog title="添加治疗记录" v-model="addDialog" width="65%" top="5vh" append-to-body destroy-on-close>
-      <el-form ref="treatmentRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="addFormRef" :model="addForm" :rules="rules" label-width="140px" size="large">
-        <el-form-item label="羊只耳号" prop="sheepId">
+        <el-row :gutter="20">
-          <el-input v-model="form.sheepId" placeholder="请输入羊只耳号" />
+          <el-col :span="24">
+            <el-form-item label="羊只耳号" required>
+              <el-input v-model="sheepInput" placeholder="输入耳号后按回车验证" style="width: 300px"
+                @keyup.enter="validateSheep" />
             </el-form-item>
-        <el-form-item label="品种" prop="variety">
+          </el-col>
-          <el-input v-model="form.variety" placeholder="请输入品种" />
+          <el-col :span="24">
+            <div style="margin-bottom: 10px;margin-left: 60px;">
+              <el-tag v-for="(item, index) in selectedSheepList" :key="item.sheepNo" closable
+                @close="removeSheep(index)" style="margin-right: 10px">
+                {{ item.sheepNo }}（{{ item.barnName }}）
+              </el-tag>
+            </div>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="事件日期" prop="datetime">
+              <el-date-picker v-model="addForm.datetime" type="date" style="width: 100%" />
             </el-form-item>
-        <el-form-item label="月龄" prop="monthAge">
+          </el-col>
-          <el-input v-model="form.monthAge" placeholder="请输入月龄" />
+          <el-col :span="12">
+            <el-form-item label="处方">
+              <el-select v-model="selectedPresId" filterable clearable placeholder="请选择处方" style="width: 100%"
+                @change="handleSelectPrescription">
+                <el-option v-for="item in presOptions" :key="item.id" :label="item.label" :value="item.id" />
+              </el-select>
             </el-form-item>
-        <el-form-item label="性别" prop="gender">
+          </el-col>
-          <el-input v-model="form.gender" placeholder="请输入性别" />
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="疾病大类" prop="diseasePid">
+              <el-select v-model="addForm.diseasePid" placeholder="请选择" style="width: 100%"
+                @change="handleDiseaseTypeChange">
+                <el-option v-for="item in parentDiseaseOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
-        <el-form-item label="胎次" prop="parity">
+          </el-col>
-          <el-input v-model="form.parity" placeholder="请输入胎次" />
+          <el-col :span="12">
+            <el-form-item label="疾病子类型" prop="diseaseId">
+              <el-select v-model="addForm.diseaseId" :disabled="!addForm.diseasePid" placeholder="请选择"
+                style="width: 100%">
+                <el-option v-for="item in childDiseaseOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
-        <el-form-item label="繁殖状态" prop="breed">
+          </el-col>
-          <el-input v-model="form.breed" placeholder="请输入繁殖状态" />
+        </el-row>
+
+        <el-divider content-position="left">治疗记录</el-divider>
+        <div class="mb20">
+          <el-button type="primary" icon="Plus" @click="handleAddSwPresDetail">添加药品</el-button>
+        </div>
+
+        <el-table :data="swPresDetailList" border stripe>
+          <el-table-column label="序号" width="60">
+            <template #default="scope">{{ scope.$index + 1 }}</template>
+          </el-table-column>
+          <el-table-column label="药品">
+            <template #default="scope">
+              <el-select v-model="scope.row.mediId" filterable placeholder="请选择药品">
+                <el-option v-for="m in medicines" :key="m.value" :label="m.label" :value="m.value" />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="用量">
+            <template #default="scope">
+              <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" />
+            </template>
+          </el-table-column>
+          <el-table-column label="单位">
+            <template #default="scope">
+              <el-select v-model="scope.row.unit" placeholder="单位">
+                <el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value" />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="使用方法">
+            <template #default="scope">
+              <el-select v-model="scope.row.usageId" placeholder="用法">
+                <el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value" />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="生产厂家">
+            <template #default="scope">
+              <el-input v-model="scope.row.manufacturer" placeholder="生产厂家" />
+            </template>
+          </el-table-column>
+          <el-table-column label="生产批号">
+            <template #default="scope">
+              <el-input v-model="scope.row.batchNumber" placeholder="批号" />
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="60">
+            <template #default="scope">
+              <el-button link type="danger" icon="Delete" @click="deletePresDetail(scope.row)" />
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-row :gutter="20" style="margin-top:20px;">
+          <el-col :span="12">
+            <el-form-item label="兽医">
+              <el-input v-model="addForm.veterinarian" placeholder="请输入兽医姓名" />
             </el-form-item>
-        <el-form-item label="泌乳天数" prop="lactDay">
+          </el-col>
-          <el-input v-model="form.lactDay" placeholder="请输入泌乳天数" />
+        </el-row>
-        </el-form-item>
+
-        <el-form-item label="怀孕天数" prop="gestDay">
+        <el-form-item label="备注">
-          <el-input v-model="form.gestDay" placeholder="请输入怀孕天数" />
+          <el-input type="textarea" :rows="3" v-model="addForm.comment" 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="addDialog = false">取 消</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitAddForm">确 定</el-button>
         </div>
       </template>
     </el-dialog>
+
+    <!-- 修改弹窗 -->
+    <el-dialog title="修改治疗记录" v-model="editDialog" width="70%" top="5vh" append-to-body destroy-on-close>
+      <el-form ref="editFormRef" :model="editForm" :rules="rules" label-width="140px" size="large">
+        <!-- 羊只基本信息展示（只读） -->
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="羊只耳号:">
+              <el-text>{{ editForm.sheepNo }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="羊只性别:">
+              <el-text>{{ editForm.gender }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="品种:">
+              <el-text>{{ editForm.variety }}</el-text>
+            </el-form-item>
+          </el-col> 
+          <el-col :span="6">
+            <el-form-item label="羊只类别:">
+              <el-text>{{ editForm.sheepType }}</el-text>
+            </el-form-item>
+          </el-col>          
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="月龄">
+              <el-text>{{ editForm.monthAge }}</el-text>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="胎次">
+              <el-text>{{ editForm.parity }}</el-text>
+            </el-form-item>
+          </el-col>
+           <el-col :span="6">
+            <el-form-item label="繁殖状态">
+              <el-text>{{ editForm.breed }}</el-text>
+            </el-form-item>
+          </el-col>
+           <el-col :span="6">
+            <el-form-item label="泌乳天数">
+              <el-text>{{ editForm.lactDay }}天</el-text>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="怀孕天数">
+              <el-text>{{ editForm.gestDay }}天</el-text>
+            </el-form-item>
+          </el-col>          
+        </el-row>
+
+        <!-- 可编辑内容 -->
+        <el-divider content-position="left">治疗记录</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="治疗日期" prop="datetime">
+              <el-date-picker v-model="editForm.datetime" type="date" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="处方">
+              <el-select v-model="selectedPresId" filterable clearable placeholder="请选择处方" style="width: 100%"
+                @change="handleSelectPrescription">
+                <el-option v-for="item in presOptions" :key="item.id" :label="item.label" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="疾病大类" prop="diseasePid">
+              <el-select v-model="editForm.diseasePid" placeholder="请选择" style="width: 100%"
+                @change="handleDiseaseTypeChange">
+                <el-option v-for="item in parentDiseaseOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="疾病子类型" prop="diseaseId">
+              <el-select v-model="editForm.diseaseId" :disabled="!editForm.diseasePid" placeholder="请选择"
+                style="width: 100%">
+                <el-option v-for="item in childDiseaseOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="mb20">
+          <el-button type="primary" icon="Plus" @click="handleAddSwPresDetail">添加药品</el-button>
+        </div>
+
+        <el-table :data="swPresDetailList" border stripe>
+          <el-table-column label="序号" width="60">
+            <template #default="scope">{{ scope.$index + 1 }}</template>
+          </el-table-column>
+          <el-table-column label="药品">
+            <template #default="scope">
+              <el-select v-model="scope.row.mediId" filterable placeholder="请选择药品">
+                <el-option v-for="m in medicines" :key="m.value" :label="m.label" :value="m.value" />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="用量">
+            <template #default="scope">
+              <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" />
+            </template>
+          </el-table-column>
+          <el-table-column label="单位">
+            <template #default="scope">
+              <el-select v-model="scope.row.unit" placeholder="单位">
+                <el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value" />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="使用方法">
+            <template #default="scope">
+              <el-select v-model="scope.row.usageId" placeholder="用法">
+                <el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value" />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="生产厂家">
+            <template #default="scope">
+              <el-input v-model="scope.row.manufacturer" placeholder="生产厂家" />
+            </template>
+          </el-table-column>
+          <el-table-column label="生产批号">
+            <template #default="scope">
+              <el-input v-model="scope.row.batchNumber" placeholder="批号" />
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="60">
+            <template #default="scope">
+              <el-button link type="danger" icon="Delete" @click="deletePresDetail(scope.row)" />
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-row :gutter="20" style="margin-top:20px;">
+          <el-col :span="12">
+            <el-form-item label="兽医">
+              <el-input v-model="editForm.veterinarian" placeholder="请输入兽医姓名" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-form-item label="备注">
+          <el-input type="textarea" :rows="3" v-model="editForm.comment" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="editDialog = false">取 消</el-button>
+          <el-button type="primary" @click="submitEditForm">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
   </div>
 </template>
 
-<script setup name="Treatment">
+<script setup>
-import { listTreatment, getTreatment, delTreatment, addTreatment, updateTreatment } from "@/api/biosafety/treatment"
+import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
+import { listTreatment, getTreatment, delTreatment, addTreatment, updateTreatment } from '@/api/biosafety/treatment'
+import { listDisease } from '@/api/biosafety/disease'
+import { listPrescription, getPrescription } from '@/api/biosafety/prescription'
+import { listUnit } from '@/api/biosafety/unit'
+import { listUsage } from '@/api/biosafety/usage'
+import { listMedicine } from '@/api/biosafety/medicine'
+import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance()
+const { sheep_gender } = proxy.useDict("sheep_gender")
 
+/* ---------- 列表区域 ---------- */
 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({
+const queryParams = reactive({
-  form: {},
-  queryParams: {
   pageNum: 1,
   pageSize: 10,
-    sheepId: null,
+  sheepNo: null,
-    datetime: null,
+  veterinary: null
-    diseaseId: null,
-    veterinary: null,
-  },
-  rules: {
-  }
 })
 
-const { queryParams, form, rules } = toRefs(data)
+/* ---------- 弹窗控制 ---------- */
+const addDialog = ref(false)
+const editDialog = ref(false)
 
-/** 查询治疗记录列表 */
+/* ---------- 表单与数据 ---------- */
+const sheepInput = ref('')
+const selectedSheepList = ref([])
+
+const selectedPresId = ref()
+const presOptions = ref([])
+const parentDiseaseOptions = ref([])
+const childDiseaseOptions = ref([])
+const units = ref([])
+const usages = ref([])
+const medicines = ref([])
+
+const addForm = reactive({
+  id: null,
+  eventType: '诊疗',
+  datetime: new Date(),
+  diseasePid: null,
+  diseaseId: null,
+  veterinarian: '',
+  comment: ''
+})
+
+const editForm = reactive({
+  id: null,
+  eventType: '诊疗',
+  datetime: new Date(),
+  diseasePid: null,
+  diseaseId: null,
+  veterinarian: '',
+  comment: '',
+  sheepNo: '',
+  barnName: '',
+  variety: '',
+  sheepType: '',
+  monthAge: '',
+  gender: '',
+  parity: '',
+  breed: '',
+  lactDay: '',
+  gestDay: ''
+})
+
+const rules = {
+  datetime: [{ required: true, message: '请选择日期', trigger: 'change' }],
+  diseasePid: [{ required: true, message: '请选择疾病大类', trigger: 'change' }],
+  diseaseId: [{ required: true, message: '请选择疾病子类型', trigger: 'change' }]
+}
+
+const swPresDetailList = ref([
+  { mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: '', batchNumber: '' }
+])
+
+/* ---------- 列表查询 ---------- */
 function getList() {
   loading.value = true
-  queryParams.value.params = {}
+  const qp = { ...queryParams }
-  if (null != daterangeDatetime && '' != daterangeDatetime) {
+  qp.params = {}
-    queryParams.value.params["beginDatetime"] = daterangeDatetime.value[0]
+  if (daterangeDatetime.value && daterangeDatetime.value.length) {
-    queryParams.value.params["endDatetime"] = daterangeDatetime.value[1]
+    qp.params.beginDatetime = daterangeDatetime.value[0]
+    qp.params.endDatetime = daterangeDatetime.value[1]
   }
-  listTreatment(queryParams.value).then(response => {
+  listTreatment(qp).then(res => {
-    treatmentList.value = response.rows
+    treatmentList.value = res.rows
-    total.value = response.total
+    total.value = res.total
     loading.value = false
   })
 }
 
-// 取消按钮
+/* ---------- 疾病联动 ---------- */
-function cancel() {
+function handleDiseaseTypeChange(pid) {
-  open.value = false
+  if (!pid) {
-  reset()
+    childDiseaseOptions.value = []
-}
+    addForm.diseaseId = null
-
+    editForm.diseaseId = null
-// 表单重置
+    return
-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")
+  listDisease({ pid }).then(res => (childDiseaseOptions.value = res.data))
 }
 
-/** 搜索按钮操作 */
+/* ---------- 处方联动 ---------- */
-function handleQuery() {
+function handleSelectPrescription(id) {
-  queryParams.value.pageNum = 1
+  if (!id) return
+  getPrescription(id).then(res => {
+    swPresDetailList.value = res.data.swPresDetailList?.map(i => ({
+      mediId: i.mediId,
+      dosage: i.dosage,
+      unit: i.unitId,
+      usageId: i.usageId,
+      manufacturer: '',
+      batchNumber: ''
+    })) || []
+  })
+}
+
+/* ---------- 药品明细 ---------- */
+function handleAddSwPresDetail() {
+  swPresDetailList.value.push({ mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: '', batchNumber: '' })
+}
+function deletePresDetail(row) {
+  swPresDetailList.value.splice(swPresDetailList.value.indexOf(row), 1)
+}
+
+/* ---------- 羊只验证 ---------- */
+function validateSheep() {
+  const no = sheepInput.value.trim()
+  if (!no) return
+  request.get(`/sheep_file/sheep_file/byNo/${no}`).then(res => {
+    if (!res.data) {
+      proxy.$modal.msgError('羊只耳号不存在'); return
+    }
+    if (selectedSheepList.value.some(s => s.sheepNo === no)) {
+      proxy.$modal.msgWarning('该羊只已添加'); return
+    }
+    selectedSheepList.value.push({
+      sheepNo: res.data.bsManageTags,
+      sheepId: res.data.id,
+      barnName: res.data.sheepfoldName
+    })
+    sheepInput.value = ''
+  })
+}
+function removeSheep(index) {
+  selectedSheepList.value.splice(index, 1)
+}
+
+/* ---------- 新增 ---------- */
+function handleAdd() {
+  resetForm(addForm)
+  addDialog.value = true
+}
+function submitAddForm() {
+  proxy.$refs.addFormRef.validate(valid => {
+    if (!valid) return
+    if (!selectedSheepList.value.length) {
+      proxy.$modal.msgError('请至少添加一只羊'); return
+    }
+    const data = {
+      ...addForm,
+      datetime: addForm.datetime ? new Date(addForm.datetime).getTime() : null,
+      usageDetails: swPresDetailList.value,
+      sheepIds: selectedSheepList.value.map(s => s.sheepId)
+    }
+    addTreatment(data).then(() => {
+      proxy.$modal.msgSuccess('新增成功')
+      addDialog.value = false
       getList()
+    })
+  })
 }
 
-/** 重置按钮操作 */
+/* ---------- 修改 ---------- */
+function handleUpdate(row) {
+  resetForm(editForm)
+  getTreatment(row.id).then(res => {
+    Object.assign(editForm, {
+      id: res.data.id,
+      datetime: res.data.datetime ? new Date(res.data.datetime) : new Date(),
+      diseasePid: res.data.diseasePid,
+      diseaseId: res.data.diseaseId,
+      usageId: res.data.usageId,
+      veterinarian: res.data.veterinarian,
+      comment: res.data.comment,
+      sheepNo: res.data.sheepNo,
+      barnName: res.data.sheepfoldName,
+      variety: res.data.variety,
+      sheepType: res.data.sheepType,
+      monthAge: res.data.monthAge,
+      gender: res.data.gender,
+      parity: res.data.parity,
+      breed: res.data.breed,
+      lactDay: res.data.lactDay,
+      gestDay: res.data.gestDay
+    })
+    swPresDetailList.value = res.data.usageDetails || []
+    selectedPresId.value = res.data.prescriptionId || null
+    if (editForm.diseasePid) handleDiseaseTypeChange(editForm.diseasePid)
+    editDialog.value = true
+  })
+}
+function submitEditForm() {
+  proxy.$refs.editFormRef.validate(valid => {
+    if (!valid) return
+    const data = {
+      ...editForm,
+      datetime: editForm.datetime ? new Date(editForm.datetime).getTime() : null,
+      usageDetails: swPresDetailList.value
+    }
+    updateTreatment(data).then(() => {
+      proxy.$modal.msgSuccess('修改成功')
+      editDialog.value = false
+      getList()
+    })
+  })
+}
+
+/* ---------- 通用 ---------- */
 function resetQuery() {
   daterangeDatetime.value = []
-  proxy.resetForm("queryRef")
+  proxy.resetForm('queryRef')
   handleQuery()
 }
-
+function handleQuery() {
-// 多选框选中数据
+  queryParams.pageNum = 1
+  getList()
+}
+function handleDelete(row) {
+  const id = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除治疗记录编号为"' + id + '"的数据项？')
+    .then(() => delTreatment(id))
+    .then(() => { getList(); proxy.$modal.msgSuccess('删除成功') })
+}
+function handleExport() {
+  proxy.download('treatment/treatment/export', { ...queryParams }, `treatment_${Date.now()}.xlsx`)
+}
+function resetForm(formObj) {
+  Object.assign(formObj, {
+    id: null,
+    datetime: new Date(),
+    diseasePid: null,
+    diseaseId: null,
+    veterinarian: '',
+    comment: '',
+    sheepNo: '',
+    barnName: '',
+    variety: '',
+    sheepType: '',
+    monthAge: '',
+    gender: '',
+    parity: '',
+    breed: '',
+    lactDay: '',
+    gestDay: ''
+  })
+  selectedPresId.value = null
+  swPresDetailList.value = [{ mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: '', batchNumber: '' }]
+}
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.id)
-  single.value = selection.length != 1
+  single.value = selection.length !== 1
   multiple.value = !selection.length
 }
 
-/** 新增按钮操作 */
+/* ---------- 初始化 ---------- */
-function handleAdd() {
+onMounted(() => {
-  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()
+  listDisease().then(res => {
+    parentDiseaseOptions.value = res.data.filter(item => item.pid === 0)
   })
-      } else {
+  listPrescription({ status: 1, persType: 4 }).then(res => {
-        addTreatment(form.value).then(response => {
+    presOptions.value = res.rows.map(item => ({ id: item.id, label: item.name }))
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
   })
-      }
+  listUnit().then(res => {
-    }
+    units.value = res.rows.map(item => ({ value: item.id, label: item.name }))
   })
-}
+  listUsage().then(res => {
-
+    usages.value = res.rows.map(item => ({ value: item.id, label: item.name }))
-/** 删除按钮操作 */
+  })
-function handleDelete(row) {
+  listMedicine().then(res => {
-  const _ids = row.id || ids.value
+    medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
-  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/dairyProducts/freshMilkTest/freshMilkTest/index.vue

@@ -0,0 +1,577 @@
+<template>
+  <div class="app-container">
+    <!-- 简化查询表单 -->
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="来源" prop="source">
+        <el-input
+          v-model="queryParams.source"
+          placeholder="请输入来源"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="检测日期" prop="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>
+        <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="['freshMilkTest:freshMilkTest:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['freshMilkTest:freshMilkTest:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['freshMilkTest:freshMilkTest:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['freshMilkTest:freshMilkTest:export']"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Operation"
+          @click="columnShowDialogVisible = true"
+        >列显示</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 表格显示，使用列选择功能 -->
+    <el-table v-loading="loading" :data="freshMilkTestList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column 
+        label="来源" 
+        align="center" 
+        prop="source" 
+        v-if="selectedColumns.includes('source')" />
+      <el-table-column 
+        label="检测日期" 
+        align="center" 
+        prop="datetime" 
+        width="180"
+        v-if="selectedColumns.includes('datetime')">
+        <template #default="scope">
+          <span>{{ formatDate(scope.row.datetime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column 
+        label="脂肪g/100g" 
+        align="center" 
+        prop="fat" 
+        v-if="selectedColumns.includes('fat')" />
+      <el-table-column 
+        label="蛋白质g/100g" 
+        align="center" 
+        prop="protein" 
+        v-if="selectedColumns.includes('protein')" />
+      <el-table-column 
+        label="非脂g/100g" 
+        align="center" 
+        prop="nonFat" 
+        v-if="selectedColumns.includes('nonFat')" />
+      <el-table-column 
+        label="酸度oT" 
+        align="center" 
+        prop="acidity" 
+        v-if="selectedColumns.includes('acidity')" />
+      <el-table-column 
+        label="菌落总数1" 
+        align="center" 
+        prop="bacterialColony1" 
+        v-if="selectedColumns.includes('bacterialColony1')" />
+      <el-table-column 
+        label="菌落总数2" 
+        align="center" 
+        prop="bacterialColony2" 
+        v-if="selectedColumns.includes('bacterialColony2')" />
+      <el-table-column 
+        label="菌落总数3" 
+        align="center" 
+        prop="bacterialColony3" 
+        v-if="selectedColumns.includes('bacterialColony3')" />
+      <el-table-column 
+        label="菌落总数4" 
+        align="center" 
+        prop="bacterialColony4" 
+        v-if="selectedColumns.includes('bacterialColony4')" />
+      <el-table-column 
+        label="菌落总数5" 
+        align="center" 
+        prop="bacterialColony5" 
+        v-if="selectedColumns.includes('bacterialColony5')" />
+      <el-table-column 
+        label="大肠菌群(CFU/ml)" 
+        align="center" 
+        prop="coli" 
+        v-if="selectedColumns.includes('coli')" />
+      <el-table-column 
+        label="乳铁蛋白(mg/L)" 
+        align="center" 
+        prop="lactoferrin" 
+        v-if="selectedColumns.includes('lactoferrin')" />
+      <el-table-column 
+        label="免疫球蛋白(mg/L)" 
+        align="center" 
+        prop="ig" 
+        v-if="selectedColumns.includes('ig')" />
+      <el-table-column 
+        label="备注" 
+        align="center" 
+        prop="commnet" 
+        v-if="selectedColumns.includes('commnet')" />
+      <el-table-column 
+        label="创建人" 
+        align="center" 
+        prop="createBy" 
+        v-if="selectedColumns.includes('createBy')" />
+      <el-table-column 
+        label="创建时间" 
+        align="center" 
+        prop="createTime" 
+        width="180"
+        v-if="selectedColumns.includes('createTime')">
+        <template #default="scope">
+          <span>{{ formatDateTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['freshMilkTest:freshMilkTest:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['freshMilkTest:freshMilkTest: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="freshMilkTestRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="来源" prop="source">
+          <el-input v-model="form.source" 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="请选择检测日期"
+            style="width: 100%">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="脂肪g/100g" prop="fat">
+          <el-input v-model="form.fat" placeholder="请输入脂肪g/100g" />
+        </el-form-item>
+        <el-form-item label="蛋白质g/100g" prop="protein">
+          <el-input v-model="form.protein" placeholder="请输入蛋白质g/100g" />
+        </el-form-item>
+        <el-form-item label="非脂g/100g" prop="nonFat">
+          <el-input v-model="form.nonFat" placeholder="请输入非脂g/100g" />
+        </el-form-item>
+        <el-form-item label="酸度oT" prop="acidity">
+          <el-input v-model="form.acidity" placeholder="请输入酸度oT" />
+        </el-form-item>
+        <el-form-item label="菌落总数1" prop="bacterialColony1">
+          <el-input v-model="form.bacterialColony1" placeholder="请输入菌落总数1" />
+        </el-form-item>
+        <el-form-item label="菌落总数2" prop="bacterialColony2">
+          <el-input v-model="form.bacterialColony2" placeholder="请输入菌落总数2" />
+        </el-form-item>
+        <el-form-item label="菌落总数3" prop="bacterialColony3">
+          <el-input v-model="form.bacterialColony3" placeholder="请输入菌落总数3" />
+        </el-form-item>
+        <el-form-item label="菌落总数4" prop="bacterialColony4">
+          <el-input v-model="form.bacterialColony4" placeholder="请输入菌落总数4" />
+        </el-form-item>
+        <el-form-item label="菌落总数5" prop="bacterialColony5">
+          <el-input v-model="form.bacterialColony5" placeholder="请输入菌落总数5" />
+        </el-form-item>
+        <el-form-item label="大肠菌群(CFU/ml)" prop="coli">
+          <el-input v-model="form.coli" placeholder="请输入大肠菌群(CFU/ml)" />
+        </el-form-item>
+        <el-form-item label="乳铁蛋白(mg/L)" prop="lactoferrin">
+          <el-input v-model="form.lactoferrin" placeholder="请输入乳铁蛋白(mg/L)" />
+        </el-form-item>
+        <el-form-item label="免疫球蛋白(mg/L)" prop="ig">
+          <el-input v-model="form.ig" placeholder="请输入免疫球蛋白(mg/L)" />
+        </el-form-item>
+        <el-form-item label="备注" prop="commnet">
+          <el-input v-model="form.commnet" placeholder="请输入备注" type="textarea" />
+        </el-form-item>
+        <el-form-item label="创建人" v-if="form.id">
+          <el-input v-model="form.createBy" disabled />
+        </el-form-item>
+        <el-form-item label="创建时间" v-if="form.id">
+          <el-input v-model="form.createTime" disabled />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 列显示设置对话框 -->
+    <el-dialog title="列显示设置" v-model="columnShowDialogVisible" width="500px">
+      <el-checkbox-group v-model="selectedColumns">
+        <el-checkbox label="source">来源</el-checkbox>
+        <el-checkbox label="datetime">检测日期</el-checkbox>
+        <el-checkbox label="fat">脂肪g/100g</el-checkbox>
+        <el-checkbox label="protein">蛋白质g/100g</el-checkbox>
+        <el-checkbox label="nonFat">非脂g/100g</el-checkbox>
+        <el-checkbox label="acidity">酸度oT</el-checkbox>
+        <el-checkbox label="bacterialColony1">菌落总数1</el-checkbox>
+        <el-checkbox label="bacterialColony2">菌落总数2</el-checkbox>
+        <el-checkbox label="bacterialColony3">菌落总数3</el-checkbox>
+        <el-checkbox label="bacterialColony4">菌落总数4</el-checkbox>
+        <el-checkbox label="bacterialColony5">菌落总数5</el-checkbox>
+        <el-checkbox label="coli">大肠菌群(CFU/ml)</el-checkbox>
+        <el-checkbox label="lactoferrin">乳铁蛋白(mg/L)</el-checkbox>
+        <el-checkbox label="ig">免疫球蛋白(mg/L)</el-checkbox>
+        <el-checkbox label="commnet">备注</el-checkbox>
+        <el-checkbox label="createBy">创建人</el-checkbox>
+        <el-checkbox label="createTime">创建时间</el-checkbox>
+      </el-checkbox-group>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="columnShowDialogVisible = false">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { listFreshMilkTest, getFreshMilkTest, delFreshMilkTest, addFreshMilkTest, updateFreshMilkTest } from "@/api/dairyProducts/freshMilkTest/freshMilkTest.js";
+import { ElMessage, ElMessageBox } from 'element-plus';
+
+const freshMilkTestList = 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 columnShowDialogVisible = ref(false);
+const freshMilkTestRef = ref(null);
+
+// 默认显示的列
+const selectedColumns = ref([
+  'source', 'datetime', 'fat', 'protein', 'nonFat', 'acidity', 
+  'bacterialColony1', 'bacterialColony2', 'bacterialColony3', 
+  'bacterialColony4', 'bacterialColony5', 'coli', 'lactoferrin', 
+  'ig', 'commnet', 'createBy', 'createTime'
+]);
+
+// 查询参数
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  source: null,
+  datetime: null,
+});
+
+// 表单数据
+const form = reactive({
+  id: null,
+  source: null,
+  datetime: null,
+  fat: null,
+  protein: null,
+  nonFat: null,
+  acidity: null,
+  bacterialColony1: null,
+  bacterialColony2: null,
+  bacterialColony3: null,
+  bacterialColony4: null,
+  bacterialColony5: null,
+  coli: null,
+  lactoferrin: null,
+  ig: null,
+  commnet: null,
+  createBy: null,
+  createTime: null
+});
+
+// 验证规则
+const rules = reactive({
+  source: [
+    { required: true, message: "来源不能为空", trigger: "blur" }
+  ],
+  datetime: [
+    { required: true, message: "检测日期不能为空", trigger: "blur" }
+  ]
+});
+
+/** 获取当前用户名 */
+const getCurrentUsername = () => {
+  const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
+  return userInfo.userName || userInfo.username || userInfo.nickName || 'admin'
+}
+
+/** 查询列表 */
+function getList() {
+  loading.value = true;
+  listFreshMilkTest(queryParams).then(response => {
+    freshMilkTestList.value = response.rows || [];
+    total.value = response.total || 0;
+    loading.value = false;
+  }).catch(error => {
+    console.error("获取数据失败:", error);
+    loading.value = false;
+    ElMessage.error("获取数据失败");
+  });
+}
+
+// 日期格式化函数
+function formatDate(dateString) {
+  if (!dateString) return '';
+  try {
+    const date = new Date(dateString);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
+  } catch (e) {
+    console.error("日期格式化错误:", e);
+    return dateString;
+  }
+}
+
+// 日期时间格式化
+function formatDateTime(dateString) {
+  if (!dateString) return '';
+  try {
+    const date = new Date(dateString);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    const seconds = String(date.getSeconds()).padStart(2, '0');
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+  } catch (e) {
+    console.error("日期时间格式化错误:", e);
+    return dateString;
+  }
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  resetForm();
+}
+
+// 表单重置
+function resetForm() {
+  Object.assign(form, {
+    id: null,
+    source: null,
+    datetime: null,
+    fat: null,
+    protein: null,
+    nonFat: null,
+    acidity: null,
+    bacterialColony1: null,
+    bacterialColony2: null,
+    bacterialColony3: null,
+    bacterialColony4: null,
+    bacterialColony5: null,
+    coli: null,
+    lactoferrin: null,
+    ig: null,
+    commnet: null,
+    createBy: null,
+    createTime: null
+  });
+  
+  if (freshMilkTestRef.value) {
+    freshMilkTestRef.value.resetFields();
+  }
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  Object.assign(queryParams, {
+    source: null,
+    datetime: null,
+  });
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length !== 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  resetForm();
+  open.value = true;
+  title.value = "添加鲜奶检验记录";
+  
+  // 设置创建人和创建时间
+  form.createBy = getCurrentUsername();
+  form.createTime = new Date().toISOString().replace('T', ' ').substring(0, 19);
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  resetForm();
+  const id = row.id || (ids.value.length ? ids.value[0] : null);
+  if (!id) {
+    ElMessage.error("请选择要修改的数据");
+    return;
+  }
+  
+  getFreshMilkTest(id).then(response => {
+    Object.assign(form, response.data);
+    open.value = true;
+    title.value = "修改鲜奶检验记录";
+  }).catch(error => {
+    console.error("获取详情失败:", error);
+    ElMessage.error("获取详情失败");
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  freshMilkTestRef.value.validate(valid => {
+    if (valid) {
+      const submitData = { ...form };
+      if (!submitData.id) {
+        submitData.createBy = getCurrentUsername();
+        submitData.createTime = new Date().toISOString().replace('T', ' ').substring(0, 19);
+      } else {
+        delete submitData.createBy;
+        delete submitData.createTime;
+      }
+      
+      const request = submitData.id 
+        ? updateFreshMilkTest(submitData) 
+        : addFreshMilkTest(submitData);
+      
+      request.then(response => {
+        ElMessage.success(submitData.id ? "修改成功" : "新增成功");
+        open.value = false;
+        getList();
+      }).catch(error => {
+        console.error("操作失败:", error);
+        ElMessage.error("操作失败");
+      });
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const deleteIds = row.id ? [row.id] : ids.value;
+  if (!deleteIds.length) {
+    ElMessage.error("请选择要删除的数据");
+    return;
+  }
+  
+  ElMessageBox.confirm('是否确认删除选中的记录？', '警告', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    return delFreshMilkTest(deleteIds);
+  }).then(() => {
+    getList();
+    ElMessage.success("删除成功");
+  }).catch(error => {
+    console.error("删除失败:", error);
+    if (error !== 'cancel') {
+      ElMessage.error("删除失败");
+    }
+  });
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  const params = new URLSearchParams();
+  for (const key in queryParams) {
+    if (queryParams[key] !== null && queryParams[key] !== undefined) {
+      params.append(key, queryParams[key]);
+    }
+  }
+  
+  const url = `/freshMilkTest/freshMilkTest/export?${params.toString()}`;
+  window.location.href = url;
+}
+
+// 初始化加载
+onMounted(() => {
+  getList();
+});
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+.el-form-item {
+  margin-bottom: 15px;
+}
+.el-dialog__body {
+  padding: 15px 20px;
+}
+</style>

src/views/dairyProducts/yogurtTest/yogurtTest/index.vue

@@ -0,0 +1,575 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="来源" prop="source">
+        <el-input
+          v-model="queryParams.source"
+          placeholder="请输入来源"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="检测日期" prop="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>
+        <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="['yogurtTest:yogurtTest:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['yogurtTest:yogurtTest:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['yogurtTest:yogurtTest:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['yogurtTest:yogurtTest:export']"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Operation"
+          @click="columnShowDialogVisible = true"
+        >列显示</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="yogurtTestList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column 
+        label="来源" 
+        align="center" 
+        prop="source" 
+        v-if="selectedColumns.includes('source')" />
+      <el-table-column 
+        label="检测日期" 
+        align="center" 
+        prop="datetime" 
+        width="180"
+        v-if="selectedColumns.includes('datetime')">
+        <template #default="scope">
+          <span>{{ formatDate(scope.row.datetime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column 
+        label="脂肪g/100g" 
+        align="center" 
+        prop="fat" 
+        v-if="selectedColumns.includes('fat')" />
+      <el-table-column 
+        label="蛋白质g/100g" 
+        align="center" 
+        prop="protein" 
+        v-if="selectedColumns.includes('protein')" />
+      <el-table-column 
+        label="非脂g/100g" 
+        align="center" 
+        prop="nonFat" 
+        v-if="selectedColumns.includes('nonFat')" />
+      <el-table-column 
+        label="酸度oT" 
+        align="center" 
+        prop="acidity" 
+        v-if="selectedColumns.includes('acidity')" />
+      <el-table-column 
+        label="菌落总数1" 
+        align="center" 
+        prop="bacterialColony1" 
+        v-if="selectedColumns.includes('bacterialColony1')" />
+      <el-table-column 
+        label="菌落总数2" 
+        align="center" 
+        prop="bacterialClony2" 
+        v-if="selectedColumns.includes('bacterialClony2')" />
+      <el-table-column 
+        label="菌落总数3" 
+        align="center" 
+        prop="bacterialClony3" 
+        v-if="selectedColumns.includes('bacterialClony3')" />
+      <el-table-column 
+        label="菌落总数4" 
+        align="center" 
+        prop="bacterialClony4" 
+        v-if="selectedColumns.includes('bacterialClony4')" />
+      <el-table-column 
+        label="菌落总数5" 
+        align="center" 
+        prop="bacterialClony5" 
+        v-if="selectedColumns.includes('bacterialClony5')" />
+      <el-table-column 
+        label="酵母菌(CFU/g)" 
+        align="center" 
+        prop="yeast" 
+        v-if="selectedColumns.includes('yeast')" />
+      <el-table-column 
+        label="霉菌(CFU/g)" 
+        align="center" 
+        prop="mould" 
+        v-if="selectedColumns.includes('mould')" />
+      <el-table-column 
+        label="乳酸菌(CFU/g)" 
+        align="center" 
+        prop="lacto" 
+        v-if="selectedColumns.includes('lacto')" />
+      <el-table-column 
+        label="备注" 
+        align="center" 
+        prop="comment" 
+        v-if="selectedColumns.includes('comment')" />
+      <el-table-column 
+        label="创建人" 
+        align="center" 
+        prop="createBy" 
+        v-if="selectedColumns.includes('createBy')" />
+      <el-table-column 
+        label="创建时间" 
+        align="center" 
+        prop="createTime" 
+        width="180"
+        v-if="selectedColumns.includes('createTime')">
+        <template #default="scope">
+          <span>{{ formatDateTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['yogurtTest:yogurtTest:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['yogurtTest:yogurtTest: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="yogurtTestRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="来源" prop="source">
+          <el-input v-model="form.source" 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="请选择检测日期"
+            style="width: 100%">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="脂肪g/100g" prop="fat">
+          <el-input v-model="form.fat" placeholder="请输入脂肪g/100g" />
+        </el-form-item>
+        <el-form-item label="蛋白质g/100g" prop="protein">
+          <el-input v-model="form.protein" placeholder="请输入蛋白质g/100g" />
+        </el-form-item>
+        <el-form-item label="非脂g/100g" prop="nonFat">
+          <el-input v-model="form.nonFat" placeholder="请输入非脂g/100g" />
+        </el-form-item>
+        <el-form-item label="酸度oT" prop="acidity">
+          <el-input v-model="form.acidity" placeholder="请输入酸度oT" />
+        </el-form-item>
+        <el-form-item label="菌落总数1" prop="bacterialColony1">
+          <el-input v-model="form.bacterialColony1" placeholder="请输入菌落总数1" />
+        </el-form-item>
+        <el-form-item label="菌落总数2" prop="bacterialClony2">
+          <el-input v-model="form.bacterialClony2" placeholder="请输入菌落总数2" />
+        </el-form-item>
+        <el-form-item label="菌落总数3" prop="bacterialClony3">
+          <el-input v-model="form.bacterialClony3" placeholder="请输入菌落总数3" />
+        </el-form-item>
+        <el-form-item label="菌落总数4" prop="bacterialClony4">
+          <el-input v-model="form.bacterialClony4" placeholder="请输入菌落总数4" />
+        </el-form-item>
+        <el-form-item label="菌落总数5" prop="bacterialClony5">
+          <el-input v-model="form.bacterialClony5" placeholder="请输入菌落总数5" />
+        </el-form-item>
+        <el-form-item label="酵母菌(CFU/g)" prop="yeast">
+          <el-input v-model="form.yeast" placeholder="请输入酵母菌(CFU/g)" />
+        </el-form-item>
+        <el-form-item label="霉菌(CFU/g)" prop="mould">
+          <el-input v-model="form.mould" placeholder="请输入霉菌(CFU/g)" />
+        </el-form-item>
+        <el-form-item label="乳酸菌(CFU/g)" prop="lacto">
+          <el-input v-model="form.lacto" placeholder="请输入乳酸菌(CFU/g)" />
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" placeholder="请输入备注" type="textarea" />
+        </el-form-item>
+        <el-form-item label="创建人" v-if="form.id">
+          <el-input v-model="form.createBy" disabled />
+        </el-form-item>
+        <el-form-item label="创建时间" v-if="form.id">
+          <el-input v-model="form.createTime" disabled />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog title="列显示设置" v-model="columnShowDialogVisible" width="500px">
+      <el-checkbox-group v-model="selectedColumns">
+        <el-checkbox label="source">来源</el-checkbox>
+        <el-checkbox label="datetime">检测日期</el-checkbox>
+        <el-checkbox label="fat">脂肪g/100g</el-checkbox>
+        <el-checkbox label="protein">蛋白质g/100g</el-checkbox>
+        <el-checkbox label="nonFat">非脂g/100g</el-checkbox>
+        <el-checkbox label="acidity">酸度oT</el-checkbox>
+        <el-checkbox label="bacterialColony1">菌落总数1</el-checkbox>
+        <el-checkbox label="bacterialClony2">菌落总数2</el-checkbox>
+        <el-checkbox label="bacterialClony3">菌落总数3</el-checkbox>
+        <el-checkbox label="bacterialClony4">菌落总数4</el-checkbox>
+        <el-checkbox label="bacterialClony5">菌落总数5</el-checkbox>
+        <el-checkbox label="yeast">酵母菌(CFU/g)</el-checkbox>
+        <el-checkbox label="mould">霉菌(CFU/g)</el-checkbox>
+        <el-checkbox label="lacto">乳酸菌(CFU/g)</el-checkbox>
+        <el-checkbox label="comment">备注</el-checkbox>
+        <el-checkbox label="createBy">创建人</el-checkbox>
+        <el-checkbox label="createTime">创建时间</el-checkbox>
+      </el-checkbox-group>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="columnShowDialogVisible = false">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { listYogurtTest, getYogurtTest, delYogurtTest, addYogurtTest, updateYogurtTest } from "@/api/dairyProducts/yogurtTest/yogurtTest.js";
+import { ElMessage, ElMessageBox } from 'element-plus';
+
+// 响应式数据
+const yogurtTestList = 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 columnShowDialogVisible = ref(false);
+const yogurtTestRef = ref(null);
+
+// 默认显示的列
+const selectedColumns = ref([
+  'source', 'datetime', 'fat', 'protein', 'nonFat', 'acidity', 
+  'bacterialColony1', 'bacterialClony2', 'bacterialClony3', 
+  'bacterialClony4', 'bacterialClony5', 'yeast', 'mould', 
+  'lacto', 'comment', 'createBy', 'createTime'
+]);
+
+// 查询参数
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  source: null,
+  datetime: null,
+});
+
+// 表单数据
+const form = reactive({
+  id: null,
+  source: null,
+  datetime: null,
+  fat: null,
+  protein: null,
+  nonFat: null,
+  acidity: null,
+  bacterialColony1: null,
+  bacterialClony2: null,
+  bacterialClony3: null,
+  bacterialClony4: null,
+  bacterialClony5: null,
+  yeast: null,
+  mould: null,
+  lacto: null,
+  comment: null,
+  createBy: null,
+  createTime: null
+});
+
+// 验证规则
+const rules = reactive({
+  source: [
+    { required: true, message: "来源不能为空", trigger: "blur" }
+  ],
+  datetime: [
+    { required: true, message: "检测日期不能为空", trigger: "blur" }
+  ]
+});
+
+/** 获取当前用户名 */
+const getCurrentUsername = () => {
+  const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
+  return userInfo.userName || userInfo.username || userInfo.nickName || 'admin'
+}
+
+/** 查询列表 */
+function getList() {
+  loading.value = true;
+  listYogurtTest(queryParams).then(response => {
+    yogurtTestList.value = response.rows || [];
+    total.value = response.total || 0;
+    loading.value = false;
+  }).catch(error => {
+    console.error("获取数据失败:", error);
+    loading.value = false;
+    ElMessage.error("获取数据失败");
+  });
+}
+
+// 日期格式化函数
+function formatDate(dateString) {
+  if (!dateString) return '';
+  try {
+    const date = new Date(dateString);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
+  } catch (e) {
+    console.error("日期格式化错误:", e);
+    return dateString;
+  }
+}
+
+// 日期时间格式化
+function formatDateTime(dateString) {
+  if (!dateString) return '';
+  try {
+    const date = new Date(dateString);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    const seconds = String(date.getSeconds()).padStart(2, '0');
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+  } catch (e) {
+    console.error("日期时间格式化错误:", e);
+    return dateString;
+  }
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  resetForm();
+}
+
+// 表单重置
+function resetForm() {
+  Object.assign(form, {
+    id: null,
+    source: null,
+    datetime: null,
+    fat: null,
+    protein: null,
+    nonFat: null,
+    acidity: null,
+    bacterialColony1: null,
+    bacterialClony2: null,
+    bacterialClony3: null,
+    bacterialClony4: null,
+    bacterialClony5: null,
+    yeast: null,
+    mould: null,
+    lacto: null,
+    comment: null,
+    createBy: null,
+    createTime: null
+  });
+  
+  if (yogurtTestRef.value) {
+    yogurtTestRef.value.resetFields();
+  }
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  Object.assign(queryParams, {
+    source: null,
+    datetime: null,
+  });
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length !== 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  resetForm();
+  open.value = true;
+  title.value = "添加酸奶检疫记录";
+  
+  // 设置创建人和创建时间
+  form.createBy = getCurrentUsername();
+  form.createTime = new Date().toISOString().replace('T', ' ').substring(0, 19);
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  resetForm();
+  const id = row.id || (ids.value.length ? ids.value[0] : null);
+  if (!id) {
+    ElMessage.error("请选择要修改的数据");
+    return;
+  }
+  
+  getYogurtTest(id).then(response => {
+    Object.assign(form, response.data);
+    open.value = true;
+    title.value = "修改酸奶检疫记录";
+  }).catch(error => {
+    console.error("获取详情失败:", error);
+    ElMessage.error("获取详情失败");
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  yogurtTestRef.value.validate(valid => {
+    if (valid) {
+      // 如果是新增，保留创建信息；如果是修改，不更新创建信息
+      const submitData = { ...form };
+      if (!submitData.id) {
+        submitData.createBy = getCurrentUsername();
+        submitData.createTime = new Date().toISOString().replace('T', ' ').substring(0, 19);
+      } else {
+        delete submitData.createBy;
+        delete submitData.createTime;
+      }
+      
+      const request = submitData.id 
+        ? updateYogurtTest(submitData) 
+        : addYogurtTest(submitData);
+      
+      request.then(response => {
+        ElMessage.success(submitData.id ? "修改成功" : "新增成功");
+        open.value = false;
+        getList();
+      }).catch(error => {
+        console.error("操作失败:", error);
+        ElMessage.error("操作失败");
+      });
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const deleteIds = row.id ? [row.id] : ids.value;
+  if (!deleteIds.length) {
+    ElMessage.error("请选择要删除的数据");
+    return;
+  }
+  
+  ElMessageBox.confirm('是否确认删除选中的记录？', '警告', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    return delYogurtTest(deleteIds);
+  }).then(() => {
+    getList();
+    ElMessage.success("删除成功");
+  }).catch(error => {
+    console.error("删除失败:", error);
+    if (error !== 'cancel') {
+      ElMessage.error("删除失败");
+    }
+  });
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  const params = new URLSearchParams();
+  for (const key in queryParams) {
+    if (queryParams[key] !== null && queryParams[key] !== undefined) {
+      params.append(key, queryParams[key]);
+    }
+  }
+  
+  const url = `/yogurtTest/yogurtTest/export?${params.toString()}`;
+  window.location.href = url;
+}
+
+// 初始化加载
+onMounted(() => {
+  getList();
+});
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+.el-form-item {
+  margin-bottom: 15px;
+}
+.el-dialog__body {
+  padding: 15px 20px;
+}
+</style>

src/views/drymilk/drymilk/index.vue

@@ -0,0 +1,330 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="耳号" prop="manageTags">
+        <el-input
+            v-model="queryParams.manageTags"
+            placeholder="请输入耳号"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="品种" prop="variety">
+        <el-input
+            v-model="queryParams.variety"
+            placeholder="请输入品种"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="干奶日期" prop="datetime">
+        <el-date-picker clearable
+                        v-model="queryParams.datetime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择干奶日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="技术员" prop="tecahnician">
+        <el-input
+            v-model="queryParams.tecahnician"
+            placeholder="请输入技术员"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="createBy">
+        <el-input
+            v-model="queryParams.createBy"
+            placeholder="请输入创建人"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker clearable
+                        v-model="queryParams.createTime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+            type="primary"
+            plain
+            icon="Plus"
+            @click="handleAdd"
+            v-hasPermi="['drymilk:drymilk:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['drymilk:drymilk:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['drymilk:drymilk:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['drymilk:drymilk:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="drymilkList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="耳号" align="center" prop="manageTags" />
+      <el-table-column label="品种" align="center" prop="variety" />
+      <el-table-column label="事件类型" align="center" prop="eventType" />
+      <el-table-column label="干奶日期" align="center" prop="datetime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否使用乳头封闭剂" align="center" prop="status">
+        <template #default="scope">
+          <span>{{ scope.row.status === 1 ? '是' : '否' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="转入羊舍" align="center" prop="sheepfoldName" />
+      <el-table-column label="技术员" align="center" prop="tecahnician" />
+      <el-table-column label="创建日期" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="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="['drymilk:drymilk:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['drymilk:drymilk: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="drymilkRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="耳号" prop="manageTags">
+          <el-input v-model="form.manageTags" 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="status">
+          <el-radio-group v-model="form.status">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="转入羊舍id" prop="sheepfold">
+          <el-input v-model="form.sheepfold" placeholder="请输入转入羊舍id" />
+        </el-form-item>
+        <el-form-item label="技术员" prop="tecahnician">
+          <el-input v-model="form.tecahnician" placeholder="请输入技术员" />
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Drymilk">
+import { listDrymilk, getDrymilk, delDrymilk, addDrymilk, updateDrymilk } from "@/api/drymilk/drymilk"
+
+const { proxy } = getCurrentInstance()
+
+const drymilkList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref("")
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    manageTags: null,
+    variety: null,
+    datetime: null,
+    status: null,
+    sheepfold: null,
+    tecahnician: null,
+    createBy: null,
+    createTime: null
+  },
+  rules: {
+    manageTags: [
+      { required: true, message: "耳号不能为空", trigger: "blur" }
+    ],
+    datetime: [
+      { required: true, message: "干奶日期不能为空", trigger: "blur" }
+    ],
+    status: [
+      { required: true, message: "请选择是否使用乳头封闭剂", trigger: "change" }
+    ]
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询干奶记录列表 */
+function getList() {
+  loading.value = true
+  listDrymilk(queryParams.value).then(response => {
+    drymilkList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    manageTags: null,
+    datetime: null,
+    status: null,
+    sheepfold: null,
+    tecahnician: null,
+    comment: null
+  }
+  proxy.resetForm("drymilkRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getDrymilk(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改干奶记录"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["drymilkRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateDrymilk(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addDrymilk(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 delDrymilk(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('drymilk/drymilk/export', {
+    ...queryParams.value
+  }, `drymilk_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>

src/views/fileManagement/sheep_file/index.vue

@@ -318,6 +318,9 @@
         <template #header>
           <span style="font-weight: bold; color: #333;">羊只状态</span>
         </template>
+        <template #default="scope">
+          <dict-tag :options="sheep_status" :value="scope.row.statusId"/>
+        </template>
       </el-table-column>
       <el-table-column
         v-if="columns['weaningWeight'].visible"
@@ -561,6 +564,9 @@
         <template #header>
           <span style="font-weight: bold; color: #333;">配种类型</span>
         </template>
+        <template #default="scope">
+          <dict-tag :options="breed_type" :value="scope.row.matingTypeId"/>
+        </template>
       </el-table-column>
       <el-table-column
         v-if="columns['pregDate'].visible"
@@ -745,6 +751,9 @@
         <template #header>
           <span style="font-weight: bold; color: #333;">是否性控</span>
         </template>
+        <template #default="scope">
+          <dict-tag :options="controlled" :value="scope.row.controlled"/>
+        </template>
       </el-table-column>
       <el-table-column
         v-if="columns['body'].visible"
@@ -781,6 +790,9 @@
         <template #header>
           <span style="font-weight: bold; color: #333;">入群来源</span>
         </template>
+        <template #default="scope">
+          <dict-tag :options="source" :value="scope.row.source"/>
+        </template>
       </el-table-column>
       <el-table-column
         v-if="columns['sourceDate'].visible"
@@ -987,6 +999,10 @@ import { listSheep_file, getSheep_file } from "@/api/fileManagement/sheep_file"
 
 const { proxy } = getCurrentInstance()
 const { sheep_gender } = proxy.useDict('sheep_gender')
+const { breed_type } = proxy.useDict('breed_type')
+const { controlled } = proxy.useDict('controlled')
+const { source } = proxy.useDict('source')
+const { sheep_status } = proxy.useDict('sheep_status')
 const sheep_fileList = ref([])
 const open = ref(false)
 const loading = ref(true)

src/views/fileManagement/sheep_grouping/index.vue

@@ -1,13 +1,21 @@
 <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-form-item label="羊只ID" prop="sheepId">
         <el-input
           v-model="queryParams.sheepId"
           placeholder="请输入羊只ID"
           clearable
           @keyup.enter="handleQuery"
         />
+      </el-form-item> -->
+      <el-form-item label="耳号" prop="bsManageTags">
+        <el-input
+          v-model="queryParams.bsManageTags"
+          placeholder="请输入耳号"
+          clearable
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="分组" prop="groupId">
         <el-select
@@ -73,15 +81,33 @@
     </el-row>
 
     <el-table v-loading="loading" :data="sheep_groupingList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <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="id" sortable/> -->
-      <el-table-column label="羊只ID" align="center" prop="sheepId" />
+      <!-- <el-table-column label="羊只ID" align="center" prop="sheep_id" sortable/>
-      <el-table-column label="分组ID" align="center" prop="groupId" />
+      <el-table-column label="分组ID" align="center" prop="group_id" sortable/> -->
-      <el-table-column label="分组名称" align="center" prop="groupName">
+      <el-table-column label="分组名称" align="center" prop="groupName" sortable>
         <template #default="scope">
-          {{ getGroupName(scope.row.groupId) }}
+          {{ getGroupName(scope.row.group_id) }}
         </template>
-</el-table-column>
+      </el-table-column>
+      <el-table-column label="耳号" align="center" prop="bs_manage_tags" sortable/>
+      <el-table-column label="品种" align="center" prop="variety" sortable/>
+      <el-table-column label="性别" align="center" prop="gender" sortable>
+        <template #default="scope">
+          <dict-tag :options="sheep_gender" :value="scope.row.gender"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="羊只类型" align="center" prop="name" sortable/>
+      <el-table-column label="出生日期" align="center" prop="birthday" sortable/>
+      <el-table-column label="胎次" align="center" prop="parity" sortable/>
+      <el-table-column label="月龄" align="center" prop="month_age" sortable/>
+      <el-table-column label="繁殖状态" align="center" prop="breed" sortable/> 
+      <el-table-column label="出生体重" align="center" prop="birth_weight" sortable/>
+      <el-table-column label="断奶体重" align="center" prop="weaning_weight" sortable/>
+      <el-table-column label="当前体重" align="center" prop="current_weight" sortable/>
+      <el-table-column label="父号" align="center" prop="father_manage_tags" sortable/>
+      <el-table-column label="母号" align="center" prop="mother_manage_tags" sortable/>
+      <el-table-column label="家系" align="center" prop="family" sortable/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['sheep_grouping:sheep_grouping:edit']">修改</el-button>
@@ -101,8 +127,11 @@
     <!-- 添加或修改羊只分组关联对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="sheep_groupingRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="羊只ID" prop="sheepId">
+        <!-- <el-form-item label="羊只ID" prop="sheepId">
           <el-input v-model="form.sheepId" placeholder="请输入羊只ID" />
+        </el-form-item> -->
+        <el-form-item label="耳号列表" prop="earTags">
+          <el-input type="textarea" :rows="4" v-model="form.earTags" :disabled="form.earTagsDisabled" placeholder="请输入耳号，多个耳号用逗号或换行分隔"/>
         </el-form-item>
         <el-form-item label="分组" prop="groupId">
           <el-select v-model="form.groupId" placeholder="请选择分组" clearable>
@@ -128,6 +157,8 @@
 <script setup name="Sheep_grouping">
 import { listSheep_grouping, getSheep_grouping, delSheep_grouping, addSheep_grouping, updateSheep_grouping } from "@/api/fileManagement/sheep_grouping"
 import {listLeafGroup} from "@/api/fileManagement/group_management"
+import {listSheep_grouping_join} from "@/api/fileManagement/sheep_grouping"
+import { addByEarTags } from '@/api/fileManagement/sheep_grouping'
 
 const { proxy } = getCurrentInstance()
 
@@ -141,36 +172,61 @@ const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
 const leafGroupOptions = ref([])
+const { sheep_gender } = proxy.useDict('sheep_gender')
 
 const data = reactive({
-  form: {},
+  form: {
+    earTags: '',
+    groupId: null,
+     earTagsDisabled: false // 新增字段：是否禁用耳号输入框
+  },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     sheepId: null,
-    groupId: null
+    groupId: null,
+    bsManageTags: ''
   },
   leafGroupOptions: [],
   rules: {
-    sheepId: [
+    earTags: [
-      { required: true, message: "羊只ID不能为空", trigger: "blur" }
+      { required: true, message: "耳号不能为空", trigger: "blur" }
     ],
     groupId: [
-      { required: true, message: "分组ID不能为空", trigger: "change" }
+      { required: true, message: "分组不能为空", trigger: "change" }
-    ]
+    ],
   }
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
 /** 查询羊只分组关联列表 */
-function getList() {
+// function getList() {
+//   loading.value = true
+//   listSheep_grouping(queryParams.value).then(response => {
+//     sheep_groupingList.value = response.rows
+//     total.value = response.total
+//     loading.value = false
+//   })
+// }
+
+import { getSheep_file } from '@/api/fileManagement/sheep_file'
+
+
+async function getList() {
   loading.value = true
-  listSheep_grouping(queryParams.value).then(response => {
+  try {
-    sheep_groupingList.value = response.rows
+    
-    total.value = response.total
+    const params = {
+      ...queryParams.value,
+      bsManageTags: queryParams.value.bsManageTags || undefined
+    }
+    const { rows, total: t } = await listSheep_grouping_join(params)
+    sheep_groupingList.value = rows
+    total.value = t
+  } finally {
     loading.value = false
-  })
+  }
 }
 
 // 取消按钮
@@ -211,6 +267,8 @@ function handleSelectionChange(selection) {
 /** 新增按钮操作 */
 function handleAdd() {
   reset()
+  form.value.earTagsDisabled = false // 允许输入耳号
+  form.value.earTags = ''          // 确保新增时输入框为空
   open.value = true
   title.value = "添加羊只分组关联"
 }
@@ -218,35 +276,98 @@ function handleAdd() {
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset()
-  const _id = row.id || ids.value
+  form.value = {...row,
-  getSheep_grouping(_id).then(response => {
+      earTags: row.bs_manage_tags,
-    form.value = response.data
+      groupId: row.group_id,
+      originalGroupId: row.group_id, // 用于前端预校验
+      earTagsDisabled: true
+    }
   open.value = true
   title.value = "修改羊只分组关联"
-  })
+  }
-}
+
+
+// /** 提交按钮 */
+// function submitForm() {
+//   proxy.$refs["sheep_groupingRef"].validate(valid => {
+//     if (valid) {
+//       if (form.value.id != null) {
+//         updateSheep_grouping(form.value).then(response => {
+//           proxy.$modal.msgSuccess("修改成功")
+//           open.value = false
+//           getList()
+//         })
+//       } else {
+//         addSheep_grouping(form.value).then(response => {
+//           proxy.$modal.msgSuccess("新增成功")
+//           open.value = false
+//           getList()
+//         })
+//       }
+//     }
+//   })
+// }
+
 
-/** 提交按钮 */
 function submitForm() {
   proxy.$refs["sheep_groupingRef"].validate(valid => {
-    if (valid) {
+    if (!valid) return;
+
+    // ── 1. 修改模式（单条） ──
     if (form.value.id != null) {
-        updateSheep_grouping(form.value).then(response => {
+      
-          proxy.$modal.msgSuccess("修改成功")
+      // 前端预校验：是否已在此分组
-          open.value = false
+      if (form.value.groupId === form.value.originalGroupId) {
-          getList()
+        proxy.$modal.msgWarning("该羊已在此分组，无需修改");
-        })
+        return;
+      }
+      // 只需要更新分组
+
+      console.log(form.value)
+      const data = {
+        id: form.value.id,
+        sheepId:form.value.sheep_id,
+        groupId: form.value.groupId
+      };
+      updateSheep_grouping(data).then(() => {
+        proxy.$modal.msgSuccess("修改成功");
+        open.value = false;
+        getList();
+      });
+      return;
+    }
+
+    // ── 2. 新增模式（耳号批量） ──
+    const earTags = form.value.earTags
+      .split(/[,\n，\s]+/)
+      .map(tag => tag.trim())
+      .filter(tag => tag);
+
+    const data = { earTags, groupId: form.value.groupId };
+
+    addByEarTags(data)
+      .then(res => {
+        if (res.data?.success) {
+          proxy.$modal.msgSuccess(`新增成功，共 ${res.data.inserted} 条`);
+          open.value = false;
+          getList();
         } else {
-        addSheep_grouping(form.value).then(response => {
+          const missing = res.data?.missing || [];
-          proxy.$modal.msgSuccess("新增成功")
+          const already = res.data?.alreadyInGroup || [];
-          open.value = false
+          if (missing.length) {
-          getList()
+            proxy.$modal.alertError(`以下耳号不存在：${missing.join(", ")}`);
-        })
+          } else if (already.length) {
+            proxy.$modal.alertWarning(`以下耳号已在该分组：${already.join(", ")}`);
+          } else {
+            proxy.$modal.alertWarning("所有羊只已存在于该分组");
           }
         }
       })
+      .catch(() => proxy.$modal.msgError("系统异常，请联系管理员"));
+  });
 }
 
+
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value

src/views/mating_plan/mating_plan/generate/index.vue

@@ -0,0 +1,428 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="计划名称" prop="planName">
+        <el-input
+            v-model="queryParams.planName"
+            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="0"></el-option>
+          <el-option label="已审批" value="1"></el-option>
+          <el-option label="已拒绝" value="2"></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="handleGenerate"
+            v-hasPermi="['mating_plan:generate:add']"
+        >生成配种计划</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['mating_plan:generate:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="breedPlanGenerateList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="计划名称" align="center" prop="planName" />
+      <el-table-column label="计划日期" align="center" prop="planDate" width="180">
+        <template #default="scope">
+          <span>{{ scope.row.planDate }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="母羊数量" align="center" prop="totalEweCount" />
+      <el-table-column label="公羊数量" align="center" prop="totalRamCount" />
+      <el-table-column label="配种比例" align="center" prop="breedRatio" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <el-tag v-if="scope.row.status === 0" type="warning">待审批</el-tag>
+          <el-tag v-else-if="scope.row.status === 1" type="success">已审批</el-tag>
+          <el-tag v-else-if="scope.row.status === 2" type="danger">已拒绝</el-tag>
+          <el-tag v-else type="info">未知状态</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批人" align="center" prop="approver" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button
+              link
+              type="primary"
+              icon="View"
+              @click="handleView(scope.row)"
+              v-hasPermi="['mating_plan:generate:view']"
+          >查看</el-button>
+          <el-button
+              link
+              type="success"
+              icon="Check"
+              @click="handleApprove(scope.row)"
+              v-hasPermi="['mating_plan:generate:approve']"
+              v-if="scope.row.status == 0"
+          >审批</el-button>
+          <el-button
+              link
+              type="primary"
+              icon="Delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['mating_plan:generate:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加调试信息显示 -->
+    <div v-if="breedPlanGenerateList.length === 0 && !loading" style="text-align: center; padding: 20px;">
+      <p>暂无数据</p>
+      <p>数据数组长度: {{ breedPlanGenerateList.length }}</p>
+      <p>总数: {{ total }}</p>
+      <p>加载状态: {{ loading }}</p>
+    </div>
+
+    <pagination
+        v-show="total>0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+    />
+
+    <!-- 生成配种计划对话框 -->
+    <el-dialog title="生成配种计划" v-model="generateOpen" width="1200px" append-to-body>
+      <el-tabs v-model="activeTab" @tab-click="handleTabClick">
+        <el-tab-pane label="符合条件的母羊" name="ewe">
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button type="primary" @click="selectEligibleEwe">筛选符合条件的母羊</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="info">已选择: {{ selectedEwe.length }} 只</el-button>
+            </el-col>
+          </el-row>
+          <el-table
+              v-loading="eweLoading"
+              :data="eligibleEweList"
+              @selection-change="handleEweSelectionChange"
+              max-height="400"
+          >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="管理耳号" align="center" prop="bs_manage_tags" />
+            <el-table-column label="品种" align="center" prop="variety" />
+            <el-table-column label="羊只类型" align="center" prop="sheep_type" />
+            <el-table-column label="月龄" align="center" prop="month_age" />
+            <el-table-column label="当前体重(kg)" align="center" prop="current_weight" />
+            <el-table-column label="产后天数" align="center" prop="post_lambing_day" />
+            <el-table-column label="繁殖状态" align="center" prop="breed" />
+          </el-table>
+        </el-tab-pane>
+
+        <el-tab-pane label="符合条件的公羊" name="ram">
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button type="primary" @click="selectEligibleRam">筛选符合条件的公羊</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="info">已选择: {{ selectedRam.length }} 只</el-button>
+            </el-col>
+          </el-row>
+          <el-table
+              v-loading="ramLoading"
+              :data="eligibleRamList"
+              @selection-change="handleRamSelectionChange"
+              max-height="400"
+          >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="管理耳号" align="center" prop="bs_manage_tags" />
+            <el-table-column label="品种" align="center" prop="variety" />
+            <el-table-column label="羊只类型" align="center" prop="sheep_type" />
+            <el-table-column label="月龄" align="center" prop="month_age" />
+            <el-table-column label="当前体重(kg)" align="center" prop="current_weight" />
+            <el-table-column label="繁殖状态" align="center" prop="breed" />
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="generateBreedPlan" :disabled="selectedEwe.length === 0 || selectedRam.length === 0">
+            生成配种计划
+          </el-button>
+          <el-button @click="generateOpen = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 查看配种计划详情对话框 -->
+    <el-dialog title="配种计划详情" v-model="viewOpen" width="1000px" append-to-body>
+      <el-descriptions :column="3" border>
+        <el-descriptions-item label="计划名称">{{ planInfo.planName }}</el-descriptions-item>
+        <el-descriptions-item label="计划日期">{{ planInfo.planDate }}</el-descriptions-item>
+        <el-descriptions-item label="状态">
+          <el-tag v-if="planInfo.status === 0" type="warning">待审批</el-tag>
+          <el-tag v-else-if="planInfo.status === 1" type="success">已审批</el-tag>
+          <el-tag v-else-if="planInfo.status === 2" type="danger">已拒绝</el-tag>
+          <el-tag v-else type="info">未知状态</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="母羊数量">{{ planInfo.totalEweCount }}</el-descriptions-item>
+        <el-descriptions-item label="公羊数量">{{ planInfo.totalRamCount }}</el-descriptions-item>
+        <el-descriptions-item label="配种比例">{{ planInfo.breedRatio }}</el-descriptions-item>
+        <el-descriptions-item label="创建人">{{ planInfo.createBy }}</el-descriptions-item>
+        <el-descriptions-item label="创建时间">{{ planInfo.createTime }}</el-descriptions-item>
+        <el-descriptions-item label="审批人">{{ planInfo.approver }}</el-descriptions-item>
+      </el-descriptions>
+
+      <el-divider content-position="left">配种计划详情</el-divider>
+      <el-table :data="planDetails" max-height="400">
+        <el-table-column label="公羊耳号" align="center" prop="ram_manage_tags" />
+        <el-table-column label="公羊品种" align="center" prop="ram_variety" />
+        <el-table-column label="母羊耳号" align="center" prop="ewe_manage_tags" />
+        <el-table-column label="母羊品种" align="center" prop="ewe_variety" />
+        <el-table-column label="母羊体重" align="center" prop="ewe_weight" />
+        <el-table-column label="配种类型" align="center" prop="breed_type">
+          <template #default="scope">
+            <el-tag v-if="scope.row.breed_type === 1" type="primary">自然交配</el-tag>
+            <el-tag v-else-if="scope.row.breed_type === 2" type="success">人工授精</el-tag>
+            <el-tag v-else-if="scope.row.breed_type === 3" type="info">胚胎移植</el-tag>
+            <el-tag v-else type="warning">未知类型</el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BreedPlanGenerate">
+import {ref, reactive, toRefs, onMounted} from 'vue'
+import {getCurrentInstance} from 'vue'
+import {
+  listBreedPlanGenerate,
+  getBreedPlanGenerate,
+  delBreedPlanGenerate,
+  selectEligibleEwe as apiSelectEligibleEwe,
+  selectEligibleRam as apiSelectEligibleRam,
+  autoGenerateBreedPlan,
+  approveBreedPlan,
+  viewBreedPlan
+} from "@/api/mating_plan/generate"
+
+const {proxy} = getCurrentInstance()
+// 修复字典问题 - 使用 proxy.useDict 或直接定义
+const dict = proxy.useDict ? proxy.useDict('breed_plan_status', 'breed_type') : {
+  type: {
+    breed_plan_status: [],
+    breed_type: []
+  }
+}
+
+const breedPlanGenerateList = ref([])
+const eligibleEweList = ref([])
+const eligibleRamList = ref([])
+const selectedEwe = ref([])
+const selectedRam = ref([])
+const planInfo = ref({})
+const planDetails = ref([])
+const generateOpen = ref(false)
+const viewOpen = ref(false)
+const loading = ref(true)
+const eweLoading = ref(false)
+const ramLoading = ref(false)
+const showSearch = ref(true)
+const ids = ref([])
+const multiple = ref(true)
+const total = ref(0)
+const activeTab = ref('ewe')
+
+const data = reactive({
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    planName: null,
+    status: null
+  }
+})
+
+const {queryParams} = toRefs(data)
+
+/** 查询配种计划生成列表 */
+function getList() {
+  loading.value = true
+  console.log('开始获取配种计划列表...')
+  console.log('查询参数:', queryParams.value)
+
+  listBreedPlanGenerate(queryParams.value).then(response => {
+    console.log('API完整响应:', response)
+
+    // 处理API响应数据
+    breedPlanGenerateList.value = response.rows || []
+    total.value = response.total || 0
+    loading.value = false
+
+    console.log('处理后的数据列表:', breedPlanGenerateList.value)
+    console.log('数据列表长度:', breedPlanGenerateList.value.length)
+    console.log('总数:', total.value)
+
+  }).catch(error => {
+    console.error('获取列表失败:', error)
+    loading.value = false
+    breedPlanGenerateList.value = []
+    total.value = 0
+  })
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  multiple.value = !selection.length
+}
+
+// 母羊选择变化
+function handleEweSelectionChange(selection) {
+  selectedEwe.value = selection.map(item => item.id)
+}
+
+// 公羊选择变化
+function handleRamSelectionChange(selection) {
+  selectedRam.value = selection.map(item => item.id)
+}
+
+// 标签页切换
+function handleTabClick(tab) {
+  activeTab.value = tab.name
+}
+
+/** 生成配种计划按钮操作 */
+function handleGenerate() {
+  generateOpen.value = true
+  selectedEwe.value = []
+  selectedRam.value = []
+  eligibleEweList.value = []
+  eligibleRamList.value = []
+}
+
+/** 筛选符合条件的母羊 */
+function selectEligibleEwe() {
+  eweLoading.value = true
+  apiSelectEligibleEwe().then(response => {
+    eligibleEweList.value = response.data
+    eweLoading.value = false
+  })
+}
+
+/** 筛选符合条件的公羊 */
+function selectEligibleRam() {
+  ramLoading.value = true
+  apiSelectEligibleRam().then(response => {
+    eligibleRamList.value = response.data
+    ramLoading.value = false
+  })
+}
+
+/** 生成配种计划 */
+function generateBreedPlan() {
+  if (selectedEwe.value.length === 0) {
+    proxy.$modal.msgError("请选择母羊")
+    return
+  }
+  if (selectedRam.value.length === 0) {
+    proxy.$modal.msgError("请选择公羊")
+    return
+  }
+
+  const params = {
+    eweIds: selectedEwe.value,
+    ramIds: selectedRam.value
+  }
+
+  autoGenerateBreedPlan(params).then(response => {
+    proxy.$modal.msgSuccess("配种计划生成成功")
+    generateOpen.value = false
+    // 重新加载列表数据
+    getList()
+    // 重置选择的羊只
+    selectedEwe.value = []
+    selectedRam.value = []
+    eligibleEweList.value = []
+    eligibleRamList.value = []
+  }).catch(error => {
+    console.error('生成配种计划失败:', error)
+    proxy.$modal.msgError("生成配种计划失败")
+  })
+}
+
+/** 查看配种计划详情 */
+function handleView(row) {
+  viewBreedPlan(row.id).then(response => {
+    planInfo.value = response.data.planInfo
+    planDetails.value = response.data.planDetails
+    viewOpen.value = true
+  })
+}
+
+/** 审批配种计划 */
+function handleApprove(row) {
+  proxy.$modal.confirm('是否确认审批通过配种计划"' + row.planName + '"？').then(function () {
+    return approveBreedPlan(row.id)
+  }).then(() => {
+    proxy.$modal.msgSuccess("审批成功")
+    // 刷新列表
+    getList()
+  }).catch(() => {
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除配种计划编号为"' + _ids + '"的数据项？').then(function () {
+    return delBreedPlanGenerate(_ids)
+  }).then(() => {
+    proxy.$modal.msgSuccess("删除成功")
+    // 刷新列表
+    getList()
+  }).catch(() => {
+  })
+}
+
+// 页面挂载时加载数据
+onMounted(() => {
+  console.log('配种计划生成页面已挂载')
+  getList()
+})
+
+// 初始加载数据
+getList()
+</script>

src/views/mating_plan/mating_plan/index.vue

@@ -0,0 +1,244 @@
+<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="ramId">
+        <el-input
+          v-model="queryParams.ramId"
+          placeholder="请输入公羊id"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="母羊id" prop="eweId">
+        <el-input
+          v-model="queryParams.eweId"
+          placeholder="请输入母羊id"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </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="['mating_plan:mating_plan:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['mating_plan:mating_plan:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['mating_plan:mating_plan:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['mating_plan:mating_plan:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="mating_planList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="公羊id" align="center" prop="ramId" />
+      <el-table-column label="母羊id" align="center" prop="eweId" />
+      <el-table-column label="配种类型" align="center" prop="breedType" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mating_plan:mating_plan:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mating_plan:mating_plan: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="mating_planRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="公羊id" prop="ramId">
+          <el-input v-model="form.ramId" placeholder="请输入公羊id" />
+        </el-form-item>
+        <el-form-item label="母羊id" prop="eweId">
+          <el-input v-model="form.eweId" 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="Mating_plan">
+import { listMating_plan, getMating_plan, delMating_plan, addMating_plan, updateMating_plan } from "@/api/mating_plan/mating_plan"
+
+const { proxy } = getCurrentInstance()
+
+const mating_planList = 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,
+    ramId: null,
+    eweId: null,
+    breedType: null
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询配种计划列表 */
+function getList() {
+  loading.value = true
+  listMating_plan(queryParams.value).then(response => {
+    mating_planList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    ramId: null,
+    eweId: null,
+    breedType: null
+  }
+  proxy.resetForm("mating_planRef")
+}
+
+/** 搜索按钮操作 */
+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
+  getMating_plan(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改配种计划"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["mating_planRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateMating_plan(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addMating_plan(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 delMating_plan(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('mating_plan/mating_plan/export', {
+    ...queryParams.value
+  }, `mating_plan_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>

src/views/produce/manage_sheep/add_sheep/index.vue

@@ -121,7 +121,7 @@
 <script setup>
 import { ref, onMounted, getCurrentInstance } from 'vue'
 import request from '@/utils/request'
-import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep/add_sheep'
+import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { getToken } from '@/utils/auth'
 
@@ -259,10 +259,10 @@ function handleImportError(err) {
 
 
 /* -------------------- 初始化 -------------------- */
-onMounted(() => {
+
   getSheepfoldOptions()
   getVarietyOptions()
-})
+
 </script>
 
 <style scoped>

src/views/produce/manage_sheep/trans_group/index.vue

@@ -180,7 +180,7 @@
 </template>
 
 <script setup name="Trans_group">
-import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group } from '@/api/produce/manage_sheep/trans_group/trans_group'
+import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group } from '@/api/produce/manage_sheep/trans_group'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof/fixHoof'
 import request from '@/utils/request'

src/views/produce/manage_sheep/transition_info/index.vue

@@ -167,7 +167,7 @@
 </template>
 
 <script setup name="Transition_info">
-import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, updateTransition_info } from "@/api/produce/manage_sheep/transition_info/transition_info"
+import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, updateTransition_info } from "@/api/produce/manage_sheep/transition_info"
 import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance()
@@ -310,50 +310,7 @@ function handleDelete(row) {
       proxy.$modal.msgSuccess("删除成功")
     })
 }
-function handleExport() {
-  proxy.download('/produce/manage_sheep/transition_info/export',
-    { ...queryParams.value },
-    `transition_info_${new Date().getTime()}.xlsx`)
-}
 
-/* -------------------- 审批 -------------------- */
+getList()
-function handleApprove(row) {
-  approveForm.value = { ...row }
-  approveDialog.value = true
-}
-function getTransTypeLabel(val) {
-  const hit = trans_type.value.find(item => Number(item.value) === val)
-  return hit ? hit.label : val
-}
-function handleApproveAgree() {
-  approveForm.value.status = 1
-  updateTransition_info(approveForm.value).then(() => {
-    approveDialog.value = false
-    proxy.$modal.msgSuccess("审批成功，状态已更新为同意")
-    getList()
-  })
-}
-function handleApproveReject() {
-  approveForm.value.status = 2
-  updateTransition_info(approveForm.value).then(() => {
-    approveDialog.value = false
-    proxy.$modal.msgSuccess("审批成功，状态已更新为驳回")
-    getList()
-  })
-}
 
-/* -------------------- 下拉 -------------------- */
-function getVarietyOptions() {
-  request({
-    url: '/base/variety/list',
-    method: 'get',
-    params: { pageNum: 1, pageSize: 9999 }
-  }).then(res => { varietyOptions.value = res.rows || [] })
-}
-
-/* -------------------- 入口 -------------------- */
-onMounted(() => {
-  getVarietyOptions()
-  getList()
-})
 </script>

src/views/produce/other/castrate/index.vue

@@ -405,5 +405,5 @@ onMounted(() => {
   getList()
   getSheepfoldOptions()
   getVarietyOptions()
-})
+
 </script>

src/views/produce/other/fixHoof/index.vue

@@ -107,7 +107,11 @@
 </template>
 
 <script setup name="FixHoof">
+<<<<<<< HEAD
 import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof, checkSheepByManageTags, getVarietyOptions, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof/fixHoof'
+=======
+import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof, checkSheepByManageTags, getVarietyOptions } from '@/api/produce/other/fixHoof'
+>>>>>>> d6ae5f3654d4c07227a4547ae1732ddb570bda9f
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 
 const { proxy } = getCurrentInstance()
@@ -351,9 +355,38 @@ function getSheepfoldOptions() {
   })
 }
 
+<<<<<<< HEAD
 onMounted(() => {
+=======
+//校验羊只是否存在 失焦时校验
+async function validateSheep() {
+  if (!form.value.manageTags) return;
+  try {
+    const { data } = await checkSheepByManageTags(form.value.manageTags.trim())
+    if (!data) {
+      proxy.$modal.msgError('该管理耳号不存在');
+      // 清空
+      form.value.manageTags = null;
+      form.value.sheepId = null;
+      form.value.sheepfold = null;
+      form.value.varietyId = null;
+    } else {
+      // 隐藏字段：真正保存用
+      form.value.sheepId = data.id;
+      // 自动带出下拉框
+      form.value.sheepfold = data.sheepfoldId;
+      form.value.varietyId = data.varietyId;
+    }
+  } catch {
+    proxy.$modal.msgError('校验失败');
+  }
+}
+
+/* 只保留一个 onMounted */
+
+  getList()
+>>>>>>> d6ae5f3654d4c07227a4547ae1732ddb570bda9f
   getSheepfoldOptions()
   getVarietyOptions()
-  getList()
+
-})
 </script>

src/views/variety/variety/index.vue

@@ -97,6 +97,7 @@
 <script setup name="Variety">
 import { listVariety, getVariety, delVariety, addVariety, updateVariety } from "@/api/variety/variety"
 
+
 const { proxy } = getCurrentInstance()
 
 const varietyList = ref([])