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

src/api/biosafety/disease.js

@@ -38,7 +38,7 @@ export function updateDisease(data) {
 // 删除疾病
 export function delDisease(id) {
   return request({
-    url: '/disease/disease/' + id,
+    url: '/biosafety/disease/' + id,
     method: 'delete'
   })
 }

src/api/fileManagement/group_management.js

@@ -42,3 +42,11 @@ export function delGroup_management(groupId) {
     method: 'delete'
   })
 }
+
+// 查询所有叶子分组
+export function listLeafGroup() {
+  return request({
+    url: '/group_management/group_management/leaf',
+    method: 'get'
+  })
+}

src/api/fileManagement/sheep_grouping.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询羊只分组关联列表
+export function listSheep_grouping(query) {
+  return request({
+    url: '/sheep_grouping/sheep_grouping/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询羊只分组关联详细
+export function getSheep_grouping(id) {
+  return request({
+    url: '/sheep_grouping/sheep_grouping/' + id,
+    method: 'get'
+  })
+}
+
+// 新增羊只分组关联
+export function addSheep_grouping(data) {
+  return request({
+    url: '/sheep_grouping/sheep_grouping',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改羊只分组关联
+export function updateSheep_grouping(data) {
+  return request({
+    url: '/sheep_grouping/sheep_grouping',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除羊只分组关联
+export function delSheep_grouping(id) {
+  return request({
+    url: '/sheep_grouping/sheep_grouping/' + id,
+    method: 'delete'
+  })
+}

src/api/produce/manage_sheep/trans_group/trans_group.js

@@ -36,17 +36,17 @@ export function updateTrans_group(data) {
 }
 
 // 删除转群记录
-export function delTrans_group(id) {
+export function delTrans_group(ids) {
+  const idStr = Array.isArray(ids) ? ids.join(',') : String(ids)
   return request({
-    url: '/produce/manage_sheep/trans_group/' + id,
+    url: `/produce/manage_sheep/trans_group/${idStr}`,
     method: 'delete'
   })
 }
-
 // 获取羊舍列表
 export function listSheepfold() {
   return request({
-    url: '/produce/sheepfold/list',
+    url: '/sheepfold_management/sheepfold_management/list',
     method: 'get',
   });
 }

src/api/produce/other/fixHoof/fixHoof.js

@@ -33,8 +33,9 @@ export function updateFixHoof(data) {
 }
 // 删除修蹄
 export function delFixHoof(ids) {
+  const idStr = Array.isArray(ids) ? ids.join(',') : String(ids)
   return request({
-    url: `/produce/other/fixHoof/${ids.join(',')}`,
+    url: `/produce/other/fixHoof/${idStr}`,
     method: 'delete'
   })
 }
@@ -47,3 +48,23 @@ export function exportFixHoof(query) {
     responseType: 'blob' // 导出功能需要设置响应类型为blob
   })
 }
+
+
+// 按管理耳号查羊只
+export function checkSheepByManageTags(manageTags) {
+  return request({
+    url: '/sheep/sheep/byManageTags/' + encodeURIComponent(manageTags),
+    method: 'get'
+  })
+}
+
+//获取品种
+export function getVarietyOptions(query){
+  return request({
+    url:'/base/variety/list',
+    method:'get',
+    params:query
+  })
+}
+
+

src/views/biosafety/quarantine/add.vue

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

src/views/biosafety/quarantine/index.vue

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

src/views/biosafety/treatment/add.vue

@@ -0,0 +1,567 @@
+<template>
+  <div class="add-treatment">
+    <el-container style="height:100vh;display:flex;flex-direction:column;">
+      <el-main style="padding:0;flex:1;display:flex;flex-direction:column;">
+        <div class="content-wrapper">
+          <h2 class="page-title">添加治疗记录</h2>
+
+          <div class="treatment-container">
+            <!-- 羊只信息只读展示 -->
+            <div class="sheep-info-section">
+              <el-row :gutter="20">
+                <el-col :span="8">
+                  <div class="info-item">
+                    <strong>耳号：</strong>{{ sheepInfo.sheepNo || '–' }}
+                  </div>
+                </el-col>
+                <el-col :span="8">
+                  <div class="info-item">
+                    <strong>性别：</strong>{{ sheepInfo.gender || '–' }}
+                  </div>
+                </el-col>
+                <el-col :span="8">
+                  <div class="info-item">
+                    <strong>品种：</strong>{{ sheepInfo.variety || '–' }}
+                  </div>
+                </el-col>
+              </el-row>
+
+              <el-row :gutter="20">
+                <el-col :span="8">
+                  <div class="info-item">
+                    <strong>羊只类别：</strong>{{ sheepInfo.name || '–' }}
+                  </div>
+                </el-col>
+                <el-col :span="8">
+                  <div class="info-item">
+                    <strong>月龄：</strong>{{ sheepInfo.monthAge ?? '–' }} &nbsp;月
+                  </div>
+                </el-col>
+                <el-col :span="8">
+                  <div class="info-item">
+                    <strong>胎次：</strong>{{ sheepInfo.parity ?? '–' }}
+                  </div>
+                </el-col>
+              </el-row>
+
+              <el-row :gutter="20">
+                <el-col :span="8">
+                  <div class="info-item">
+                    <strong>繁殖状态：</strong>{{ sheepInfo.breed || '–' }}
+                  </div>
+                </el-col>
+                <el-col :span="8">
+                  <div class="info-item">
+                    <strong>怀孕天数：</strong>{{ sheepInfo.gestationDay ?? '–' }} &nbsp;天
+                  </div>
+                </el-col>
+                <el-col :span="8">
+                  <div class="info-item">
+                    <strong>泌乳天数：</strong>{{ sheepInfo.lactationDay ?? '–' }} &nbsp;天
+                  </div>
+                </el-col>
+              </el-row>
+            </div>
+
+            <el-form ref="treatmentRef" :model="form" :rules="rules" label-width="140px" status-icon size="large"
+              class="treatment-form">
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="事件日期" prop="eventDate">
+                    <el-date-picker v-model="form.eventDate" type="date" placeholder="选择日期" style="width:100%" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="处方" prop="prescription">
+                    <el-select v-model="selectedPresId" placeholder="请选择处方" style="width:100%" filterable clearable
+                      @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="form.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 :disabled="!form.diseasePid" v-model="form.diseaseId" 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>
+
+              <el-divider content-position="left">治疗记录</el-divider>
+
+              <div class="medication-actions mb20">
+                <el-button type="primary" icon="Plus" @click="handleAddSwPresDetail">
+                  添加药品
+                </el-button>
+              </div>
+
+              <div style="margin-bottom:30px;">
+                <el-table :data="swPresDetailList" border stripe style="width:100%;">
+                  <el-table-column label="序号" align="center" width="80">
+                    <template #default="scope">{{ scope.$index + 1 }}</template>
+                  </el-table-column>
+
+                  <el-table-column label="药品" prop="mediId">
+                    <template #default="scope">
+                      <el-select v-model="scope.row.mediId" filterable placeholder="请选择药品" style="width:100%">
+                        <el-option v-for="item in medicines" :key="item.value" :label="item.label"
+                          :value="item.value" />
+                      </el-select>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="用量" prop="dosage">
+                    <template #default="scope">
+                      <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" placeholder="请输入用量"
+                        controls-position="right" style="width:100%" />
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="单位" prop="unit">
+                    <template #default="scope">
+                      <el-select v-model="scope.row.unitId" placeholder="请选择单位">
+                        <el-option v-for="item in units" :key="item.value" :label="item.label" :value="item.value" />
+                      </el-select>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="使用方法" prop="usageId">
+                    <template #default="scope">
+                      <el-select v-model="scope.row.usageId" placeholder="请选择使用方法" style="width:100%">
+                        <el-option v-for="item in usages" :key="item.value" :label="item.label" :value="item.value" />
+                      </el-select>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="生产厂家" prop="manufacturer">
+                    <template #default="scope">
+                      <el-input v-model="scope.row.manufacturer" placeholder="请输入生产厂家" style="width:100%" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="生产批号" prop="batchNumber">
+                    <template #default="scope">
+                      <el-input v-model="scope.row.batchNumber" placeholder="生产批号" style="width:100%" />
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="操作" align="center" width="100">
+                    <template #default="scope">
+                      <el-button link type="danger" icon="Delete" @click="deletePresDetail(scope.row)">
+                        删除
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="兽医">
+                    <el-input v-model="form.veterinarian" placeholder="请输入兽医姓名" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-form-item label="备注">
+                <el-input type="textarea" :rows="3" v-model="form.comment" placeholder="请输入备注" />
+              </el-form-item>
+
+              <div class="form-footer">
+                <el-button @click="goBack">取消</el-button>
+                <el-button type="primary" @click="submitForm">
+                  确定
+                </el-button>
+              </div>
+            </el-form>
+          </div>
+        </div>
+      </el-main>
+    </el-container>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue'
+import useTagsViewStore from "@/store/modules/tagsView.js"
+import request from '@/utils/request';
+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 { addTreatment } from '@/api/biosafety/treatment' // 新增治疗记录API
+import { ElMessage } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+
+const { proxy } = getCurrentInstance()
+
+const route = useRoute()
+const router = useRouter()
+const { qId, sId } = route.query;
+
+const sheepInfo = ref({
+  sheepNo: null,
+  gender: '',
+  variety: '',
+  name: '',
+  monthAge: null,
+  parity: null,
+  breed: '',
+  lactationDay: null,
+  gestationDay: null
+})
+
+const units = ref([])   // 单位下拉选项
+const usages = ref([]) // 使用方法下拉选项
+const medicines = ref([]) // 药品下拉选项
+
+function getMedicines() {
+  listMedicine().then(response => {
+    medicines.value = response.rows.map(item => ({
+      value: item.id,
+      label: item.name
+    }))
+  })
+}
+
+function getUnit() {
+  listUnit().then(response => {
+    units.value = response.rows.map(item => ({
+      value: item.id,
+      label: item.name
+    }))
+  })
+}
+
+function getUsageOptions() {
+  listUsage().then(response => {
+    usages.value = response.rows.map(item => ({
+      value: item.id,
+      label: item.name
+    }))
+  })
+}
+
+function getSheepInfo() {
+  if (!sId) return
+  request.get(`/sheep_file/sheep_file/${sId}`).then(response => {
+    const data = response.data
+    sheepInfo.value = {
+      sheepNo: data.bsManageTags,
+      gender: data.gender,
+      variety: data.variety,
+      name: data.name,
+      monthAge: data.monthAge,
+      parity: data.parity,
+      breed: data.breed,
+      lactationDay: data.lactationDay,
+      gestationDay: data.gestationDay,
+    }
+  })
+}
+
+const selectedPresId = ref(null)
+const presOptions = ref([])
+
+function getPrescriptions() {
+  const queryParams = {
+    status: 1, // 只获取有效的处方
+    persType: 4 // 只获取疾病治疗的处方
+  }
+  listPrescription(queryParams).then(response => {
+    presOptions.value = response.rows.map(item => ({
+      id: item.id,
+      label: item.name
+    }))
+  })
+}
+
+function handleSelectPrescription(id) {
+  if (!id) return
+  getPrescription(id).then(response => {
+    const data = response.data
+    swPresDetailList.value = data.swPresDetailList.map(item => ({
+      mediId: item.mediId,
+      dosage: item.dosage,
+      unitId: item.unitId,
+      usageId: item.usageId,
+    }))
+  })
+}
+
+/* 疾病相关 */
+const parentDiseaseOptions = ref([]) // 疾病父类选项
+const childDiseaseOptions = ref([]) // 疾病子类选项
+
+function getDiseases() {
+  listDisease().then(response => {
+    const diseases = proxy.handleTree(response.data, "id", "pid")
+    // 提取父类疾病（pid为0）
+    parentDiseaseOptions.value = diseases.filter(item => item.pid === 0)
+  })
+}
+
+function handleDiseaseTypeChange(parentId) {
+  if (!parentId) {
+    childDiseaseOptions.value = []
+    form.diseaseSubtype = null
+    return
+  }
+
+  // 查找对应父类下的子类疾病
+  listDisease({ pid: parentId }).then(response => {
+    childDiseaseOptions.value = response.data
+    form.diseaseSubtype = null
+  })
+}
+
+const form = reactive({
+  eventType: '诊疗',
+  eventDate: new Date(), // 默认今天
+  diseaseParentId: null, // 疾病大类
+  diseaseSubtype: null,  // 疾病子类型
+  veterinarian: '',
+  comment: '',
+  sheepId: sId // 羊只ID
+})
+
+const rules = {
+  diseasePid: { required: true, message: '疾病大类不能为空', trigger: 'change' },
+  diseaseId: { required: true, message: '疾病子类型不能为空', trigger: 'change' }
+}
+
+const swPresDetailList = ref([
+  { mediId: null, dosage: 0, unitId: null, usageId: null, manufacturer: '', batchNumber: '' }
+])
+
+const handleAddSwPresDetail = () => {
+  swPresDetailList.value.push({ mediId: null, dosage: 0, unitId: null, usageId: null, manufacturer: '', batchNumber: '' })
+}
+
+const deletePresDetail = (row) => {
+  const index = swPresDetailList.value.indexOf(row)
+  if (index !== -1) swPresDetailList.value.splice(index, 1)
+}
+
+function submitForm() {
+  // 表单验证
+  if (!form.diseasePid || !form.diseaseId) {
+    ElMessage.error("请完整填写疾病信息！");
+    return;
+  }
+
+  if (swPresDetailList.value.length === 0 || swPresDetailList.value.some(item => !item.mediId)) {
+    ElMessage.error("请至少添加一个药品！");
+    return;
+  }
+
+  // 整合提交数据
+  const submitData = {
+    ...sheepInfo.value,
+    ...form,
+    eventDate: form.eventDate ? new Date(form.eventDate).getTime() : null,
+    usageDetails: swPresDetailList.value.map(item => ({
+      mediId: item.mediId,
+      dosage: item.dosage,
+      unit: item.unitId,
+      usageId: item.usageId,
+      manufacturer: item.manufacturer,
+      batchNumber: item.batchNumber
+    }))
+  };
+
+  // 提交请求
+  addTreatment(submitData).then(response => {
+    if (response.code === 200) {
+      ElMessage.success(response.message || "治疗记录添加成功！");
+      goBack();
+    } else {
+      ElMessage.error(response.message || "添加治疗记录失败！");
+    }
+  }).catch(error => {
+    ElMessage.error("请求失败：" + (error.message || "未知错误"));
+    console.error("提交表单时出错:", error);
+  });
+}
+
+// 关闭页面并跳转到对应的页面
+const useTagsStore = useTagsViewStore()
+const currentTag = router.currentRoute.value;
+const goBack = () => {
+  router.go(-1);
+  useTagsStore.delVisitedView(currentTag);
+};
+
+// 初始化数据
+getUnit()  // 获取单位下拉数据源
+getUsageOptions() // 获取使用方法下拉数据源
+getMedicines() // 获取药品下拉数据源
+getSheepInfo() // 获取羊只信息
+getPrescriptions() // 获取处方下拉数据源
+getDiseases() // 获取疾病数据
+</script>
+
+<style scoped>
+/* ===== 全屏极简样式 ===== */
+html,
+body,
+#app {
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+}
+
+.add-treatment {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.el-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.content-wrapper {
+  flex: 1;
+  overflow-y: auto;
+  padding: 20px;
+  display: flex;
+  flex-direction: column;
+}
+
+.page-title {
+  margin: 0 0 24px;
+  font-size: 24px;
+  font-weight: 600;
+  color: #303133;
+  text-align: center;
+}
+
+/* 羊只信息部分 */
+.treatment-container {
+  max-width: 1200px;
+  margin: 0 auto;
+  width: 100%;
+  padding: 20px;
+  box-sizing: border-box;
+}
+
+.sheep-info-section {
+  margin-bottom: 32px;
+}
+
+.info-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8px;
+}
+
+.info-item strong {
+  color: #606266;
+  font-weight: 500;
+  margin-right: 8px;
+  width: 100px;
+}
+
+.info-item span {
+  color: #303133;
+  flex: 1;
+}
+
+/* 表单样式 */
+.treatment-form {
+  margin: 0 auto;
+  padding: 0 20px;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.el-form-item {
+  margin-bottom: 24px;
+}
+
+.el-input,
+.el-textarea,
+.el-select {
+  width: 100%;
+}
+
+/* 按钮样式 */
+.form-footer {
+  margin-top: 40px;
+  text-align: center;
+}
+
+.form-footer .el-button {
+  padding: 12px 40px;
+  font-size: 16px;
+  border-radius: 6px;
+}
+
+/* 表格样式 */
+.el-table {
+  border-radius: 8px;
+  overflow: hidden;
+  margin-top: 16px;
+}
+
+/* 分隔线样式 */
+.el-divider {
+  margin: 32px 0 24px;
+}
+
+.el-divider__text {
+  background: transparent;
+  color: #606266;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+/* 药品添加按钮 */
+.medication-actions {
+  display: flex;
+  justify-content: flex-start;
+  margin-bottom: 16px;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .el-col {
+    margin-bottom: 16px;
+  }
+
+  .el-row {
+    margin-bottom: 16px;
+  }
+
+  .info-item {
+    flex-direction: column;
+    align-items: flex-start;
+    margin-bottom: 12px;
+  }
+
+  .info-item strong {
+    margin-bottom: 6px;
+  }
+}
+</style>

src/views/biosafety/treatment/hanld.vue

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

src/views/biosafety/treatment/index.vue

@@ -170,7 +170,7 @@
 </template>
 
 <script setup name="Treatment">
-import { listTreatment, getTreatment, delTreatment, addTreatment, updateTreatment } from "@/api/treatment/treatment"
+import { listTreatment, getTreatment, delTreatment, addTreatment, updateTreatment } from "@/api/biosafety/treatment"
 
 const { proxy } = getCurrentInstance()
 

src/views/fileManagement/sheep_file/index.vue

@@ -222,8 +222,11 @@
         width="120"
         sortable
       >
-        <template #header>
+        <!-- <template #header>
           <span style="font-weight: bold; color: #333;">性别</span>
+        </template> -->
+        <template #default="scope">
+          <dict-tag :options="sheep_gender" :value="scope.row.gender"/>
         </template>
       </el-table-column>
       <el-table-column
@@ -979,8 +982,11 @@
 <script setup name="Sheep_file">
 import { listSheep_file, getSheep_file } from "@/api/fileManagement/sheep_file"
 
-const { proxy } = getCurrentInstance()
 
+
+
+const { proxy } = getCurrentInstance()
+const { sheep_gender } = proxy.useDict('sheep_gender')
 const sheep_fileList = ref([])
 const open = ref(false)
 const loading = ref(true)

src/views/fileManagement/sheep_grouping/index.vue

@@ -0,0 +1,285 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="羊只ID" prop="sheepId">
+        <el-input
+          v-model="queryParams.sheepId"
+          placeholder="请输入羊只ID"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分组" prop="groupId">
+        <el-select
+          v-model="queryParams.groupId"
+          placeholder="请选择分组"
+          clearable
+          style="width: 200px"
+        >
+        <el-option
+          v-for="g in leafGroupOptions"
+          :key="g.groupId"
+          :label="g.groupName"
+          :value="g.groupId"
+        />
+  </el-select>
+</el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['sheep_grouping:sheep_grouping:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['sheep_grouping:sheep_grouping:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['sheep_grouping:sheep_grouping:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['sheep_grouping:sheep_grouping:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </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 label="主键ID" align="center" prop="id" />
+      <el-table-column label="羊只ID" align="center" prop="sheepId" />
+      <el-table-column label="分组ID" align="center" prop="groupId" />
+      <el-table-column label="分组名称" align="center" prop="groupName">
+        <template #default="scope">
+          {{ getGroupName(scope.row.groupId) }}
+        </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="['sheep_grouping:sheep_grouping:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['sheep_grouping:sheep_grouping:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改羊只分组关联对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="sheep_groupingRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="羊只ID" prop="sheepId">
+          <el-input v-model="form.sheepId" placeholder="请输入羊只ID" />
+        </el-form-item>
+        <el-form-item label="分组" prop="groupId">
+          <el-select v-model="form.groupId" placeholder="请选择分组" clearable>
+            <el-option
+              v-for="g in leafGroupOptions"
+              :key="g.groupId"
+              :label="g.groupName"
+              :value="g.groupId"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Sheep_grouping">
+import { listSheep_grouping, getSheep_grouping, delSheep_grouping, addSheep_grouping, updateSheep_grouping } from "@/api/fileManagement/sheep_grouping"
+import {listLeafGroup} from "@/api/fileManagement/group_management"
+
+const { proxy } = getCurrentInstance()
+
+const sheep_groupingList = 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 leafGroupOptions = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    sheepId: null,
+    groupId: null
+  },
+  leafGroupOptions: [],
+  rules: {
+    sheepId: [
+      { required: true, message: "羊只ID不能为空", trigger: "blur" }
+    ],
+    groupId: [
+      { required: true, message: "分组ID不能为空", trigger: "change" }
+    ]
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询羊只分组关联列表 */
+function getList() {
+  loading.value = true
+  listSheep_grouping(queryParams.value).then(response => {
+    sheep_groupingList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    groupId: null
+  }
+  proxy.resetForm("sheep_groupingRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加羊只分组关联"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getSheep_grouping(_id).then(response => {
+    form.value = response.data
+    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 handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除羊只分组关联编号为"' + _ids + '"的数据项？').then(function() {
+    return delSheep_grouping(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('sheep_grouping/sheep_grouping/export', {
+    ...queryParams.value
+  }, `sheep_grouping_${new Date().getTime()}.xlsx`)
+}
+
+loadLeafGroups()
+getList()
+
+
+// 调用示例
+function loadLeafGroups() {
+  listLeafGroup().then(res => {
+    leafGroupOptions.value = res.data
+  })
+}
+
+// 根据 groupId 获取分组名称
+function getGroupName(id) {
+  const group = leafGroupOptions.value.find(g => g.groupId === id)
+  return group ? group.groupName : ''
+}
+
+</script>

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

@@ -1,13 +1,16 @@
 <template>
   <div class="app-container">
+    <!-- 顶部按钮 -->
     <el-button type="warning" icon="Upload" @click="handleExportForm">导出</el-button>
     <el-button type="primary" plain icon="Plus" @click="handleImport"
       v-hasPermi="['produce:add_sheep:import']">导入</el-button>
+
+    <!-- 新增/编辑表单 -->
     <el-form :model="form" ref="formRef" label-position="left" label-width="100px" style="margin-top:15px">
       <el-row :gutter="20">
         <el-col :span="10">
           <el-form-item label="耳号" prop="earNumber">
-            <el-input v-model="form.earNumber" placeholder="请输入羊只id" />
+            <el-input v-model="form.earNumber" placeholder="请输入耳号" />
           </el-form-item>
         </el-col>
         <el-col :span="10">
@@ -18,6 +21,7 @@
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row :gutter="20">
         <el-col :span="10">
           <el-form-item label="父号" prop="father">
@@ -30,9 +34,10 @@
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row :gutter="20">
         <el-col :span="10">
-          <el-form-item label="出生体重" prop="bornWeight">
+          <el-form-item label="出生体重(kg)" prop="bornWeight">
             <el-input v-model="form.bornWeight" placeholder="请输入出生体重" />
           </el-form-item>
         </el-col>
@@ -42,14 +47,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row :gutter="20">
         <el-col :span="10">
           <el-form-item label="性别" prop="gender">
             <el-select v-model="form.gender" placeholder="请选择性别">
-              <el-option label="公" value="1" />
+              <el-option label="公" :value="1" />
-              <el-option label="母" value="0" />
+              <el-option label="母" :value="0" />
-              <el-option label="阉羊" value="2" />
+              <el-option label="阉羊" :value="2" />
-              <el-option label="兼性" value="3" />
+              <el-option label="兼性" :value="3" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -59,10 +65,13 @@
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row :gutter="20">
         <el-col :span="10">
           <el-form-item label="品种" prop="varietyId">
-            <el-input v-model="form.varietyId" placeholder="请输入品种" />
+            <el-select v-model="form.varietyId" placeholder="请选择品种" clearable>
+              <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="Number(item.id)" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="10">
@@ -71,6 +80,7 @@
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row :gutter="20">
         <el-col :span="10">
           <el-form-item label="技术员" prop="technician">
@@ -78,6 +88,7 @@
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row :gutter="20">
         <el-col :span="16">
           <el-form-item label="备注" prop="comment">
@@ -93,10 +104,11 @@
     </el-form>
   </div>
 
+  <!-- 导入弹窗 -->
   <el-dialog title="导入羊只信息" v-model="importOpen" width="400px" append-to-body>
     <el-upload ref="uploadRef" :limit="1" accept=".xlsx,.xls" :action="importUrl" :headers="headers"
       :auto-upload="false" :on-success="handleImportSuccess" :on-error="handleImportError" drag>
-      <i class="el-icon-upload"></i>
+      <i class="el-icon-upload" />
       <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
     </el-upload>
     <template #footer>
@@ -107,10 +119,15 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { ref, onMounted, getCurrentInstance } from 'vue'
-import { addSheep } from '@/api/produce/manage_sheep/add_sheep/add_sheep';
+import request from '@/utils/request'
-import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management';
+import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep/add_sheep'
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
+import { getToken } from '@/utils/auth'
 
+
+const { proxy } = getCurrentInstance()
+/* -------------------- 表单 -------------------- */
 const form = ref({
   earNumber: '',
   sheepfold: '',
@@ -123,50 +140,57 @@ const form = ref({
   varietyId: '',
   joinDate: '',
   comment: '',
-  technician: '',
+  technician: ''
-});
+})
-
+const formRef = ref(null)
-const formRef = ref(null);
 
 const rules = {
   earNumber: [{ required: true, message: '请输入耳号', trigger: 'blur' }],
-  sheepfold: [{ required: true, message: '请输入羊舍', trigger: 'change' }],
+  sheepfold: [{ required: true, message: '请选择羊舍', trigger: 'change' }],
-  father: [{ message: '请输入父号', trigger: 'blur' }],
-  mother: [{ message: '请输入母号', trigger: 'blur' }],
   bornWeight: [{ required: true, message: '请输入出生体重', trigger: 'blur' }],
   birthday: [{ required: true, message: '请选择出生日期', trigger: 'change' }],
   gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
-  parity: [{ message: '请输入胎次', trigger: 'blur' }],
+  varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }]
-  varietyId: [{ required: true, message: '请输入品种', trigger: 'blur' }],
-  joinDate: [{ message: '请选择入群日期', trigger: 'change' }],
-  technician: [{ message: '请输入技术员', trigger: 'blur' }],
-};
-
-
-//表单验证 提交表单数据
-const submitForm = () => {
-  formRef.value.validate((valid) => {
-    if (valid) {
-      addSheep(form.value) // 调用 API 方法，addSheep 应已在 @/api/sheep/sheep.js 中定义
-        .then(response => {
-          if (response.code === 200) {
-            alert('新增成功');
-            resetForm();
-            // 可以在这里添加刷新列表的逻辑，例如调用 list 方法
-          } else {
-            alert(response.msg || '新增失败');
 }
+
+/* -------------------- 下拉数据 -------------------- */
+const sheepfoldOptions = ref([])
+const varietyOptions = ref([])
+
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows || []
   })
-        .catch(error => {
-          console.error('新增失败:', error);
-          alert('新增失败，请稍后重试');
-        });
-    } else {
-      alert('请填写所有必填字段');
 }
-  });
+
-};
+function getVarietyOptions() {
-const resetForm = () => {
+  request({
+    url: '/base/variety/list',
+    method: 'get',
+    params: { pageNum: 1, pageSize: 9999 }
+  }).then(res => {
+    varietyOptions.value = res.rows || []
+  })
+}
+
+/* -------------------- 功能方法 -------------------- */
+function submitForm() {
+  formRef.value.validate(valid => {
+    if (!valid) return
+    addSheep(form.value).then(res => {
+      if (res.code === 200) {
+        proxy.$modal.msgSuccess('新增成功')
+        resetForm()
+      } else {
+        proxy.$modal.msgError(res.msg || '新增失败')   // 这里显示“耳号已存在”等后端报错
+      }
+    }).catch(() => {
+      proxy.$modal.msgError('请求异常，请稍后重试')
+    })
+  })
+}
+
+function resetForm() {
   form.value = {
     earNumber: '',
     sheepfold: '',
@@ -179,63 +203,66 @@ const resetForm = () => {
     varietyId: '',
     joinDate: '',
     comment: '',
-    technician: '',
+    technician: ''
-  };
+  }
-};
+}
-
-
-//导出
-import { exportSheepForm } from '@/api/produce/manage_sheep/add_sheep/add_sheep';
 
 function handleExportForm() {
-  // 把当前表单数据直接传后端
   exportSheepForm(form.value).then(res => {
-    // 使用 Ruoyi 自带的下载方法
+    const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
-    const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+    const link = document.createElement('a')
-    const fileName = `羊只信息_${new Date().getTime()}.xlsx`;
+    link.href = URL.createObjectURL(blob)
-    const link = document.createElement('a');
+    link.download = `羊只信息_${Date.now()}.xlsx`
-    link.href = URL.createObjectURL(blob);
+    link.click()
-    link.download = fileName;
+  })
-    link.click();
-  });
 }
 
+/* -------------------- 导入 -------------------- */
+const uploadRef = ref(null)
+const importOpen = ref(false)
+const importUrl = ref(import.meta.env.VITE_APP_BASE_API + '/produce/manage_sheep/add_sheep/importData')
+const headers = ref({ Authorization: 'Bearer ' + getToken() })
 
-//导入
+function handleImport() {
-import { getToken } from '@/utils/auth';
+  importOpen.value = true
-
+}
-const uploadRef = ref();
-const importOpen = ref(false);
-const importUrl = ref(import.meta.env.VITE_APP_BASE_API + '/produce/manage_sheep/add_sheep/importData');
-const headers = ref({ Authorization: 'Bearer ' + getToken() });
-
-function handleImport() { importOpen.value = true; }
 function downloadTemplate() {
-  proxy.download('/produce/manage_sheep/add_sheep/importTemplate', {}, `羊只模板_${Date.now()}.xlsx`);
+  request({ url: '/produce/manage_sheep/add_sheep/importTemplate', method: 'get', responseType: 'blob' }).then(res => {
+    const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
+    const link = document.createElement('a')
+    link.href = URL.createObjectURL(blob)
+    link.download = `羊只模板_${Date.now()}.xlsx`
+    link.click()
+  })
 }
-function submitUpload() { uploadRef.value?.submit(); }
+function submitUpload() {
+  uploadRef.value?.submit()
+}
+
+// 上传成功回调
 function handleImportSuccess(res) {
-  proxy.$modal.msgSuccess(res.msg || '导入成功');
+  if (res.code === 200) {
-  importOpen.value = false;
+    proxy.$modal.msgSuccess(res.msg || '导入成功')
-  uploadRef.value?.clearFiles();
+    importOpen.value = false
+    uploadRef.value?.clearFiles()
+  } else {
+    // 业务失败
+    proxy.$modal.msgError('导入失败：' + (res.msg || '未知原因'))
   }
+}
+
+// 上传失败（网络/服务器异常）
 function handleImportError(err) {
-  proxy.$modal.msgError(JSON.parse(err.message)?.msg || '导入失败');
+  const msg = JSON.parse(err.message || '{}')?.msg || '网络异常'
+  proxy.$modal.msgError('导入失败：' + msg)
 }
 
 
-/**获取羊舍数据 */
+/* -------------------- 初始化 -------------------- */
-const sheepfoldOptions = ref([]);
-function getSheepfoldOptions() {
-  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
-    sheepfoldOptions.value = res.rows;   
-  });
-}
 onMounted(() => {
-  getSheepfoldOptions();
+  getSheepfoldOptions()
-});
+  getVarietyOptions()
-
+})
-
 </script>
 
 <style scoped>

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

@@ -14,6 +14,11 @@
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
       </el-form-item>
+      <el-form-item label="品种" prop="varietyId">
+        <el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
+          <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" style="width: 150px;" placeholder="请选择状态" clearable>
           <el-option v-for="dict in status" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -55,17 +60,10 @@
       <el-table-column label="羊只id" align="center" prop="sheepId" />
       <el-table-column label="转出羊舍" align="center" prop="foldFromName" />
       <el-table-column label="转入羊舍" align="center" prop="foldToName" />
-      <el-table-column label="转群原因" align="center" prop="reason" min-width="160">
+      <el-table-column label="品种" align="center" prop="varietyName" />
-        <template #default="scope">
+      <el-table-column label="转群原因" align="center" prop="reasonText" />
-          <dict-tag :options="trans_group_reason" :value="scope.row.reason" />
-        </template>
-      </el-table-column>
       <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="状态" align="center" prop="statusText" />
-        <template #default="scope">
-          <dict-tag :options="status" :value="scope.row.status" />
-        </template>
-      </el-table-column>
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime">
@@ -106,9 +104,15 @@
             <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
           </el-select>
         </el-form-item>
+        <el-form-item label="品种" prop="varietyId">
+          <el-select v-model="form.varietyId" placeholder="请选择品种" clearable>
+            <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="Number(item.id)" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="转群原因" prop="reason">
           <el-select v-model="form.reason" placeholder="请选择转群原因" clearable>
-            <el-option v-for="dict in trans_group_reason" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-option v-for="dict in trans_group_reason" :key="dict.value" :label="dict.label"
+              :value="Number(dict.value)" />
           </el-select>
         </el-form-item>
         <el-form-item label="技术员" prop="technician">
@@ -139,11 +143,14 @@
       <el-form-item label="转入羊舍">
         <el-input :value="sheepfoldNameMap[approveForm.foldTo] || approveForm.foldTo" disabled />
       </el-form-item>
+      <el-form-item label="品种">
+        <el-input :value="approveForm.varietyName" disabled />
+      </el-form-item>
       <el-form-item label="转群原因">
-        <el-select v-model="approveForm.reason" disabled>
+        <el-input :value="approveForm.reasonText" disabled />
-          <el-option :label="trans_group_reason.find(d => d.value == approveForm.reason)?.label || ''"
+      </el-form-item>
-            :value="approveForm.reason" />
+      <el-form-item label="状态">
-        </el-select>
+        <el-input :value="approveForm.statusText" disabled />
       </el-form-item>
       <el-form-item label="技术员">
         <el-input v-model="approveForm.technician" disabled />
@@ -162,13 +169,14 @@
 </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/trans_group'
-import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management';
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
-
+import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance()
 const { trans_group_reason, status } = proxy.useDict('trans_group_reason', 'status')
 
+/* -------------------- 响应式变量 -------------------- */
 const trans_groupList = ref([])
 const open = ref(false)
 const loading = ref(true)
@@ -177,9 +185,17 @@ const ids = ref([])
 const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
-const title = ref("")
+const title = ref('')
 const daterangeCreateTime = ref([])
 
+const approveDialog = ref(false)
+const approveForm = ref({})
+
+const sheepfoldOptions = ref([])
+const sheepfoldNameMap = ref({})
+const varietyOptions = ref([])
+
+/* -------------------- 表单 & 查询 -------------------- */
 const data = reactive({
   form: {},
   queryParams: {
@@ -188,61 +204,43 @@ const data = reactive({
     sheepId: null,
     foldTo: null,
     foldFrom: null,
+    varietyId: null,      // 新增
     status: null,
     createTime: null
   },
   rules: {
-    id: [
+    sheepId: [{ required: true, message: '羊只id不能为空', trigger: 'blur' }],
-      { required: true, message: "$comment不能为空", trigger: "blur" }
+    foldFrom: [{ required: true, message: '转出羊舍不能为空', trigger: 'change' }],
-    ],
+    foldTo: [{ required: true, message: '转入羊舍不能为空', trigger: 'change' }],
-    sheepId: [
+    varietyId: [{ required: true, message: '品种不能为空', trigger: 'change' }],
-      { required: true, message: "羊只id不能为空", trigger: "blur" }
+    reason: [{ required: true, message: '转群原因不能为空', trigger: 'change' }],
-    ],
+    technician: [{ required: true, message: '技术员不能为空', trigger: 'blur' }]
-    foldTo: [
-      { required: true, message: "转入羊舍不能为空", trigger: "blur" }
-    ],
-    foldFrom: [
-      { required: true, message: "转出羊舍不能为空", trigger: "blur" }
-    ],
-    reason: [
-      { required: true, message: "转群原因不能为空", trigger: "change" }
-    ],
-    technician: [
-      { required: true, message: "技术员不能为空", trigger: "blur" }
-    ],
   }
 })
-
 const { queryParams, form, rules } = toRefs(data)
 
-/** 查询转群记录列表 */
+/* -------------------- 业务函数 -------------------- */
 function getList() {
   loading.value = true
   queryParams.value.params = {}
-  if (null != daterangeCreateTime && '' != daterangeCreateTime) {
+  if (daterangeCreateTime.value?.length) {
-    queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
+    queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
-    queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
+    queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
   }
-  listTrans_group(queryParams.value).then(response => {
+  listTrans_group(queryParams.value).then(res => {
-    trans_groupList.value = response.rows
+    trans_groupList.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,
-    foldTo: null,
     foldFrom: null,
+    foldTo: null,
+    varietyId: null,      // 新增
     reason: null,
     technician: null,
     status: null,
@@ -250,160 +248,130 @@ function reset() {
     createBy: null,
     createTime: null
   }
-  proxy.resetForm("trans_groupRef")
+  proxy.resetForm('trans_groupRef')
+}
+
+function cancel() {
+  open.value = false
+  reset()
 }
 
-/** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
-/** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
-  proxy.resetForm("queryRef")
+  proxy.resetForm('queryRef')
   handleQuery()
 }
 
-// 多选框选中数据
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.id)
-  single.value = selection.length != 1
+  single.value = selection.length !== 1
   multiple.value = !selection.length
 }
 
-/** 新增按钮操作 */
 function handleAdd() {
   reset()
   open.value = true
-  title.value = "添加转群记录"
+  title.value = '添加转群记录'
 }
 
-/** 修改按钮操作 */
 function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getTrans_group(_id).then(response => {
+  getTrans_group(_id).then(res => {
-    const data = response.data
+    const d = res.data
-    data.foldFrom = Number(data.foldFrom)
+    // 统一转成 Number，避免 undefined
-    data.foldTo = Number(data.foldTo)
+    d.foldFrom = Number(d.foldFrom ?? 0)
-    data.reason = String(data.reason) 
+    d.foldTo = Number(d.foldTo ?? 0)
-    form.value = data
+    d.reason = Number(d.reason ?? 0)
+    d.status = Number(d.status ?? 0)
+    d.varietyId = Number(d.varietyId ?? 0)
+    form.value = d
     open.value = true
+    title.value = '修改转群记录'
   })
 }
 
-/** 提交按钮 */
 function submitForm() {
-  proxy.$refs["trans_groupRef"].validate(valid => {
+  proxy.$refs.trans_groupRef.validate(valid => {
-    if (valid) {
+    if (!valid) return
-      if (form.value.id != null) {
+    const api = form.value.id ? updateTrans_group : addTrans_group
-        updateTrans_group(form.value).then(response => {
+    api(form.value).then(() => {
-          proxy.$modal.msgSuccess("修改成功")
+      proxy.$modal.msgSuccess(form.value.id ? '修改成功' : '新增成功')
       open.value = false
       getList()
     })
-      } else {
-        addTrans_group(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
-      }
-    }
   })
 }
 
-/** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除转群记录编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm(`是否确认删除转群记录编号为“${_ids}”的数据项？`)
-    return delTrans_group(_ids)
+    .then(() => delTrans_group(_ids))
-  }).then(() => {
+    .then(() => {
       getList()
-    proxy.$modal.msgSuccess("删除成功")
+      proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => { })
+    })
 }
 
-/** 导出按钮操作 */
 function handleExport() {
-  proxy.download('/produce/manage_sheep/trans_group/export', {
+  proxy.download(
-    ...queryParams.value
+    '/produce/manage_sheep/trans_group/export',
-  }, `trans_group_${new Date().getTime()}.xlsx`);
+    { ...queryParams.value },
+    `trans_group_${Date.now()}.xlsx`
+  )
 }
 
-
+/* -------------------- 审批 -------------------- */
-// 审批记录的对话框
-const approveDialog = ref(false);
-const approveForm = ref({});
-
-// 审批按钮操作
 function handleApprove(row) {
-  approveForm.value = { ...row };
+  approveForm.value = { ...row }
-  approveDialog.value = true;
+  approveDialog.value = true
 }
-
-// 同意审批
 function handleApproveAgree() {
-  approveForm.value.status = 1; // 状态设置为同意
+  approveForm.value.status = 1
   updateTrans_group(approveForm.value).then(() => {
-    approveDialog.value = false;
+    approveDialog.value = false
-    proxy.$modal.msgSuccess("审批成功，状态已更新为同意");
+    proxy.$modal.msgSuccess('审批成功，状态已更新为同意')
-    getList();
+    getList()
-  }).catch((error) => {
+  })
-    proxy.$modal.msgError(`审批失败：${error}`);
-  });
 }
-
-// 驳回审批
 function handleApproveReject() {
-  approveForm.value.status = 2; // 状态设置为驳回
+  approveForm.value.status = 2
   updateTrans_group(approveForm.value).then(() => {
-    approveDialog.value = false;
+    approveDialog.value = false
-    proxy.$modal.msgSuccess("审批成功，状态已更新为驳回");
+    proxy.$modal.msgSuccess('审批成功，状态已更新为驳回')
-    getList();
+    getList()
-  }).catch((error) => {
+  })
-    proxy.$modal.msgError(`审批失败：${error}`);
-  });
 }
 
-//加载所有羊舍
+/* -------------------- 下拉数据 -------------------- */
-const sheepfoldOptions = ref([]);
+function loadSheepfold() {
-
-function getSheepfoldOptions() {
-  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
-    sheepfoldOptions.value = res.rows;   // [{id, sheepfoldName}, ...]
-  });
-}
-
-onMounted(() => {
-  getSheepfoldOptions();
-});
-
-
-const sheepfoldNameMap = ref({})
-
-function loadSheepfoldMap() {
   listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
     sheepfoldNameMap.value = res.rows.reduce((acc, item) => {
       acc[item.id] = item.sheepfoldName
       return acc
     }, {})
   })
 }
-
+function getVarietyOptions() {
-onMounted(() => {
+  request({
-  nextTick(() => {
+    url: '/base/variety/list',
-    if (trans_group_reason.value && trans_group_reason.value.length) {
+    method: 'get',
-      trans_group_reason.value.forEach(item => {
+    params: { pageNum: 1, pageSize: 9999 }
-        item.value = Number(item.value)
+  }).then(res => {
+    varietyOptions.value = res.rows || []
   })
 }
-    loadSheepfoldMap()
-  })
-})
-
 
+/* -------------------- 初始化 -------------------- */
+onMounted(() => {
+  loadSheepfold()
+  getVarietyOptions()
   getList()
+})
 </script>

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

@@ -1,102 +1,68 @@
 <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="true" v-show="showSearch" label-width="80px">
       <el-form-item label="羊只id" prop="sheepId">
-        <el-input
+        <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
-          v-model="queryParams.sheepId"
-          placeholder="请输入羊只id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
       </el-form-item>
-      <el-form-item label="转入牧场" prop="transTo">
+
-        <el-input
+      <el-form-item label="品种" prop="varietyId">
-          v-model="queryParams.transTo"
+        <el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
-          placeholder="请输入转入牧场"
+          <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="当前牧场" prop="transFrom">
-        <el-input
-          v-model="queryParams.transFrom"
-          placeholder="请输入当前牧场"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" style="width: 150px;" placeholder="请选择状态" clearable>
-          <el-option
-            v-for="dict in status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px">
+
-        <el-date-picker
+      <el-form-item label="转入牧场" prop="transTo">
-          v-model="daterangeCreateTime"
+        <el-input v-model="queryParams.transTo" placeholder="请输入转入牧场" clearable @keyup.enter="handleQuery" />
-          value-format="YYYY-MM-DD"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
       </el-form-item>
+
+      <el-form-item label="当前牧场" prop="transFrom">
+        <el-input v-model="queryParams.transFrom" placeholder="请输入当前牧场" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" style="width: 150px" placeholder="请选择状态" clearable>
+          <el-option v-for="dict in status" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-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
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
-          type="primary"
+                   v-hasPermi="['transition_info:transition_info:add']">新增</el-button>
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['transition_info:transition_info:add']"
-        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-          type="success"
+                   v-hasPermi="['transition_info:transition_info:edit']">修改</el-button>
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['transition_info:transition_info:edit']"
-        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-          type="danger"
+                   v-hasPermi="['transition_info:transition_info:remove']">删除</el-button>
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['transition_info:transition_info:remove']"
-        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="warning" plain icon="Download" @click="handleExport"
-          type="warning"
+                   v-hasPermi="['transition_info:transition_info:export']">导出</el-button>
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['transition_info:transition_info:export']"
-        >导出</el-button>
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
 
+    <!-- 列表 -->
     <el-table v-loading="loading" :data="transition_infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="" align="center" prop="id" /> -->
       <el-table-column label="羊只id"  align="center" prop="sheepId" />
+      <el-table-column label="品种"    align="center" prop="varietyName" />
       <el-table-column label="转入牧场" align="center" prop="transTo" />
       <el-table-column label="当前牧场" align="center" prop="transFrom" />
       <el-table-column label="转场类型" align="center" prop="transType">
@@ -117,51 +83,57 @@
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="180">
+      <el-table-column label="操作" align="center" min-width="180">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)" v-hasPermi="['transition_info:transition_info:approve']">审批</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['transition_info:transition_info:remove']">删除</el-button>
+                     v-hasPermi="['transition_info:transition_info:approve']">审批</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['transition_info:transition_info:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <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-form ref="transition_infoRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="羊只id" prop="sheepId">
           <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
         </el-form-item>
+
+        <el-form-item label="品种" prop="varietyId">
+          <el-select v-model="form.varietyId" placeholder="请选择品种" clearable>
+            <el-option v-for="item in varietyOptions" :key="item.id"
+                       :label="item.variety" :value="Number(item.id)" />
+          </el-select>
+        </el-form-item>
+
         <el-form-item label="转入牧场" prop="transTo">
           <el-input v-model="form.transTo" placeholder="请输入转入牧场" />
         </el-form-item>
+
         <el-form-item label="当前牧场" prop="transFrom">
           <el-input v-model="form.transFrom" placeholder="请输入当前牧场" />
         </el-form-item>
+
         <el-form-item label="转场类型" prop="transType">
           <el-select v-model="form.transType" placeholder="请选择转场类型">
-            <el-option
+            <el-option v-for="dict in trans_type" :key="dict.value"
-              v-for="dict in trans_type"
+                       :label="dict.label" :value="parseInt(dict.value)" />
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
           </el-select>
         </el-form-item>
+
         <el-form-item label="技术员" prop="technician">
           <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
+
         <el-form-item label="备注" prop="comment">
           <el-input v-model="form.comment" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
+
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -169,37 +141,21 @@
         </div>
       </template>
     </el-dialog>
-  </div>
 
     <!-- 审批对话框 -->
     <el-dialog :title="'审批转场记录'" v-model="approveDialog" width="500px" append-to-body>
       <el-form ref="approveFormRef" :model="approveForm" label-width="120px">
-    <el-form-item label="羊只id">
+        <el-form-item label="羊只id"><el-input v-model="approveForm.sheepId" disabled /></el-form-item>
-      <el-input v-model="approveForm.sheepId" disabled />
+        <el-form-item label="品种"><el-input :value="approveForm.varietyName" disabled /></el-form-item>
-    </el-form-item>
+        <el-form-item label="转入牧场"><el-input v-model="approveForm.transTo" disabled /></el-form-item>
-    <el-form-item label="转入牧场">
+        <el-form-item label="当前牧场"><el-input v-model="approveForm.transFrom" disabled /></el-form-item>
-      <el-input v-model="approveForm.transTo" disabled />
-    </el-form-item>
-    <el-form-item label="当前牧场">
-      <el-input v-model="approveForm.transFrom" disabled />
-    </el-form-item>
         <el-form-item label="转场类型">
-      <el-select v-model="approveForm.transType" disabled>
+          <el-input :value="getTransTypeLabel(approveForm.transType)" disabled />
-        <el-option
-          v-for="dict in trans_type"
-          :key="dict.value"
-          :label="dict.label"
-          :value="dict.value"
-        />
-      </el-select>
-    </el-form-item>
-    <el-form-item label="技术员">
-      <el-input v-model="approveForm.technician" disabled />
-    </el-form-item>
-    <el-form-item label="备注">
-      <el-input v-model="approveForm.comment" disabled />
         </el-form-item>
+        <el-form-item label="技术员"><el-input v-model="approveForm.technician" disabled /></el-form-item>
+        <el-form-item label="备注"><el-input v-model="approveForm.comment" disabled /></el-form-item>
       </el-form>
+
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="handleApproveAgree">同意</el-button>
@@ -207,14 +163,17 @@
         </div>
       </template>
     </el-dialog>
+  </div>
 </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 request from '@/utils/request'
 
 const { proxy } = getCurrentInstance()
 const { status, trans_type } = proxy.useDict('status', 'trans_type')
 
+/* -------------------- 响应式数据 -------------------- */
 const transition_infoList = ref([])
 const open           = ref(false)
 const loading        = ref(true)
@@ -223,27 +182,34 @@ const ids = ref([])
 const single         = ref(true)
 const multiple       = ref(true)
 const total          = ref(0)
-const title = ref("")
+const title          = ref('')
 const daterangeCreateTime = ref([])
 
+const approveDialog = ref(false)
+const approveForm   = ref({})
+
+const varietyOptions = ref([])
+
+/* -------------------- 查询 / 表单 -------------------- */
 const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     sheepId: null,
+    varietyId: null,
     transTo: null,
     transFrom: null,
     status: null,
     createTime: null
   },
   rules: {
-    id: [
-      { required: true, message: "不能为空", trigger: "blur" }
-    ],
     sheepId: [
       { required: true, message: "羊只id不能为空", trigger: "blur" }
     ],
+    varietyId: [
+      { required: true, message: "品种不能为空", trigger: "change" }
+    ],
     transTo: [
       { required: true, message: "转入牧场不能为空", trigger: "blur" }
     ],
@@ -255,38 +221,31 @@ const data = reactive({
     ],
     technician: [
       { required: true, message: "技术员不能为空", trigger: "blur" }
-    ],
+    ]
   }
 })
-
 const { queryParams, form, rules } = toRefs(data)
 
-/** 查询转场列表 */
+/* -------------------- 基础方法 -------------------- */
 function getList() {
   loading.value = true
   queryParams.value.params = {}
-  if (null != daterangeCreateTime && '' != daterangeCreateTime) {
+  if (daterangeCreateTime.value?.length) {
-    queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
+    queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
-    queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
+    queryParams.value.params.endCreateTime   = daterangeCreateTime.value[1]
   }
-  listTransition_info(queryParams.value).then(response => {
+  listTransition_info(queryParams.value).then(res => {
-    transition_infoList.value = response.rows
+    transition_infoList.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,
+    varietyId: null,
     transTo: null,
     transFrom: null,
     transType: null,
@@ -299,34 +258,29 @@ function reset() {
   proxy.resetForm("transition_infoRef")
 }
 
-/** 搜索按钮操作 */
+function cancel() {
+  open.value = false
+  reset()
+}
 function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
-
-/** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
   proxy.resetForm("queryRef")
   handleQuery()
 }
-
-// 多选框选中数据
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.id)
-  single.value = selection.length != 1
+  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
@@ -336,78 +290,70 @@ function handleUpdate(row) {
     title.value = "修改转场"
   })
 }
-
-/** 提交按钮 */
 function submitForm() {
   proxy.$refs["transition_infoRef"].validate(valid => {
-    if (valid) {
+    if (!valid) return
-      if (form.value.id != null) {
+    const api = form.value.id ? updateTransition_info : addTransition_info
-        updateTransition_info(form.value).then(response => {
+    api(form.value).then(() => {
-          proxy.$modal.msgSuccess("修改成功")
+      proxy.$modal.msgSuccess(form.value.id ? "修改成功" : "新增成功")
       open.value = false
       getList()
     })
-      } else {
-        addTransition_info(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
   })
 }
-    }
-  })
-}
-
-/** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除转场编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除转场编号为"' + _ids + '"的数据项？')
-    return delTransition_info(_ids)
+    .then(() => delTransition_info(_ids))
-  }).then(() => {
+    .then(() => {
       getList()
       proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+    })
 }
-
-/** 导出按钮操作 */
 function handleExport() {
-  proxy.download('/produce/manage_sheep/transition_info/export', {
+  proxy.download('/produce/manage_sheep/transition_info/export',
-    ...queryParams.value
+    { ...queryParams.value },
-  }, `transition_info_${new Date().getTime()}.xlsx`)
+    `transition_info_${new Date().getTime()}.xlsx`)
 }
-// 审批记录的对话框
-const approveDialog = ref(false);
-const approveForm = ref({});
 
-// 审批按钮操作
+/* -------------------- 审批 -------------------- */
 function handleApprove(row) {
-  // 打开审批对话框
+  approveForm.value = { ...row }
-  approveForm.value = { ...row };
+  approveDialog.value = true
-  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; // 状态设置为同意
+  approveForm.value.status = 1
   updateTransition_info(approveForm.value).then(() => {
-    approveDialog.value = false;
+    approveDialog.value = false
-    proxy.$modal.msgSuccess("审批成功，状态已更新为同意");
+    proxy.$modal.msgSuccess("审批成功，状态已更新为同意")
-    getList();
+    getList()
-  }).catch((error) => {
+  })
-    proxy.$modal.msgError(`审批失败：${error}`);
+}
-  });
+function handleApproveReject() {
+  approveForm.value.status = 2
+  updateTransition_info(approveForm.value).then(() => {
+    approveDialog.value = false
+    proxy.$modal.msgSuccess("审批成功，状态已更新为驳回")
+    getList()
+  })
 }
 
-// 驳回审批
+/* -------------------- 下拉 -------------------- */
-function handleApproveReject() {
+function getVarietyOptions() {
-  approveForm.value.status = 2; // 状态设置为驳回
+  request({
-  updateTransition_info(approveForm.value).then(() => {
+    url: '/base/variety/list',
-    approveDialog.value = false;
+    method: 'get',
-    proxy.$modal.msgSuccess("审批成功，状态已更新为驳回");
+    params: { pageNum: 1, pageSize: 9999 }
-    getList();
+  }).then(res => { varietyOptions.value = res.rows || [] })
-  }).catch((error) => {
-    proxy.$modal.msgError(`审批失败：${error}`);
-  });
 }
+
+/* -------------------- 入口 -------------------- */
+onMounted(() => {
+  getVarietyOptions()
   getList()
+})
 </script>

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

@@ -1,24 +1,35 @@
 <template>
   <div class="app-container">
+    <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="羊只id" prop="sheepId">
         <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
       </el-form-item>
+
       <el-form-item label="羊舍" prop="sheepfold">
         <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
       </el-form-item>
+
+      <el-form-item label="品种" prop="varietyId">
+        <el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
+          <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="创建时间" style="width: 308px">
         <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
+    <!-- 按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
@@ -36,14 +47,15 @@
         <el-button type="warning" plain icon="Download" @click="handleExport"
           v-hasPermi="['produce:castrate:export']">导出</el-button>
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
 
+    <!-- 列表表格 -->
     <el-table v-loading="loading" :data="castrateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
       <el-table-column label="羊只id" align="center" prop="sheepId" />
       <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
+      <el-table-column label="品种" align="center" prop="varietyName" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="技术员" align="center" prop="technician" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -64,7 +76,7 @@
     <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="castrateRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="羊只id" prop="sheepId">
@@ -75,6 +87,11 @@
             <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
           </el-select>
         </el-form-item>
+        <el-form-item label="品种" prop="varietyId">
+          <el-select v-model="form.varietyId" placeholder="请选择品种" clearable>
+            <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="技术员" prop="technician">
           <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
@@ -93,8 +110,9 @@
 </template>
 
 <script setup name="castrate">
-import { listCastrate, getCastrate, delCastrate, addCastrate, updateCastrate } from "@/api/produce/other/castrate/castrate"
+import { listCastrate, getCastrate, delCastrate, addCastrate, updateCastrate } from '@/api/produce/other/castrate/castrate'
-import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management';
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
+import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance()
 
@@ -106,7 +124,7 @@ const ids = ref([])
 const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
-const title = ref("")
+const title = ref('')
 const daterangeCreateTime = ref([])
 
 const data = reactive({
@@ -116,149 +134,151 @@ const data = reactive({
     pageSize: 10,
     sheepId: null,
     sheepfold: null,
+    varietyId: null,
     technician: null,
     createTime: null
   },
   rules: {
-    id: [
-      { required: true, message: "$comment不能为空", trigger: "blur" }
-    ],
     sheepId: [
-      { required: true, message: "羊只id不能为空", trigger: "blur" }
+      { required: true, message: '羊只id不能为空', trigger: 'blur' }
     ],
     sheepfold: [
-      { required: true, message: "羊舍不能为空", trigger: "change" }
+      { required: true, message: '羊舍不能为空', trigger: 'change' }
+    ],
+    varietyId: [
+      { required: true, message: '品种不能为空', trigger: 'change' }
     ],
     technician: [
-      { required: true, message: "技术员不能为空", trigger: "blur" }
+      { required: true, message: '技术员不能为空', trigger: 'blur' }
-    ],
+    ]
   }
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
-/** 查询去势列表 */
+/** 查询列表 */
 function getList() {
   loading.value = true
   queryParams.value.params = {}
-  if (null != daterangeCreateTime && '' != daterangeCreateTime) {
+  if (daterangeCreateTime.value && daterangeCreateTime.value.length === 2) {
-    queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
+    queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
-    queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
+    queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
   }
-  listCastrate(queryParams.value).then(response => {
+  listCastrate(queryParams.value).then(res => {
-    castrateList.value = response.rows
+    castrateList.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,
     sheepfold: null,
+    varietyId: null,
     comment: null,
     technician: null,
     createBy: null,
     createTime: null
   }
-  proxy.resetForm("castrateRef")
+  proxy.resetForm('castrateRef')
 }
 
-/** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
-/** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
-  proxy.resetForm("queryRef")
+  proxy.resetForm('queryRef')
   handleQuery()
 }
 
-// 多选框选中数据
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.id)
-  single.value = selection.length != 1
+  single.value = selection.length !== 1
   multiple.value = !selection.length
 }
 
-/** 新增按钮操作 */
 function handleAdd() {
   reset()
   open.value = true
-  title.value = "添加去势"
+  title.value = '添加去势'
 }
 
-/** 修改按钮操作 */
 function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getCastrate(_id).then(response => {
+  getCastrate(_id).then(res => {
-    form.value = response.data
+    form.value = res.data
     open.value = true
-    title.value = "修改去势"
+    title.value = '修改去势'
   })
 }
 
-/** 提交按钮 */
 function submitForm() {
-  proxy.$refs["castrateRef"].validate(valid => {
+  proxy.$refs.castrateRef.validate(valid => {
-    if (valid) {
+    if (!valid) return
-      if (form.value.id != null) {
+    if (form.value.id) {
-        updateCastrate(form.value).then(response => {
+      updateCastrate(form.value).then(() => {
-          proxy.$modal.msgSuccess("修改成功")
+        proxy.$modal.msgSuccess('修改成功')
         open.value = false
         getList()
       })
     } else {
-        addCastrate(form.value).then(response => {
+      addCastrate(form.value).then(() => {
-          proxy.$modal.msgSuccess("新增成功")
+        proxy.$modal.msgSuccess('新增成功')
         open.value = false
         getList()
       })
     }
-    }
   })
 }
 
-/** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除去势编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm(`是否确认删除去势编号为"${_ids}"的数据项？`).then(() => {
     return delCastrate(_ids)
   }).then(() => {
     getList()
-    proxy.$modal.msgSuccess("删除成功")
+    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => { })
+  })
 }
 
-/** 导出按钮操作 */
 function handleExport() {
-  proxy.download('/produce/other/castrate/export', {
+  proxy.download('/produce/other/castrate/export', { ...queryParams.value }, `castrate_${new Date().getTime()}.xlsx`)
-    ...queryParams.value
-  }, `castrate_${new Date().getTime()}.xlsx`)
 }
 
-/** 加载所有羊舍 */
+const sheepfoldOptions = ref([])
-const sheepfoldOptions = ref([]);
 function getSheepfoldOptions() {
   listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
-    sheepfoldOptions.value = res.rows;   // [{id, sheepfoldName}, ...]
+    sheepfoldOptions.value = res.rows
-  });
+  })
 }
+
+const varietyOptions = ref([])
+function getVarietyOptions() {
+  request({
+    url: '/base/variety/list',
+    method: 'get',
+    params: { pageNum: 1, pageSize: 9999 }
+  }).then(res => {
+    varietyOptions.value = res.rows || []
+    console.log(varietyOptions.value);
+    
+  })
+}
+
 onMounted(() => {
-  getList();
-  getSheepfoldOptions();  
-});
   getList()
+  getSheepfoldOptions()
+  getVarietyOptions()
+})
 </script>

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

@@ -1,23 +1,35 @@
 <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="管理耳号" prop="manageTags">
-        <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
+        <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery" />
       </el-form-item>
+
       <el-form-item label="羊舍" prop="sheepfold">
-        <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width: 150px;" clearable>
+        <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
       </el-form-item>
+
+      <el-form-item label="品种" prop="varietyId">
+        <el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
+          <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="创建时间" style="width: 308px">
         <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+
+    <!-- 按钮 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
@@ -35,14 +47,15 @@
         <el-button type="warning" plain icon="Download" @click="handleExport"
           v-hasPermi="['fixHoof:fixHoof:export']">导出</el-button>
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
 
+    <!-- 列表 -->
     <el-table v-loading="loading" :data="fixHoofList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
+      <el-table-column label="耳号" align="center" prop="manageTags" />
-      <el-table-column label="羊只id" align="center" prop="sheepId" />
       <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
+      <el-table-column label="品种" align="center" prop="varietyName" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="技术员" align="center" prop="technician" />
       <el-table-column label="创建人" align="center" prop="createBy" />
@@ -64,17 +77,22 @@
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize" @pagination="getList" />
 
-    <!-- 添加或修改修蹄对话框 -->
+    <!-- 弹窗 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="fixHoofRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="羊只id" prop="sheepId">
+        <el-form-item label="耳号" prop="manageTags">
-          <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+          <el-input v-model="form.manageTags" placeholder="请输入耳号" @blur="validateSheep" />
         </el-form-item>
         <el-form-item label="羊舍" prop="sheepfold">
           <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
             <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
           </el-select>
         </el-form-item>
+        <el-form-item label="品种" prop="varietyId">
+          <el-select v-model="form.varietyId" placeholder="请选择品种" clearable>
+            <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="备注" prop="comment">
           <el-input v-model="form.comment" placeholder="请输入备注" />
         </el-form-item>
@@ -93,8 +111,9 @@
 </template>
 
 <script setup name="FixHoof">
-import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof } from "@/api/produce/other/fixHoof/fixHoof"
+import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof, checkSheepByManageTags, getVarietyOptions } from '@/api/produce/other/fixHoof/fixHoof'
-import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management';
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
+// import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance()
 
@@ -106,8 +125,9 @@ const ids = ref([])
 const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
-const title = ref("")
+const title = ref('')
 const daterangeCreateTime = ref([])
+const varietyOptions = ref([])
 
 const data = reactive({
   form: {},
@@ -116,31 +136,34 @@ const data = reactive({
     pageSize: 10,
     sheepId: null,
     sheepfold: null,
+    varietyId: null,
     technician: null,
     createTime: null
   },
   rules: {
-    id: [
+    // sheepId: [
-      { required: true, message: "$comment不能为空", trigger: "blur" }
+    //   { required: true, message: '耳号不能为空', trigger: 'blur' }
-    ],
+    // ],
-    sheepId: [
+    manageTags: [
-      { required: true, message: "羊只id不能为空", trigger: "blur" }
+      { required: true, message: '耳号不能为空', trigger: 'blur' }
     ],
     sheepfold: [
-      { required: true, message: "羊舍id不能为空", trigger: "change" }
+      { required: true, message: '羊舍id不能为空', trigger: 'change' }
+    ],
+    varietyId: [
+      { required: true, message: '品种不能为空', trigger: 'change' }
     ],
     technician: [
-      { required: true, message: "技术员不能为空", trigger: "blur" }
+      { required: true, message: '技术员不能为空', trigger: 'blur' }
-    ],
+    ]
   }
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
-/** 查询修蹄列表 */
+/* 列表 */
 function getList() {
   loading.value = true
-  // 空字符串转 null
   const q = { ...queryParams.value }
   if (q.sheepId === '') q.sheepId = null
   if (q.sheepfold === '') q.sheepfold = null
@@ -154,116 +177,131 @@ function getList() {
     total.value = res.total
     loading.value = false
   })
+   getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
+    varietyOptions.value = res.rows || []
+  })
 }
 
-// 取消按钮
 function cancel() {
   open.value = false
   reset()
 }
 
-// 表单重置
 function reset() {
   form.value = {
     id: null,
     sheepId: null,
     sheepfold: null,
+    varietyId: null,
     comment: null,
     technician: null,
     createBy: null,
     createTime: null
   }
-  proxy.resetForm("fixHoofRef")
+  proxy.resetForm('fixHoofRef')
 }
 
-/** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
-/** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
-  proxy.resetForm("queryRef")
+  proxy.resetForm('queryRef')
   handleQuery()
 }
 
-// 多选框选中数据
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.id)
-  single.value = selection.length != 1
+  single.value = selection.length !== 1
   multiple.value = !selection.length
 }
 
-/** 新增按钮操作 */
 function handleAdd() {
   reset()
   open.value = true
-  title.value = "添加修蹄"
+  title.value = '添加修蹄'
 }
 
-/** 修改按钮操作 */
 function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getFixHoof(_id).then(response => {
+  getFixHoof(_id).then(res => {
-    form.value = response.data
+    form.value = res.data
     open.value = true
-    title.value = "修改修蹄"
+    title.value = '修改修蹄'
   })
 }
 
-/** 提交按钮 */
 function submitForm() {
-  proxy.$refs["fixHoofRef"].validate(valid => {
+  proxy.$refs.fixHoofRef.validate(valid => {
-    if (valid) {
+    if (!valid) return
-      if (form.value.id != null) {
+    if (form.value.id) {
-        updateFixHoof(form.value).then(response => {
+      updateFixHoof(form.value).then(() => {
-          proxy.$modal.msgSuccess("修改成功")
+        proxy.$modal.msgSuccess('修改成功')
         open.value = false
         getList()
       })
     } else {
-        addFixHoof(form.value).then(response => {
+      addFixHoof(form.value).then(() => {
-          proxy.$modal.msgSuccess("新增成功")
+        proxy.$modal.msgSuccess('新增成功')
         open.value = false
         getList()
       })
     }
-    }
   })
 }
 
-/** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除修蹄编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm(`是否确认删除修蹄编号为"${_ids}"的数据项？`).then(() => {
     return delFixHoof(_ids)
   }).then(() => {
     getList()
-    proxy.$modal.msgSuccess("删除成功")
+    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => { })
+  })
 }
 
-/** 导出按钮操作 */
 function handleExport() {
-  proxy.download('/produce/other/fixHoof/export', {
+  proxy.download('/produce/other/fixHoof/export', { ...queryParams.value }, `fixHoof_${new Date().getTime()}.xlsx`)
-    ...queryParams.value
-  }, `fixHoof_${new Date().getTime()}.xlsx`)
 }
 
-/**加载所有羊舍*/
+/* 羊舍 */
-const sheepfoldOptions = ref([]);
+const sheepfoldOptions = ref([])
 function getSheepfoldOptions() {
   listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
-    sheepfoldOptions.value = res.rows;
+    sheepfoldOptions.value = res.rows
-  });
+  })
 }
-onMounted(() => {
-  getList();
-  getSheepfoldOptions();
-});
 
+//校验羊只是否存在 失焦时校验
+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(() => {
+  getSheepfoldOptions()
+  getVarietyOptions()
   getList()
+})
 </script>