Merge remote-tracking branch 'origin/main'

src/api/feed/FeedList.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询配料清单列表
+export function listFeedList(query) {
+  return request({
+    url: '/feed/FeedList/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询配料清单详细
+export function getFeedList(id) {
+  return request({
+    url: '/feed/FeedList/' + id,
+    method: 'get'
+  })
+}
+
+// 新增配料清单
+export function addFeedList(data) {
+  return request({
+    url: '/feed/FeedList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改配料清单
+export function updateFeedList(data) {
+  return request({
+    url: '/feed/FeedList',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除配料清单
+export function delFeedList(id) {
+  return request({
+    url: '/feed/FeedList/' + id,
+    method: 'delete'
+  })
+}

src/views/biosafety/deworm/index.vue

@@ -2,13 +2,13 @@
   <div class="app-container">
     <!-- 1. 搜索 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
-      <el-form-item label="羊只耳号" prop="sheepNo">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
-      </el-form-item>
       <el-form-item label="驱虫日期">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
+      <el-form-item label="羊只耳号" prop="sheepNo">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
+      </el-form-item>
       <el-form-item label="技术员" prop="technical">
         <el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
       </el-form-item>
@@ -29,6 +29,9 @@
     <!-- 3. 列表 -->
     <el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="驱虫日期" align="center" prop="datetime" width="180">
+        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
+      </el-table-column>
       <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="品种" align="center" prop="variety" />
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
@@ -40,9 +43,6 @@
       <el-table-column label="月龄" align="center" prop="monthAge" />
       <el-table-column label="胎次" align="center" prop="parity" />
       <el-table-column label="繁殖状态" align="center" prop="breed" />
-      <el-table-column label="驱虫日期" align="center" prop="datetime" width="180">
-        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
-      </el-table-column>
       <el-table-column label="技术员" align="center" prop="technical" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200">
@@ -225,7 +225,7 @@
             </el-table-column>
             <el-table-column label="用量" width="160">
               <template #default="scope">
-                <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;"/>
+                <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;" />
               </template>
             </el-table-column>
             <el-table-column label="单位" width="120">

src/views/biosafety/diagnosis/index.vue

@@ -2,14 +2,13 @@
   <div class="app-container">
     <!-- 查询区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="羊只" prop="sheepId">
+      <el-form-item label="事件日期" style="width: 308px">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
-      </el-form-item>
-
-      <el-form-item label="时间日期" style="width: 308px">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
+      <el-form-item label="羊只" prop="sheepId">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
+      </el-form-item>
 
       <el-form-item label="疾病类型" prop="diseasePid">
         <el-select v-model="queryParams.diseasePid" clearable placeholder="请选择疾病类型" style="width: 120px;" filterable
@@ -68,7 +67,7 @@
     <el-table v-loading="loading" :data="diagnosisList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="耳号" align="center" prop="sheepNo" />
-      <el-table-column label="时间日期" align="center" prop="datetime" width="150">
+      <el-table-column label="事件日期" align="center" prop="datetime" width="150">
         <template #default="scope">
           <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -127,8 +126,7 @@
 
           <el-col :span="8">
             <el-form-item label="性别">
-              <span class="readonly-text"> <dict-tag :options="sheep_gender"
+              <span class="readonly-text"> <dict-tag :options="sheep_gender" :value="form.gender" /></span>
-                    :value="form.gender" /></span>
             </el-form-item>
           </el-col>
           <el-col :span="8">

src/views/biosafety/disease/index.vue

@@ -82,6 +82,7 @@ const title = ref("")
 const isExpandAll = ref(true)
 const refreshTable = ref(true)
 
+
 const data = reactive({
     form: {},
     queryParams: {
@@ -99,6 +100,7 @@ const { queryParams, form, rules } = toRefs(data)
 function getList() {
     loading.value = true
     listDisease(queryParams.value).then(response => {
+
         diseaseList.value = proxy.handleTree(response.data, "id", "pid")
         loading.value = false
     })
@@ -107,10 +109,7 @@ function getList() {
 /** 查询疾病下拉树结构 */
 function getTreeselect() {
     listDisease().then(response => {
-        diseaseOptions.value = []
+        diseaseOptions.value = response.data.filter(item => item.pid === 0) 
-        const data = { id: 0, name: '疾病', children: [] }
-        data.children = proxy.handleTree(response.data, "id", "pid")
-        diseaseOptions.value.push(data)
     })
 }
 

src/views/biosafety/disinfect/index.vue

@@ -2,17 +2,26 @@
   <div class="app-container">
     <!-- 搜索栏 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="80px">
+      <el-form-item label="消毒日期">
+        <!-- 1️⃣ 改为 datetimerange -->
+        <el-date-picker v-model="daterangeDatetime" type="daterange" range-separator="-" start-placeholder="开始日期"
+          end-placeholder="结束日期" value-format="YYYY-MM-DD HH:mm" />
+      </el-form-item>
+
+      <el-form-item label="消毒方式" prop="way">
+        <el-select v-model="queryParams.way" clearable placeholder="请选择消毒方式" filterable style="width: 200px">
+          <el-option v-for="item in disinfect_type" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="药品名称" prop="mediName">
+        <el-input v-model="queryParams.mediName" placeholder="请输入药品" clearable />
+      </el-form-item>
       <el-form-item label="羊舍" prop="sheepfoldId">
         <el-select v-model="queryParams.sheepfoldId" clearable placeholder="请选择羊舍" filterable style="width: 200px">
           <el-option v-for="b in barns" :key="b.id" :label="b.sheepfoldName" :value="b.id" />
         </el-select>
       </el-form-item>
 
-      <el-form-item label="消毒日期">
-        <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
-
       <el-form-item label="技术员" prop="technician">
         <el-input v-model="queryParams.technician" placeholder="请输入技术员" clearable />
       </el-form-item>
@@ -34,13 +43,21 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="disinfectList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
       <el-table-column label="消毒日期" align="center" prop="datetime" width="180">
-        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
+        <!-- 2️⃣ 显示格式含时分 -->
+        <template #default="scope">
+          {{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}
+        </template>
       </el-table-column>
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
       <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="消毒方式" align="center" prop="way" />
+      <el-table-column label="消毒方式" align="center" prop="way">
+        <template #default="scope">
+          <dict-tag :options="disinfect_type" :value="scope.row.way" />
+        </template>
+      </el-table-column>
       <el-table-column label="比例" align="center" prop="ratio" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200">
         <template #default="scope">
@@ -66,8 +83,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <!-- 3️⃣ type=datetime -->
             <el-form-item label="消毒日期" prop="datetime">
-              <el-date-picker v-model="form.datetime" type="date" value-format="YYYY-MM-DD" style="width: 100%" />
+              <el-date-picker v-model="form.date" type="datetime" value-format="YYYY-MM-DD"
+                style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -82,7 +101,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="技术员">
+            <el-form-item label="技术员" prop="technician">
               <el-input v-model="form.technician" placeholder="请输入技术员姓名" />
             </el-form-item>
           </el-col>
@@ -90,8 +109,10 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="消毒方式">
+            <el-form-item label="消毒方式" prop="way">
-              <el-input v-model="form.way" placeholder="请输入消毒方式" />
+              <el-select v-model="form.way" clearable placeholder="请选择消毒方式" filterable>
+                <el-option v-for="item in disinfect_type" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -169,8 +190,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <!-- 4️⃣ 同样 type=datetime -->
             <el-form-item label="消毒日期" prop="datetime">
-              <el-date-picker v-model="editForm.datetime" type="date" value-format="YYYY-MM-DD" style="width: 100%" />
+              <el-date-picker v-model="editForm.datetime" type="date" value-format="YYYY-MM-DD"
+                style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -186,7 +209,9 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="消毒方式">
-              <el-input v-model="editForm.way" placeholder="请输入消毒方式" />
+              <el-select v-model="editForm.way" clearable placeholder="请选择消毒方式" filterable>
+                <el-option v-for="item in disinfect_type" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -214,14 +239,14 @@
             <el-table-column label="单位" width="120">
               <template #default="scope">
                 <el-select v-model="scope.row.unit" placeholder="单位">
-                  <el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value" />
+                  <el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value+''" />
                 </el-select>
               </template>
             </el-table-column>
             <el-table-column label="用法" width="120">
               <template #default="scope">
                 <el-select v-model="scope.row.usageId" placeholder="用法">
-                  <el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value" />
+                  <el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value+''" />
                 </el-select>
               </template>
             </el-table-column>
@@ -267,8 +292,9 @@ import request from '@/utils/request'
 import { parseTime } from '@/utils/ruoyi'
 
 const { proxy } = getCurrentInstance()
+const { disinfect_type } = proxy.useDict('disinfect_type')
 
-/* ------------------ 列表 ------------------ */
+/* ---------- 列表 ---------- */
 const loading = ref(true)
 const showSearch = ref(true)
 const total = ref(0)
@@ -318,13 +344,25 @@ function resetQuery() {
   handleQuery()
 }
 
-/* ------------------ 新增弹窗 ------------------ */
+/* ---------- 新增弹窗 ---------- */
 const openAdd = ref(false)
 const titleAdd = ref('新增消毒记录')
+
+// 5️⃣ 默认当前分钟
+const nowMinute = () => {
+  const d = new Date()
+  const Y = d.getFullYear()
+  const M = String(d.getMonth() + 1).padStart(2, '0')
+  const D = String(d.getDate()).padStart(2, '0')
+  const h = String(d.getHours()).padStart(2, '0')
+  const m = String(d.getMinutes()).padStart(2, '0')
+  return `${Y}-${M}-${D} ${h}:${m}`
+}
+
 const form = reactive({
   id: null,
   technician: '',
-  datetime: new Date().toISOString().split('T')[0],
+  datetime: new Date().toISOString().slice(0, 10),
   way: '',
   ratio: '',
   comment: '',
@@ -337,7 +375,7 @@ function resetAdd() {
   Object.assign(form, {
     id: null,
     technician: '',
-    datetime: new Date().toISOString().split('T')[0],
+    datetime: new Date().toISOString().slice(0, 10),
     way: '',
     ratio: '',
     comment: '',
@@ -372,13 +410,13 @@ function submitAdd() {
   })
 }
 
-/* ------------------ 修改弹窗 ------------------ */
+/* ---------- 修改弹窗 ---------- */
 const openEdit = ref(false)
 const titleEdit = ref('修改消毒记录')
 const editForm = reactive({
   id: null,
   technician: '',
-  datetime: new Date().toISOString().split('T')[0],
+  datetime: nowMinute(),
   way: '',
   ratio: '',
   comment: '',
@@ -391,7 +429,7 @@ function resetEdit() {
   Object.assign(editForm, {
     id: null,
     technician: '',
-    datetime: new Date().toISOString().split('T')[0],
+    datetime: nowMinute(),
     way: '',
     ratio: '',
     comment: '',
@@ -405,6 +443,8 @@ function handleUpdate(row) {
   resetEdit()
   const id = row.id || ids.value[0]
   getDisinfect(id).then(res => {
+    // 后端返回的是时间戳，转成 YYYY-MM-DD HH:mm 字符串方便 el-date-picker 回显
+    editForm.datetime = parseTime(res.data.datetime, '{y}-{m}-{d} {h}:{i}')
     Object.assign(editForm, res.data)
     editDetails.value = res.data.usageDetails || []
     openEdit.value = true
@@ -431,7 +471,7 @@ function submitEdit() {
   })
 }
 
-/* ------------------ 功能 ------------------ */
+/* ---------- 功能 ---------- */
 function handleDelete(row) {
   const _ids = row.id || ids.value
   proxy.$modal.confirm('是否确认删除选中的数据？').then(() => delDisinfect(_ids)).then(() => {
@@ -444,7 +484,7 @@ function handleExport() {
   proxy.download('biosafety/disinfect/export', { ...queryParams }, `disinfect_${Date.now()}.xlsx`)
 }
 
-/* ------------------ 下拉数据 ------------------ */
+/* ---------- 下拉数据 ---------- */
 const barns = ref([])
 const presOptions = ref([])
 const units = ref([])
@@ -454,10 +494,12 @@ const medicines = ref([])
 /* 校验规则 */
 const rules = {
   sheepfoldIds: [{ required: true, message: '请选择羊舍', trigger: 'change' }],
+  technician: [{ required: true, message: '请输入技术员', trigger: 'blur' }],
+  way: [{ required: true, message: '请选择消毒方式', trigger: 'change' }],
   datetime: [{ required: true, message: '请选择日期', trigger: 'change' }]
 }
 
-/* 处方选择事件 - 新增 */
+/* 处方选择事件 */
 function handleSelectPrescription(id) {
   if (!id) return
   getPrescription(id).then(res => {
@@ -469,8 +511,6 @@ function handleSelectPrescription(id) {
     })) || []
   })
 }
-
-/* 处方选择事件 - 修改 */
 function handleSelectPrescriptionEdit(id) {
   if (!id) return
   getPrescription(id).then(res => {
@@ -483,20 +523,18 @@ function handleSelectPrescriptionEdit(id) {
   })
 }
 
-/* 明细添加行 - 新增 */
+/* 明细添加行 */
 function handleAddDetail() {
   usageDetails.value.push({ mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: null, batchNumber: null })
 }
-
-/* 明细添加行 - 修改 */
 function handleAddDetailEdit() {
   editDetails.value.push({ mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: null, batchNumber: null })
 }
 
-/* ------------------ 初始加载 ------------------ */
+/* ---------- 初始加载 ---------- */
 onMounted(() => {
   getList()
-  /* 加载本地羊舍 */
+  /* 本地羊舍下拉 */
   request({ url: '/sheepfold_management/sheepfold_management/list', method: 'get' }).then(res => {
     barns.value = res.rows
   })

src/views/biosafety/health/index.vue

@@ -2,13 +2,13 @@
   <div class="app-container">
     <!-- 1. 搜索 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
-      <el-form-item label="羊只耳号" prop="sheepNo">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
-      </el-form-item>
       <el-form-item label="保健日期">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
+      <el-form-item label="羊只耳号" prop="sheepNo">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
+      </el-form-item>
       <el-form-item label="技术员" prop="technical">
         <el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
       </el-form-item>
@@ -29,6 +29,9 @@
     <!-- 3. 列表 -->
     <el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="保健日期" align="center" prop="datetime" width="180">
+        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
+      </el-table-column>
       <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="品种" align="center" prop="variety" />
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
@@ -40,9 +43,7 @@
       <el-table-column label="月龄" align="center" prop="monthAge" />
       <el-table-column label="胎次" align="center" prop="parity" />
       <el-table-column label="繁殖状态" align="center" prop="breed" />
-      <el-table-column label="保健日期" align="center" prop="datetime" width="180">
+
-        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
-      </el-table-column>
       <el-table-column label="技术员" align="center" prop="technical" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200">
@@ -122,7 +123,7 @@
             </el-table-column>
             <el-table-column label="用量" width="160">
               <template #default="scope">
-                <el-input-number v-model="scope.row.dosage" :min="0" :precision="1"  style="width: 120px;"/>
+                <el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;" />
               </template>
             </el-table-column>
             <el-table-column label="单位" width="120">

src/views/biosafety/immunity/index.vue

@@ -2,13 +2,13 @@
   <div class="app-container">
     <!-- 1. 搜索 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
-      <el-form-item label="羊只耳号" prop="sheepNo">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
-      </el-form-item>
       <el-form-item label="免疫日期">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
+      <el-form-item label="羊只耳号" prop="sheepNo">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
+      </el-form-item>
       <el-form-item label="技术员" prop="technical">
         <el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
       </el-form-item>
@@ -29,6 +29,9 @@
     <!-- 3. 列表 -->
     <el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="免疫日期" align="center" prop="datetime" width="180">
+        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
+      </el-table-column>
       <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="品种" align="center" prop="variety" />
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
@@ -40,9 +43,6 @@
       <el-table-column label="月龄" align="center" prop="monthAge" />
       <el-table-column label="胎次" align="center" prop="parity" />
       <el-table-column label="繁殖状态" align="center" prop="breed" />
-      <el-table-column label="免疫日期" align="center" prop="datetime" width="180">
-        <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
-      </el-table-column>
       <el-table-column label="技术员" align="center" prop="technical" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200">

src/views/biosafety/prescription/index.vue

@@ -51,6 +51,7 @@
           <dict-tag :options="pres_type" :value="scope.row.persType" />
         </template>
       </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
@@ -61,7 +62,8 @@
         <template #default="scope">
           <el-button link type="primary" icon="View" @click="handleView(scope.row)">详情</el-button>
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
-          <el-button link :type="scope.row.status ? 'warning' : 'primary'" @click="handleStatus(scope.row)">{{ scope.row.status?"禁用":"启用" }}</el-button>
+          <el-button link :type="scope.row.status ? 'warning' : 'primary'" @click="handleStatus(scope.row)">{{
+            scope.row.status?"禁用":"启用" }}</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>

src/views/biosafety/quarantine/index.vue

@@ -2,13 +2,37 @@
   <div class="app-container">
     <!-- 查询表单 -->
     <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
-      <el-form-item label="羊只" prop="sheepId">
-        <el-input v-model="queryParams.sheepId" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
-      </el-form-item>
       <el-form-item label="检疫日期">
         <el-date-picker v-model="daterangeDatetime" type="daterange" range-separator="-" start-placeholder="开始日期"
           end-placeholder="结束日期" value-format="YYYY-MM-DD" />
       </el-form-item>
+
+      <el-form-item label="检疫项目" prop="quarItem">
+        <el-select v-model="queryParams.quarItem" placeholder="请选择" filterable clearable style="width: 150px">
+          <el-option v-for="i in quarantineItems" :key="i.value" :label="i.label" :value="i.value" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="采样员" prop="sampler">
+        <el-input v-model="queryParams.sampler" placeholder="请输入采样员名字" clearable @keyup.enter="getList" />
+      </el-form-item>
+
+      <el-form-item label="检疫员" prop="quarOfficer">
+        <el-input v-model="queryParams.quarOfficer" placeholder="请输入检疫员名字" clearable @keyup.enter="getList" />
+      </el-form-item>
+
+      <el-form-item label="羊只类型" prop="sheepType">
+        <el-select v-model="queryParams.sheepType" placeholder="请选择" filterable clearable style="width: 150px">
+          <el-option v-for="i in sheepTypes" :key="i.value" :label="i.makeLabelFormatter" :value="i.label" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="样品类型" prop="sampleType">
+        <el-select v-model="queryParams.sampleType" placeholder="请选择" filterable clearable style="width: 150px">
+          <el-option v-for="i in sampleTypes" :key="i.value" :label="i.label" :value="i.value" />
+        </el-select>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="Search" @click="getList">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -31,11 +55,13 @@
     <!-- 表格 -->
     <el-table v-loading="loading" :data="quarantineList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="检疫日期" align="center" prop="datetime" width="180"
         :formatter="(_, __, v) => parseTime(v, '{y}-{m}-{d}')" />
-      <el-table-column label="羊只性别" align="center" prop="gender" >
+      <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
-         <template #default="scope"><dict-tag :options="sheep_gender" :value="scope.row.gender" /></template>
+      <el-table-column label="羊只性别" align="center" prop="gender">
+        <template #default="scope">
+          <dict-tag :options="sheep_gender" :value="scope.row.gender" />
+        </template>
       </el-table-column>
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
       <el-table-column label="月龄" align="center" prop="monthAge" />
@@ -45,19 +71,22 @@
       <el-table-column label="采样员" align="center" prop="sampler" />
       <el-table-column label="检疫员" align="center" prop="quarOfficer" />
       <el-table-column label="检疫结果" align="center" prop="result">
-        <template #default="scope"><dict-tag :options="quar_result" :value="scope.row.result" /></template>
+        <template #default="scope">
+          <dict-tag :options="quar_result" :value="scope.row.result" />
+        </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
-        <template #default="scope"><dict-tag :options="quar_status" :value="scope.row.status" /></template>
+        <template #default="scope">
+          <dict-tag :options="quar_status" :value="scope.row.status" />
+        </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="操作" align="center" width="200" fixed="right">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['bisosafety:quarantine:edit']">检疫</el-button>
-          <el-button v-if="String(scope.row.result) === '1'" link type="success" @click="gotoTreatment(scope.row)">
+          <el-button v-if="String(scope.row.result) === '1'" link type="success"
-            治疗
+            @click="gotoTreatment(scope.row)">治疗</el-button>
-          </el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['bisosafety:quarantine:remove']">删除</el-button>
         </template>
@@ -70,20 +99,25 @@
     <!-- 新增弹窗 -->
     <el-dialog title="新增检疫记录" v-model="addOpen" width="700px" append-to-body>
       <el-form ref="addQuarantineRef" :model="addForm" :rules="addRules" label-width="100px">
-        <el-form-item label="羊只耳号" prop="sheepIds" required>
+        <el-form-item label="羊只耳号" prop="sheepList" required>
           <el-input v-model="addForm.sheepIdInput" placeholder="输入耳号后回车验证" @keyup.enter="validateSheepId">
             <template #suffix>
-              <div style="display: flex; align-items: center; height: 100%; margin-left: 8px;">
+              <div style="
-                <span v-if="invalidSheepId" style="color: red; font-size: 12px;">耳号不存在</span>
+                  display: flex;
-                <span v-else-if="validSheepId" style="color: green; font-size: 12px;">已添加</span>
+                  align-items: center;
-                <span v-else-if="alreadySelected" style="color: orange; font-size: 12px;">该羊只已选择</span>
+                  height: 100%;
+                  margin-left: 8px;
+                ">
+                <span v-if="invalidSheepId" style="color: red; font-size: 12px">耳号不存在</span>
+                <span v-else-if="validSheepId" style="color: green; font-size: 12px">已添加</span>
+                <span v-else-if="alreadySelected" style="color: orange; font-size: 12px">该羊只已选择</span>
               </div>
             </template>
           </el-input>
 
-          <el-tag v-for="(id, i) in addForm.sheepIds" :key="i" closable @close="addForm.sheepIds.splice(i, 1)"
+          <el-tag v-for="(item, i) in addForm.sheepList" :key="item.id" closable @close="addForm.sheepList.splice(i, 1)"
             style="margin: 5px 5px 0 0">
-            {{ id }}
+            {{ item.ear }}
           </el-tag>
         </el-form-item>
 
@@ -121,22 +155,27 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="采样员" prop="sampler"><el-input v-model="addForm.sampler" /></el-form-item>
+            <el-form-item label="采样员" prop="sampler">
+              <el-input v-model="addForm.sampler" />
+            </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="检疫员" prop="quarOfficer"><el-input v-model="addForm.quarOfficer" /></el-form-item>
+            <el-form-item label="检疫员" prop="quarOfficer">
+              <el-input v-model="addForm.quarOfficer" />
+            </el-form-item>
           </el-col>
         </el-row>
+
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="检疫结果" prop="result">
-              <el-select v-model="editForm.result" placeholder="检疫结果">
+              <el-select v-model="addForm.result" placeholder="检疫结果">
                 <el-option v-for="i in quar_result" :key="i.value" :label="i.label" :value="i.value" />
               </el-select>
             </el-form-item>
           </el-col>
-
         </el-row>
+
         <el-row :gutter="20">
           <el-col :span="22">
             <el-form-item label="备注" prop="comment">
@@ -153,11 +192,10 @@
       </template>
     </el-dialog>
 
+    <!-- 修改弹窗 -->
     <el-dialog title="修改检疫记录" v-model="editOpen" width="560px" append-to-body :lock-scroll="false">
-
-      <!-- 2. 表单主体 -->
       <el-form ref="editQuarantineRef" :model="editForm" :rules="editRules" label-width="72px" size="default">
-        <!-- 1. 羊只基本信息（只读） -->
+        <!-- 羊只基本信息（只读） -->
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item label="羊只耳号">
@@ -176,7 +214,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="月龄">
-              <span>{{ editForm.monthAge }} </span>
+              <span>{{ editForm.monthAge }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -243,7 +281,13 @@
 </template>
 
 <script setup name="Quarantine">
-import { listQuarantine, getQuarantine, delQuarantine, addQuarantine, updateQuarantine } from '@/api/biosafety/quarantine'
+import {
+  listQuarantine,
+  getQuarantine,
+  delQuarantine,
+  addQuarantine,
+  updateQuarantine
+} from '@/api/biosafety/quarantine'
 import { listItems } from '@/api/biosafety/items'
 import { listSample } from '@/api/biosafety/sample'
 import request from '@/utils/request'
@@ -251,7 +295,11 @@ import { parseTime } from '@/utils/ruoyi'
 import { useRouter } from 'vue-router'
 
 const { proxy } = getCurrentInstance()
-const { quar_result, quar_status,sheep_gender} = proxy.useDict('quar_result', 'quar_status',"sheep_gender")
+const { quar_result, quar_status, sheep_gender } = proxy.useDict(
+  'quar_result',
+  'quar_status',
+  'sheep_gender'
+)
 const router = useRouter()
 
 /* 基础数据 */
@@ -281,20 +329,32 @@ function handleSelectionChange(sel) {
 /* 下拉数据 */
 const quarantineItems = ref([])
 const sampleTypes = ref([])
+const sheepTypes = ref([])
 const barns = ref([])
 
 /* 获取基础下拉 */
 function getItems() {
-  listItems().then(res => quarantineItems.value = res.rows.map(i => ({ label: i.name, value: i.id })))
+  listItems().then(res =>
+    (quarantineItems.value = res.rows.map(i => ({ label: i.name, value: i.id })))
+  )
 }
 function getSample() {
-  listSample().then(res => sampleTypes.value = res.rows.map(i => ({ label: i.name, value: i.id })))
+  listSample().then(res =>
+    (sampleTypes.value = res.rows.map(i => ({ label: i.name, value: i.id })))
+  )
 }
 function getBarns() {
-  request.get('/sheepfold_management/sheepfold_management/list').then(res =>
+  request
-    barns.value = res.rows.map(b => ({ label: b.sheepfoldName, value: b.id }))
+    .get('/sheepfold_management/sheepfold_management/list')
+    .then(res =>
+      (barns.value = res.rows.map(b => ({ label: b.sheepfoldName, value: b.id })))
     )
 }
+function getSheepType() {
+  request.get('/base/base/list').then(res => {
+    sheepTypes.value = res.rows.map(i => ({ label: i.name, value: i.id }))
+  })
+}
 
 /* 列表查询 */
 function getList() {
@@ -320,7 +380,7 @@ function resetQuery() {
 const addOpen = ref(false)
 const addForm = ref({})
 const addRules = {
-  sheepIds: [{ required: true, message: '请至少添加一个耳号', trigger: 'blur' }],
+  sheepList: [{ required: true, message: '请至少添加一个耳号', trigger: 'blur' }],
   datetime: [{ required: true, message: '请选择日期', trigger: 'change' }],
   quarItem: [{ required: true, message: '请选择项目', trigger: 'change' }],
   sampleType: [{ required: true, message: '请选择样品类型', trigger: 'change' }]
@@ -329,7 +389,6 @@ const addRules = {
 const invalidSheepId = ref(false)
 const validSheepId = ref(false)
 const alreadySelected = ref(false)
-
 const barnSheepMap = reactive({})
 
 function handleBarnChange(selectedBarnIds) {
@@ -341,12 +400,8 @@ function handleBarnChange(selectedBarnIds) {
     if (!newBarnIds.includes(barnId)) {
       const { tags = [], ids = [] } = barnSheepMap[barnId] || {}
       tags.forEach(tag => {
-        const index = addForm.value.sheepIds.indexOf(tag)
+        const index = addForm.value.sheepList.findIndex(s => s.ear === tag)
-        if (index !== -1) addForm.value.sheepIds.splice(index, 1)
+        if (index !== -1) addForm.value.sheepList.splice(index, 1)
-      })
-      ids.forEach(id => {
-        const index = addForm.value.ids.indexOf(id)
-        if (index !== -1) addForm.value.ids.splice(index, 1)
       })
       delete barnSheepMap[barnId]
     }
@@ -355,23 +410,23 @@ function handleBarnChange(selectedBarnIds) {
   // 添加新羊舍的耳号和ID
   newBarnIds.forEach(barnId => {
     if (!barnSheepMap[barnId]) {
-      request.get('/sheepfold_management/sheepfold_management/getSheepById', { params: { id: barnId } })
+      request
+        .get('/sheepfold_management/sheepfold_management/getSheepById', {
+          params: { id: barnId }
+        })
         .then(res => {
           const sheepList = res.data || []
-          const tags = sheepList.map(s => s.manageTags)
+          barnSheepMap[barnId] = {
-          const ids = sheepList.map(s => s.id)
+            tags: sheepList.map(s => s.manageTags),
-
+            ids: sheepList.map(s => s.id)
-          barnSheepMap[barnId] = { tags, ids }
-
-          tags.forEach(tag => {
-            if (tag && !addForm.value.sheepIds.includes(tag)) {
-              addForm.value.sheepIds.push(tag)
           }
-          })
 
-          ids.forEach(id => {
+          sheepList.forEach(s => {
-            if (id && !addForm.value.ids.includes(id)) {
+            if (
-              addForm.value.ids.push(id)
+              s.manageTags &&
+              !addForm.value.sheepList.some(item => item.id === s.id)
+            ) {
+              addForm.value.sheepList.push({ id: s.id, ear: s.manageTags })
             }
           })
         })
@@ -380,22 +435,22 @@ function handleBarnChange(selectedBarnIds) {
 }
 
 function validateSheepId() {
-  const id = addForm.value.sheepIdInput.trim()
+  const ear = addForm.value.sheepIdInput.trim()
-  if (!id) return
+  if (!ear) return
 
   invalidSheepId.value = false
   validSheepId.value = false
   alreadySelected.value = false
 
-  if (addForm.value.sheepIds.includes(id)) {
+  if (addForm.value.sheepList.some(s => s.ear === ear)) {
     alreadySelected.value = true
     addForm.value.sheepIdInput = ''
     return
   }
 
-  request.get(`/sheep/sheep/byManageTags/${id}`).then(res => {
+  request.get(`/sheep/sheep/byManageTags/${ear}`).then(res => {
     if (res.data) {
-      addForm.value.sheepIds.push(id)
+      addForm.value.sheepList.push({ id: res.data.id, ear })
       validSheepId.value = true
     } else {
       invalidSheepId.value = true
@@ -405,27 +460,26 @@ function validateSheepId() {
 }
 
 function submitAddForm() {
-
+  addForm.value.ids = addForm.value.sheepList.map(s => s.id)
   addQuarantine(addForm.value).then(() => {
     proxy.$modal.msgSuccess('新增成功')
     addOpen.value = false
     getList()
   })
-
 }
 
 function handleAdd() {
   Object.assign(addForm.value, {
-    sheepIds: [],
+    sheepList: [],
-    ids:[],
     sheepIdInput: '',
     datetime: new Date().toISOString().slice(0, 10),
-    quarItems: '',
+    quarItem: '',
     sampleType: '',
     sampler: '',
     quarOfficer: '',
-    result: '',}
+    result: '',
-  )
+    barnIds: []
+  })
   Object.keys(barnSheepMap).forEach(k => delete barnSheepMap[k])
   invalidSheepId.value = false
   validSheepId.value = false
@@ -441,6 +495,7 @@ const editRules = {
   quarantineType: [{ required: true, message: '请选择类型', trigger: 'change' }]
 }
 const editQuarantineRef = ref(null)
+
 function handleUpdate(row) {
   Object.assign(editForm.value, row)
   editOpen.value = true
@@ -460,7 +515,8 @@ function submitEditForm() {
 /* 删除 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm(`是否确认删除记录编号为"${_ids}"的数据？`)
+  proxy
+    .$modal.confirm(`是否确认删除记录编号为"${_ids}"的数据？`)
     .then(() => delQuarantine(_ids))
     .then(() => {
       getList()
@@ -470,12 +526,19 @@ function handleDelete(row) {
 
 /* 导出 */
 function handleExport() {
-  proxy.download('bisosafety/quarantine/export', queryParams, `quarantine_${Date.now()}.xlsx`)
+  proxy.download(
+    'bisosafety/quarantine/export',
+    queryParams,
+    `quarantine_${Date.now()}.xlsx`
+  )
 }
 
 /* 跳转治疗 */
 function gotoTreatment(row) {
-  router.push({ path: '/biosafety/treatment/add', query: { qId: row.id, sId: row.sheepId } })
+  router.push({
+    path: '/biosafety/treatment/add',
+    query: { qId: row.id, sId: row.sheepId }
+  })
 }
 
 /* 初始化 */
@@ -483,4 +546,5 @@ getList()
 getItems()
 getSample()
 getBarns()
+getSheepType()
 </script>

src/views/biosafety/treatment/index.vue

@@ -2,13 +2,13 @@
   <div class="app-container">
     <!-- 搜索栏 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="羊只耳号" prop="sheepNo">
-        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
-      </el-form-item>
       <el-form-item label="治疗日期" style="width: 308px">
         <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
+      <el-form-item label="羊只耳号" prop="sheepNo">
+        <el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
+      </el-form-item>
       <el-form-item label="兽医" prop="veterinary">
         <el-input v-model="queryParams.veterinary" placeholder="请输入兽医" clearable />
       </el-form-item>
@@ -38,6 +38,11 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="treatmentList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="治疗日期" align="center" prop="datetime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
       <el-table-column label="品种" align="center" prop="variety" />
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
@@ -49,11 +54,6 @@
       <el-table-column label="繁殖状态" align="center" prop="breed" />
       <el-table-column label="泌乳天数" align="center" prop="lactDay" />
       <el-table-column label="怀孕天数" align="center" prop="gestDay" />
-      <el-table-column label="治疗日期" align="center" prop="datetime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="疾病类型" align="center" prop="diseaseName" />
       <el-table-column label="兽医" align="center" prop="veterinary" />
       <el-table-column label="备注" align="center" prop="comment" />

src/views/biosafety/usageInfo/index.vue

@@ -13,7 +13,7 @@
       </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="-"
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="datetimerange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
 
@@ -35,17 +35,18 @@
 
     <!-- 数据表格 -->
     <el-table v-loading="loading" :data="usageList" @selection-change="handleSelectionChange">
+      <el-table-column label="使用时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="使用名称" align="center" prop="name" />
       <el-table-column label="使用类型" align="center" prop="useType">
         <template #default="scope">
           <dict-tag :options="pres_type" :value="scope.row.useType" />
         </template>
       </el-table-column>
-      <el-table-column label="使用时间" align="center" prop="createTime" width="180">
+
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="View" @click="handleDetail(scope.row)"
@@ -85,7 +86,7 @@
           </el-descriptions-item>
 
           <el-descriptions-item label="使用时间" :span="2">
-            {{ parseTime(form.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+            {{ parseTime(form.createTime, '{y}-{m}-{d} {h}:{i}') }}
           </el-descriptions-item>
         </el-descriptions>
       </el-card>

src/views/feed/FeedList/index.vue

@@ -0,0 +1,292 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="配方编号" prop="formulaId">
+        <el-input v-model="queryParams.formulaId" placeholder="请输入配方编号" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="饲草班人员" prop="zookeeper">
+        <el-input v-model="queryParams.zookeeper" placeholder="请输入饲草班人员" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="配料日期" prop="deployDate">
+        <el-date-picker clearable v-model="queryParams.deployDate" type="date" value-format="YYYY-MM-DD"
+          placeholder="请选择配料日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['feed:FeedList:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['feed:FeedList:edit']">修改</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['feed:FeedList:remove']">删除</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['feed:FeedList:export']">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="FeedListList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="序号" type="index" width="60" align="center" prop="id" /> -->
+      <el-table-column label="配方编号" align="center" prop="formulaId" />
+      <el-table-column label="配方批号" align="center" prop="formulaBatchId" />
+      <el-table-column label="饲草班人员" align="center" prop="zookeeper" />
+      <el-table-column label="配料日期" align="center" prop="deployDate" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.deployDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="View" @click="handleView(scope.row)">详情</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['feed:FeedList:edit']">修改</el-button>
+          <!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['feed:FeedList:remove']">删除</el-button> -->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改配料清单对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body
+      v-if="openModel === 'add' || openModel === 'edit'">
+      <el-form ref="FeedListRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="饲草班人员" prop="zookeeper">
+          <el-input v-model="form.zookeeper" placeholder="请输入饲草班人员名称" />
+        </el-form-item>
+        <el-form-item label="配料日期" prop="deployDate">
+          <el-date-picker clearable v-model="form.deployDate" type="date" value-format="YYYY-MM-DD"
+            placeholder="请选择配料日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+
+  <!-- 弹框：详情/修改 -->
+  <el-dialog :title="title" v-model="open" width="60%" append-to-body s v-if="openModel === 'view'">
+    <!-- 详情页：只读展示 -->
+    <div style="padding-bottom:20px ;">
+      <el-descriptions :column="2" border>
+        <el-descriptions-item label="配方编号">{{ showFeedList.formulaId }}</el-descriptions-item>
+        <el-descriptions-item label="配方批号">{{ showFeedList.formulaBatchId }}</el-descriptions-item>
+        <el-descriptions-item label="饲养阶段">{{ showFeedList.rootFormula.feedStage }}</el-descriptions-item>
+      </el-descriptions>
+
+      <el-divider content-position="left">配料列表</el-divider>
+
+      <el-table :data="showFeedList.formulaList" stripe border style="width: 100%" max-height="300">
+        <el-table-column label="序号" type="index" width="60" align="center" />
+        <!-- <el-table-column label="原料编号" prop="materialId" align="center" /> -->
+        <el-table-column label="原料" align="center">
+          <el-table-column label="名称" prop="materialName" align="center" />
+          <el-table-column label="类型" align="center" prop="isGranular">
+            <template #default="scope">
+              <dict-tag :options="material_type" :value="scope.row.isGranular" />
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="配量" align="center" prop="ratio">
+          <el-table-column label="上午" align="center" prop="ratio">
+            <template #default="scope">
+              {{ (scope.row.ratio / 100 * showFeedList.rootPlan.planMorningSize).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="中午" align="center" prop="ratio">
+            <template #default="scope">
+              {{ (scope.row.ratio / 100 * showFeedList.rootPlan.planNoonSize).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="下午" align="center" prop="ratio">
+            <template #default="scope">
+              {{ (scope.row.ratio / 100 * showFeedList.rootPlan.planAfternoonSize).toFixed(2) }}
+            </template>
+          </el-table-column>
+        </el-table-column>
+
+        <el-table-column label="类型" prop="isSupplement" align="center">
+          <template #default="scope">
+            <dict-tag :options="materialType" :value="scope.row.isSupplement" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </el-dialog>
+</template>
+
+<script setup name="FeedList">
+  import { listFeedList, getFeedList, delFeedList, addFeedList, updateFeedList } from "@/api/feed/FeedList"
+
+  const { proxy } = getCurrentInstance()
+
+  const FeedListList = ref([])
+  const open = ref(false)
+  const loading = ref(true)
+  const showSearch = ref(true)
+  const ids = ref([])
+  const single = ref(true)
+  const multiple = ref(true)
+  const total = ref(0)
+  const title = ref("")
+
+  const data = reactive({
+    form: {},
+    queryParams: {
+      pageNum: 1,
+      pageSize: 10,
+      formulaId: null,
+      zookeeper: null,
+      deployDate: null
+    },
+    rules: {
+    }
+  })
+
+  const { queryParams, form, rules } = toRefs(data)
+
+  const showFeedList = ref({})
+  const openModel = ref("")
+  // 原料类型字典
+  const { material_type } = proxy.useDict('material_type')
+  // 原料类型
+  const materialType = [
+    { value: '1', label: '补饲原料' },
+    { value: '0', label: '原料' }
+  ]
+  function handleView(row) {
+    showFeedList.value = row
+    open.value = true
+    openModel.value = "view"
+    title.value = "配料清单详情"
+    console.log("查看配料清单", row)
+  }
+
+  /** 查询配料清单列表 */
+  function getList() {
+    loading.value = true
+    listFeedList(queryParams.value).then(response => {
+      FeedListList.value = response.rows
+      total.value = response.total
+      loading.value = false
+    })
+  }
+
+  // 取消按钮
+  function cancel() {
+    open.value = false
+    reset()
+  }
+
+  // 表单重置
+  function reset() {
+    form.value = {
+      id: null,
+      formulaId: null,
+      formulaBatchId: null,
+      zookeeper: null,
+      deployDate: null
+    }
+    proxy.resetForm("FeedListRef")
+  }
+
+  /** 搜索按钮操作 */
+  function handleQuery() {
+    queryParams.value.pageNum = 1
+    getList()
+  }
+
+  /** 重置按钮操作 */
+  function resetQuery() {
+    proxy.resetForm("queryRef")
+    handleQuery()
+  }
+
+  // 多选框选中数据
+  function handleSelectionChange(selection) {
+    ids.value = selection.map(item => item.id)
+    single.value = selection.length != 1
+    multiple.value = !selection.length
+  }
+
+  /** 新增按钮操作 */
+  function handleAdd() {
+    reset()
+    open.value = true
+    title.value = "添加配料清单"
+  }
+
+  /** 修改按钮操作 */
+  function handleUpdate(row) {
+    reset()
+    const _id = row.id || ids.value
+    console.log("HandleUpdate => 配料清单ID =>", _id)
+    getFeedList(_id).then(response => {
+      form.value = response.data
+      open.value = true
+      openModel.value = "edit"
+      title.value = "修改配料清单"
+    })
+  }
+
+  /** 提交按钮 */
+  function submitForm() {
+    proxy.$refs["FeedListRef"].validate(valid => {
+      if (valid) {
+        if (form.value.id != null) {
+          updateFeedList(form.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功")
+            open.value = false
+            getList()
+          })
+        } else {
+          addFeedList(form.value).then(response => {
+            proxy.$modal.msgSuccess("新增成功")
+            open.value = false
+            getList()
+          })
+        }
+      }
+    })
+  }
+
+  /** 删除按钮操作 */
+  function handleDelete(row) {
+    const _ids = row.id || ids.value
+    proxy.$modal.confirm('是否确认删除配料清单编号为"' + _ids + '"的数据项？').then(function () {
+      return delFeedList(_ids)
+    }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+    }).catch(() => { })
+  }
+
+  /** 导出按钮操作 */
+  function handleExport() {
+    proxy.download('feed/FeedList/export', {
+      ...queryParams.value
+    }, `FeedList_${new Date().getTime()}.xlsx`)
+  }
+
+  getList()
+</script>

src/views/produce/bodyManage/body_measure/index.vue

@@ -4,6 +4,14 @@
       <!-- <el-form-item label="羊只id" prop="sheepId">
         <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
       </el-form-item> -->
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="测量日期" style="width: 308px">
+        <el-date-picker v-model="daterangeMeasureDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
@@ -13,24 +21,16 @@
           <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-form-item label="品种" prop="varietyId" style="width: 308px">
         <el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="测量日期" style="width: 308px">
-        <el-date-picker v-model="daterangeMeasureDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
       <el-form-item label="羊只类别" prop="sheepTypeId">
         <el-select v-model="queryParams.sheepTypeId" placeholder="请选择羊只类别" clearable style="min-width:150px">
           <el-option v-for="type in sheepTypeList" :key="type.id" :label="type.name" :value="type.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -59,17 +59,20 @@
 
     <el-table v-loading="loading" :data="body_measureList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" fixed>
-      <!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
+        <template #default="scope">
-      <el-table-column label="管理耳号" align="center" prop="manageTags" fixed min-width="100px" />
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
+        </template>
-      <el-table-column label="品种" align="center" prop="varietyName" />
+      </el-table-column>
-      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
       <el-table-column label="测量日期" align="center" prop="measureDate" width="120">
         <template #default="scope">
           <span>{{ parseTime(scope.row.measureDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
+      <el-table-column label="品种" align="center" prop="varietyName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
       <el-table-column label="羊只类别" align="center" prop="sheepTypeName" />
       <el-table-column label="性别" align="center">
         <template #default="scope">
@@ -90,25 +93,21 @@
       <el-table-column label="尻高" align="center" prop="rumpHeignt" />
       <el-table-column label="腰角宽" align="center" prop="hipWidth" />
       <el-table-column label="十字部高" align="center" prop="hipCrossHeight" />
-
       <el-table-column label="繁育状态" align="center" prop="breedStatusName" width="100">
         <template #default="scope">
           <span>{{ scope.row.breedStatusName || '未设置' }}</span>
         </template>
       </el-table-column>
-
       <el-table-column label="泌乳天数" align="center" prop="lactationDay" width="100">
         <template #default="scope">
           <span>{{ scope.row.lactationDay || '-' }}</span>
         </template>
       </el-table-column>
-
       <el-table-column label="怀孕天数" align="center" prop="gestationDay" width="100">
         <template #default="scope">
           <span>{{ scope.row.gestationDay || '-' }}</span>
         </template>
       </el-table-column>
-
       <el-table-column label="配后天数" align="center" prop="postMatingDay" width="100">
         <template #default="scope">
           <span>{{ scope.row.postMatingDay || '-' }}</span>
@@ -117,11 +116,6 @@
       <el-table-column label="备注" align="center" prop="comment" min-width="100px" />
       <el-table-column label="技术员" align="center" prop="technician" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="130px">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -411,7 +405,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除体尺测量编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delBody_measure(_ids)
   }).then(() => {
     getList()

src/views/produce/bodyManage/body_score/index.vue

@@ -4,6 +4,14 @@
       <!-- <el-form-item label="羊只id" prop="sheepId">
         <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
       </el-form-item> -->
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="事件日期" style="width: 308px">
+        <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
@@ -13,26 +21,15 @@
           <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-form-item label="体况评分" prop="score">
-        <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
-      <el-form-item label="体况评分" prop="score">
         <el-input v-model="queryParams.score" placeholder="请输入体况评分" clearable @keyup.enter="handleQuery"
           style="max-width: 150px;" />
-      </el-form-item>
+      </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="羊舍id" prop="sheepfold">
-        <el-input v-model="queryParams.sheepfold" placeholder="请输入羊舍id" clearable @keyup.enter="handleQuery" />
-      </el-form-item> -->
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -63,25 +60,25 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
       <!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
-      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" fixed />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="130px" fixed>
-      <el-table-column label="品种" align="center" prop="varietyName" />
+        <template #default="scope">
-      <el-table-column label="事件类型" align="center" prop="eventType" />
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="事件日期" align="center" prop="datetime" min-width="120px">
         <template #default="scope">
           <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" />
+      <el-table-column label="品种" align="center" prop="varietyName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" />
       <el-table-column label="体况评分" align="center" prop="score" />
       <!-- <el-table-column label="羊舍id" align="center" prop="sheepfold" /> -->
       <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
       <el-table-column label="备注" align="center" prop="comment" min-width="130px" />
       <el-table-column label="技术员" align="center" prop="technician" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" min-width="130px">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150px" fixed="right">
         <template #default="scope">
           <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -186,6 +183,9 @@ const data = reactive({
     score: [
       { required: true, message: '请输入体况评分', trigger: 'blur' }
     ],
+    datetime:[
+      { required: true, message: '请选择事件日期', trigger: 'blur' }
+    ],
     technician: [
       { required: true, message: '请输入技术员', trigger: 'blur' }
     ]
@@ -343,7 +343,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除体况评分编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delBody_score(_ids)
   }).then(() => {
     getList()

src/views/produce/bodyManage/breast_rating/index.vue

@@ -4,6 +4,14 @@
       <!-- <el-form-item label="羊只id" prop="sheepId">
         <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
       </el-form-item> -->
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+       <el-form-item label="事件日期" style="width: 308px">
+        <el-date-picker v-model="daterangeEventDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入耳号搜索" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
@@ -13,25 +21,16 @@
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="事件日期" style="width: 308px">
-        <el-date-picker v-model="daterangeEventDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
       <el-form-item label="羊舍" prop="sheepfoldId">
         <el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-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"
@@ -54,16 +53,19 @@
 
     <el-table v-loading="loading" :data="breast_ratingList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="150" fixed>
-      <!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
+        <template #default="scope">
-      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" fixed />
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-      <el-table-column label="品种" align="center" prop="varietyName" />
+        </template>
-      <el-table-column label="事件类型" align="center" prop="eventType" />
+      </el-table-column>
       <el-table-column label="事件日期" align="center" prop="eventDate" min-width="120px">
         <template #default="scope">
           <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" />
+      <el-table-column label="品种" align="center" prop="varietyName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" />
       <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="120px" />
       <el-table-column label="乳房深度" align="center" prop="depth" />
       <el-table-column label="乳房长度" align="center" prop="length" />
@@ -74,11 +76,6 @@
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="技术员" align="center" prop="technician" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120px" fixed="right">
         <template #default="scope">
           <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -185,6 +182,9 @@ const data = reactive({
     manageTags: [
       { required: true, message: '请输入管理耳号', trigger: 'blur' }
     ],
+    eventDate:[
+      { required: true, message: '请选择事件日期', trigger: 'blur' }
+    ],
     score: [
       { required: true, message: '请输入乳房评分', trigger: 'blur' }
     ],
@@ -335,7 +335,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除乳房评分编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delBreast_rating(_ids)
   }).then(() => {
     getList()

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

@@ -14,9 +14,24 @@
             <el-input v-model="form.earNumber" placeholder="请输入耳号" @blur="handleEarNumberBlur" />
           </el-form-item>
         </el-col>
+        <el-col :span="10">
+          <el-form-item label="入群日期" prop="joinDate">
+            <el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="牧场" prop="ranchId">
+            <el-select v-model="form.ranchId" placeholder="请选择牧场" clearable @change="handleRanchChange" required>
+              <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName" :value="ranch.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="10">
           <el-form-item label="羊舍" prop="sheepfold">
-            <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
+            <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable :disabled="!form.ranchId">
               <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -61,7 +76,7 @@
         </el-col>
         <el-col :span="10">
           <el-form-item label="胎次" prop="parity">
-            <el-input v-model="form.parity" placeholder="请输入胎次" />
+            <el-input-number v-model="form.parity" :min="0" label="胎次" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -75,13 +90,16 @@
           </el-form-item>
         </el-col>
         <el-col :span="10">
-          <el-form-item label="入群日期" prop="joinDate">
+          <el-form-item label="羊只类别" prop="typeId">
-            <el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
+            <el-select v-model="form.typeId" placeholder="请选择羊只类别" clearable>
+              <el-option v-for="type in sheepTypeList" :key="type.id" :label="type.name" :value="Number(type.id)" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
 
       <el-row :gutter="20">
+
         <el-col :span="10">
           <el-form-item label="技术员" prop="technician">
             <el-input v-model="form.technician" placeholder="请输入技术员" />
@@ -102,7 +120,6 @@
         <el-button @click="resetForm">重置</el-button>
       </el-form-item>
     </el-form>
-  </div>
 
     <!-- 导入弹窗 -->
     <el-dialog title="导入羊只信息" v-model="importOpen" width="400px" append-to-body>
@@ -116,12 +133,15 @@
         <el-button type="primary" @click="submitUpload">确 定</el-button>
       </template>
     </el-dialog>
+  </div>
 </template>
 
 <script setup>
-import { ref, onMounted, getCurrentInstance } from 'vue'
+import { ref, getCurrentInstance } from 'vue'
 import request from '@/utils/request'
 import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep'
+import { getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
+import { listRanch } from '@/api/produce/manage_sheep/trans_group'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { getToken } from '@/utils/auth'
 
@@ -129,6 +149,7 @@ import { getToken } from '@/utils/auth'
 const { proxy } = getCurrentInstance()
 const form = ref({
   earNumber: '',
+  ranchId: null,
   sheepfold: '',
   father: '',
   mother: '',
@@ -137,24 +158,29 @@ const form = ref({
   gender: '',
   parity: '',
   varietyId: '',
+  typeId: null,
   joinDate: '',
   comment: '',
   technician: ''
 })
 const formRef = ref(null)
-
+const sheepfoldOptions = ref([])
+const varietyOptions = ref([])
+const ranchOptions = ref([])
 const rules = {
   earNumber: [
     { required: true, message: '请输入耳号', trigger: 'blur' },
     { validator: checkEarNumberExists, trigger: 'blur' }
   ],
+  ranchId: [{ required: true, message: '请选择牧场', trigger: 'change' }],
   sheepfold: [{ required: true, message: '请选择羊舍', trigger: 'change' }],
-  bornWeight: [{ required: true, message: '请输入出生体重', trigger: 'blur' }],
+  bornWeight: [{ required: true, message: '请输入出生体重', trigger: 'change' }],
   birthday: [{ required: true, message: '请选择出生日期', trigger: 'change' }],
   gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
   varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }],
-  joinDate:[{ required: true, message: '请选择入群日期', trigger: 'change' }],
+  typeId: [{ required: true, message: '请选择羊只类别', trigger: 'change' }],
-  technician:[{ required: true, message: '请输入技术员', trigger: 'change' }],
+  joinDate: [{ required: true, message: '请选择入群日期', trigger: 'change' }],
+  technician: [{ required: true, message: '请输入技术员', trigger: 'change' }],
 }
 
 // 校验耳号是否存在
@@ -189,15 +215,33 @@ function handleEarNumberBlur() {
   formRef.value.validateField('earNumber')
 }
 
+function handleRanchChange(ranchId) {
+  form.value.sheepfold = '';
+  sheepfoldOptions.value = [];
 
-const sheepfoldOptions = ref([])
+  if (!ranchId) return;
-const varietyOptions = ref([])
+
+  listSheepfold({
+    pageNum: 1,
+    pageSize: 9999,
+    ranchId: ranchId
+  }).then(res => {
+    if (res.rows && res.rows.length > 0) {
+      sheepfoldOptions.value = res.rows || [];
+    } else {
+      proxy.$modal.msgWarning(`该牧场下暂无羊舍数据`);
+    }
+  }).catch(error => {
+    console.error('加载羊舍数据失败', error);
+    proxy.$modal.msgError('获取羊舍数据失败');
+  });
+}
 
 //羊舍列表
 function getSheepfoldOptions() {
-  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+  // listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
-    sheepfoldOptions.value = res.rows || []
+  //   sheepfoldOptions.value = res.rows || []
-  })
+  // })
 }
 
 //品种列表
@@ -211,6 +255,29 @@ function getVarietyOptions() {
   })
 }
 
+//加载所有牧场列表
+function loadRanchList() {
+  listRanch().then(res => {
+    ranchOptions.value = res.rows.map(ranch => ({
+      id: ranch.id,
+      ranchName: ranch.ranch
+    }));
+  }).catch(error => {
+    console.error('加载牧场列表失败', error);
+    proxy.$modal.msgError('获取牧场数据失败');
+  });
+}
+
+// 加载羊只类别数据
+const sheepTypeList = ref([]);
+function loadSheepTypeList() {
+  getSheepTypeList().then(response => {
+    sheepTypeList.value = response.rows || [];
+  }).catch(error => {
+    console.error('加载羊只类别失败', error);
+  });
+}
+
 //确保日期格式一致
 function formatDate(date) {
   if (!date) return null;
@@ -237,6 +304,7 @@ function submitForm() {
     addSheep(formData).then(res => {
       if (res.code === 200) {
         proxy.$modal.msgSuccess('新增成功');
+        formRef.value.clearValidate();
         resetForm();
       } else {
         proxy.$modal.msgError(res.msg || '新增失败');
@@ -254,8 +322,9 @@ function resetForm() {
     bornWeight: '',
     birthday: '',
     gender: '',
-    parity: '',
+    parity: 0,
     varietyId: '',
+    typeId: null,
     joinDate: '',
     comment: '',
     technician: ''
@@ -312,10 +381,12 @@ function handleImportError(err) {
   proxy.$modal.msgError('导入失败：' + msg)
 }
 
-
+onMounted(() => {
-getSheepfoldOptions()
+  getSheepfoldOptions()
-getVarietyOptions()
+  loadSheepTypeList()
-
+  loadRanchList()
+  getVarietyOptions()
+})
 </script>
 
 <style scoped>

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

@@ -9,6 +9,10 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item> -->
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
@@ -21,9 +25,10 @@
         <el-input v-model="queryParams.oldComment" placeholder="请输入原备注" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px">
+      <el-form-item label="羊舍" prop="sheepfoldId">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+        <el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -55,15 +60,17 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
       <!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="管理耳号" align="center" prop="manageTags" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
       <el-table-column label="新备注" align="center" prop="newComment" />
       <el-table-column label="原备注" align="center" prop="oldComment" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -106,6 +113,7 @@
 <script setup name="ChangeComment">
 import { listChangeComment, getChangeComment, delChangeComment, addChangeComment, updateChangeComment } from "@/api/produce/manage_sheep/changeComment"
 import { getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 
 const { proxy } = getCurrentInstance()
 
@@ -127,6 +135,7 @@ const data = reactive({
     pageSize: 10,
     sheepId: null,
     manageTags: null,
+    sheepfoldId: null,
     newComment: null,
     oldComment: null,
     createTime: null
@@ -151,6 +160,9 @@ function getList() {
     queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
     queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
   }
+  if (queryParams.value.sheepfoldId) {
+    queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
+  }
   listChangeComment(queryParams.value).then(response => {
     changeCommentList.value = response.rows
     total.value = response.total
@@ -208,6 +220,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
+  queryParams.value.sheepfoldId = null
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -270,7 +283,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除改备注编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delChangeComment(_ids)
   }).then(() => {
     getList()
@@ -285,5 +298,16 @@ function handleExport() {
   }, `changeComment_${new Date().getTime()}.xlsx`)
 }
 
-getList()
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
+}
+
+onMounted(() => {
+  getSheepfoldOptions();
+  getList();
+});
 </script>

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

@@ -4,6 +4,10 @@
       <!-- <el-form-item label="羊只id" prop="sheepId">
         <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
       </el-form-item> -->
+      <el-form-item label="创建时间" style="width: 300px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="耳号" prop="manageTag">
         <el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
@@ -16,9 +20,10 @@
         <el-input v-model="queryParams.oldTag" placeholder="请输入旧耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px">
+      <el-form-item label="羊舍" prop="sheepfoldId">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+        <el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -50,7 +55,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="耳号" align="center" prop="manageTags" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" />
       <el-table-column label="耳号类型" align="center" prop="earType">
         <template #default="scope">
           {{ scope.row.earType === 0 ? '电子耳号' : '管理耳号' }}
@@ -60,11 +72,6 @@
       <el-table-column label="旧耳号" align="center" prop="oldTag" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -87,7 +94,6 @@
         <el-form-item label="耳号" prop="earNumber">
           <el-input v-model="form.earNumber" placeholder="请输入管理耳号或电子耳号" @change="fetchOldTag" :disabled="!isAddMode" />
         </el-form-item>
-
         <el-form-item label="耳号类型" prop="earType">
           <el-select v-model="form.earType" placeholder="请选择耳号类型" @change="fetchOldTag" :disabled="!isAddMode">
             <el-option label="电子耳号" :value="0"></el-option>
@@ -98,7 +104,7 @@
           <el-input v-model="form.newTag" placeholder="请输入新耳号/电子耳号" @blur="checkNewTagExists" :disabled="!isAddMode" />
         </el-form-item>
         <el-form-item label="旧耳号" prop="oldTag">
-          <el-input v-model="form.oldTag" placeholder="请输入旧耳号/电子耳号" disabled/>
+          <el-input v-model="form.oldTag" placeholder="请输入旧耳号/电子耳号" disabled />
         </el-form-item>
         <el-form-item label="备注" prop="comment" v-if="!isAddMode">
           <el-input v-model="form.comment" type="textarea" placeholder="请输入内容" :disabled="!isAddMode" />
@@ -116,7 +122,7 @@
 
 <script setup name="ChangeEar">
 import { listChangeEar, getChangeEar, delChangeEar, addChangeEar, updateChangeEar, getSheepByEarNumber, checkTagExists } from "@/api/produce/manage_sheep/changeEar"
-
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 const { proxy } = getCurrentInstance()
 
 const changeEarList = ref([])
@@ -138,6 +144,7 @@ const data = reactive({
     pageSize: 10,
     manageTags: null,
     // sheepId: null,
+    sheepfoldId: null,
     earType: null,
     newTag: null,
     oldTag: null,
@@ -168,6 +175,9 @@ async function getList() {
   if (queryParams.value.manageTags) {
     queryParams.value.params["manageTags"] = queryParams.value.manageTags;
   }
+  if (queryParams.value.sheepfoldId) {
+    queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
+  }
   if (daterangeCreateTime.value && daterangeCreateTime.value.length > 0) {
     queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0];
     queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1];
@@ -214,7 +224,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
-
+  queryParams.value.sheepfoldName = null
   queryParams.value.manageTags = null
   queryParams.value.newTag = null
   queryParams.value.oldTag = null
@@ -347,7 +357,7 @@ function fetchOldTag() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除修改电子耳号记录编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delChangeEar(_ids)
   }).then(() => {
     getList()
@@ -362,8 +372,16 @@ function handleExport() {
   }, `changeEar_${new Date().getTime()}.xlsx`)
 }
 
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
+}
 
 onMounted(() => {
+  getSheepfoldOptions();
   getList();
 });
 </script>

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

@@ -9,6 +9,10 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item> -->
+      <el-form-item label="创建日期" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="width: 150px;" />
@@ -23,9 +27,10 @@
           <el-option v-for="item in varietyOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建日期" style="width: 308px">
+      <el-form-item label="羊舍" prop="sheepfoldId">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+        <el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -57,16 +62,18 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="${comment}" align="center" prop="id" />
       <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
+      <el-table-column label="创建日期" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="管理耳号" align="center" prop="manageTags" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
       <el-table-column label="原品种" align="center" prop="varietyOld" />
       <el-table-column label="新品种" align="center" prop="varietyNew" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建日期" align="center" prop="createTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -90,7 +97,7 @@
           <el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="onManageTagsBlur" :disabled="!isAdd" />
         </el-form-item>
         <el-form-item label="原品种" prop="varietyOld">
-          <el-input v-model="form.varietyOld" placeholder="请输入原品种" disabled/>
+          <el-input v-model="form.varietyOld" placeholder="请输入原品种" disabled />
         </el-form-item>
         <el-form-item label="新品种" prop="varietyNew">
           <el-select v-model="form.varietyNew" placeholder="请选择新品种" clearable filterable :disabled="!isAdd">
@@ -113,6 +120,7 @@
 
 <script setup name="ChangeVariety">
 import { listChangeVariety, getChangeVariety, delChangeVariety, addChangeVariety, updateChangeVariety, getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { listVariety } from '@/api/variety/variety'
 
 const { proxy } = getCurrentInstance()
@@ -139,6 +147,7 @@ const data = reactive({
     pageSize: 10,
     // sheepId: null,
     manageTags: null,
+    sheepfoldId: null,
     varietyOld: null,
     varietyNew: null,
     createTime: null
@@ -166,6 +175,9 @@ function getList() {
     queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
     queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
   }
+  if (queryParams.value.sheepfoldId) {
+    queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
+  }
   listChangeVariety(queryParams.value).then(response => {
     changeVarietyList.value = response.rows
     total.value = response.total
@@ -234,6 +246,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
+  queryParams.value.sheepfoldId = null;
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -298,7 +311,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除改品种记录编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
     return delChangeVariety(_ids)
   }).then(() => {
     getList()
@@ -313,8 +326,18 @@ function handleExport() {
   }, `changeVariety_${new Date().getTime()}.xlsx`)
 }
 
+
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
+}
+
 onMounted(() => {
   loadVarietyOptions();
+  getSheepfoldOptions();
   getList();
 });
 </script>

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

@@ -1,16 +1,29 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="转群日期" style="width: 308px">
+        <el-date-picker v-model="daterangeTransDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery"
           style="width: 150px;" />
       </el-form-item>
-      <el-form-item label="转出羊舍" prop="foldFrom">
+      <el-form-item label="事件类型" prop="eventType">
+        <el-select v-model="queryParams.eventType" placeholder="请选择事件类型" style="min-width:150px" clearable required>
+          <el-option v-for="dict in eventTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="转出羊舍" prop="foldFrom" style="width: 308px">
         <el-select v-model="queryParams.foldFrom" placeholder="请选择转出羊舍" style="min-width:150px" clearable>
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="转入羊舍" prop="foldTo">
+      <el-form-item label="转入羊舍" prop="foldTo" style="width: 308px">
         <el-select v-model="queryParams.foldTo" placeholder="请选择转入羊舍" style="min-width:150px" clearable>
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
@@ -20,15 +33,16 @@
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="羊只类型" prop="sheepTypeId">
+        <el-select v-model="queryParams.sheepTypeId" placeholder="请选择羊只类型" clearable style="min-width:150px">
+          <el-option v-for="type in sheepTypeOptions" :key="type.id" :label="type.name" :value="type.id" />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" style="width: 150px;" placeholder="请选择状态" clearable>
           <el-option v-for="dict in status" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -40,10 +54,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['trans_group:trans_group:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
           v-hasPermi="['trans_group:trans_group:edit']">修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['trans_group:trans_group:remove']">删除</el-button>
@@ -57,30 +71,34 @@
 
     <el-table v-loading="loading" :data="trans_groupList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="管理耳号" align="center" prop="manageTags" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="120" fixed>
-      <el-table-column label="转出羊舍" align="center" prop="foldFromName" />
+        <template #default="scope">
-      <el-table-column label="转入羊舍" align="center" prop="foldToName" />
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="转群日期" align="center" prop="transDate" min-width="120" />
+      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" />
+      <el-table-column label="事件类型" align="center" prop="eventTypeText" />
+      <el-table-column label="转出羊舍" align="center" prop="foldFromName" min-width="130" />
+      <el-table-column label="转入羊舍" align="center" prop="foldToName" min-width="130" />
       <el-table-column label="品种" align="center" prop="varietyName" />
-      <el-table-column label="转群原因" align="center" prop="reasonText" />
+      <el-table-column label="羊只类别" align="center" prop="sheepTypeName" />
+      <el-table-column label="转群原因" align="center" prop="reasonText" min-width="120" />
       <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="状态" align="center" prop="status">
+      <!-- <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :options="status" :value="scope.row.status" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
-      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="备注" align="center" prop="comment" min-width="120" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime">
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="160" fixed="right">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <!-- <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="160">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
             v-hasPermi="['trans_group:trans_group:approve']">
             审批
-          </el-button>
+          </el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['trans_group:trans_group:remove']">
             删除
@@ -96,11 +114,21 @@
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="trans_groupRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="管理耳号" prop="manageTags">
+          <div style="display: flex; align-items: center; gap: 8px;">
             <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
-            style="width: 100%" @change="loadSheepInfo" :disabled="!isAdd">
+              style="width: 100%; flex:1;" @change="loadSheepInfo" :disabled="!isAdd">
               <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
                 :value="sheep.manageTags" />
             </el-select>
+            <span v-if="form.manageTags?.length > 0" class="tag-count">
+              已选 {{ form.manageTags.length }} 个
+            </span>
+          </div>
+        </el-form-item>
+        <el-form-item label="事件类型" prop="eventType">
+          <el-select v-model="form.eventType" placeholder="请选择事件类型" clearable required>
+            <el-option v-for="dict in eventTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="牧场" prop="ranchId">
           <el-select v-model="form.ranchId" placeholder="请选择牧场" clearable @change="handleRanchChange">
@@ -133,6 +161,10 @@
               :value="Number(dict.value)" />
           </el-select>
         </el-form-item>
+        <el-form-item label="转群日期" prop="transDate">
+          <el-date-picker v-model="form.transDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择转群日期"
+            style="width: 100%" required />
+        </el-form-item>
         <el-form-item label="技术员" prop="technician">
           <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
@@ -144,14 +176,16 @@
         </div>
       </template>
     </el-dialog>
-  </div>
 
     <!-- 审批对话框 -->
-  <el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
+    <!-- <el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
       <el-form ref="approveFormRef" :model="approveForm" label-width="120px">
         <el-form-item label="耳号">
           <el-input v-model="displayManageTags" disabled />
         </el-form-item>
+        <el-form-item label="事件类型">
+          <el-input :value="approveForm.eventTypeText || '未知'" disabled />
+        </el-form-item>
         <el-form-item label="转出羊舍">
           <el-input :value="sheepfoldNameMap[approveForm.foldFrom] || approveForm.foldFrom" disabled />
         </el-form-item>
@@ -180,17 +214,19 @@
           <el-button type="danger" @click="handleApproveReject">驳回</el-button>
         </div>
       </template>
-  </el-dialog>
+    </el-dialog> -->
+  </div>
 </template>
 
 <script setup name="Trans_group">
 import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group, approveScTransGroup, listRanch } from '@/api/produce/manage_sheep/trans_group'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
+import { getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
 import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance();
-const { trans_group_reason, status } = proxy.useDict('trans_group_reason', 'status');
+const { trans_group_reason, status, trans_group_event_type } = proxy.useDict('trans_group_reason', 'status', 'trans_group_event_type');
 
 const trans_groupList = ref([]);
 const open = ref(false);
@@ -201,11 +237,12 @@ const single = ref(true);
 const multiple = ref(false);
 const total = ref(0);
 const title = ref('');
+const daterangeTransDate = ref([]);
 const daterangeCreateTime = ref([]);
-
+const eventTypeOptions = trans_group_event_type || [];
-const approveDialog = ref(false);
+// const approveDialog = ref(false);
-const approveForm = ref({});
+// const approveForm = ref({});
-const displayManageTags = ref('');
+// const displayManageTags = ref('');
 const sheepOptions = ref([]);
 const sheepfoldOptions = ref([]);
 const sheepfoldNameMap = ref({});
@@ -219,25 +256,31 @@ const data = reactive({
   form: {
     manageTags: [],
     tagDetails: {},
+    eventType: null,
+    transDate: null,
   },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     sheepId: null,
     manageTags: null,
+    eventType: null,
     ranchId: null,
     foldTo: null,
     foldFrom: null,
     varietyId: null,
+    sheepTypeId: null,
     status: null,
     createTime: null,
   },
   rules: {
     manageTags: [{ required: true, message: '请输入耳号', trigger: 'blur' }],
+    eventType: [{ required: true, message: '请选择事件类型', trigger: 'change' }],
     ranchId: [{ required: true, message: '请选择牧场', trigger: 'change' }],
     foldTo: [{ required: true, message: '请选择转入羊舍', trigger: 'change' }],
     varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }],
     reason: [{ required: true, message: '请选择转群原因', trigger: 'change' }],
+    transDate: [{ required: true, message: '请选择转群日期', trigger: 'change' }],
     technician: [{ required: true, message: '请输入技术员', trigger: 'blur' }],
   },
 });
@@ -251,6 +294,13 @@ function getList() {
     queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0];
     queryParams.value.params.endCreateTime = daterangeCreateTime.value[1];
   }
+  if (daterangeTransDate.value?.length) {
+    queryParams.value.params.beginTransDate = daterangeTransDate.value[0];
+    queryParams.value.params.endTransDate = daterangeTransDate.value[1];
+  }
+  if (queryParams.value.sheepTypeId !== null && queryParams.value.sheepTypeId !== undefined) {
+    queryParams.value.params.sheepTypeId = queryParams.value.sheepTypeId;
+  }
   listTrans_group(queryParams.value).then((res) => {
     trans_groupList.value = res.rows;
     total.value = res.total;
@@ -326,26 +376,6 @@ async function handleSheepFilter() {
   }
 }
 
-//转群类型列表
-function getSheepTypeList() {
-  return new Promise((resolve, reject) => {
-    request({
-      url: '/base/base/list',
-      method: 'get',
-      params: { pageNum: 1, pageSize: 9999 },
-    }).then((res) => {
-      sheepTypeOptions.value = res.rows.map(item => ({
-        id: Number(item.id),
-        name: item.name || item.typeName
-      })) || [];
-      resolve();
-    }).catch((error) => {
-      console.error('获取羊只类型失败', error);
-      proxy.$modal.msgError('加载羊只类型失败，请重试');
-      reject(error);
-    });
-  });
-}
 
 //加载所有牧场列表
 function loadRanchList() {
@@ -537,6 +567,8 @@ function handleQuery() {
 //重置搜索框
 function resetQuery() {
   daterangeCreateTime.value = [];
+  daterangeTransDate.value = [];
+  queryParams.value.eventType = null;
   proxy.resetForm('queryRef');
   handleQuery();
 }
@@ -580,6 +612,8 @@ async function handleUpdate(row) {
     const formData = {
       ...d,
       manageTags: manageTags,
+      eventType: d.eventType || null,
+      transDate: d.transDate || null,
       foldFrom: Number(d.foldFrom || 0),
       foldTo: Number(d.foldTo || 0),
       sheepTypeId: Number(d.sheepTypeId || 0),
@@ -648,7 +682,7 @@ function submitForm() {
 //删除
 function handleDelete(row) {
   const _ids = row.id || ids.value;
-  proxy.$modal.confirm(`是否确认删除转群记录编号为“${_ids}”的数据项？`)
+  proxy.$modal.confirm(`是否确认删除这条记录数据`)
     .then(() => delTrans_group(_ids))
     .then(() => {
       getList();
@@ -665,38 +699,38 @@ function handleExport() {
 }
 
 // 审核
-function handleApprove(row) {
+//function handleApprove(row) {
-  approveForm.value = { ...row };
+//   approveForm.value = { ...row };
-  approveDialog.value = true;
+//   approveDialog.value = true;
-  displayManageTags.value = row.manageTags;
+//   displayManageTags.value = row.manageTags;
-}
+// }
 
 // 审批同意
-function handleApproveAgree() {
+// function handleApproveAgree() {
-  if (typeof approveForm.value.foldTo !== 'number') {
+//   if (typeof approveForm.value.foldTo !== 'number') {
-    approveForm.value.foldTo = Number(approveForm.value.foldTo);
+//     approveForm.value.foldTo = Number(approveForm.value.foldTo);
-  }
+//   }
 
-  approveForm.value.status = 1;
+//   approveForm.value.status = 1;
-  approveScTransGroup(approveForm.value).then(() => {
+//   approveScTransGroup(approveForm.value).then(() => {
-    approveDialog.value = false;
+//     approveDialog.value = false;
-    proxy.$modal.msgSuccess('审批通过，羊只所在羊舍已更新');
+//     proxy.$modal.msgSuccess('审批通过，羊只所在羊舍已更新');
-    getList();
+//     getList();
-  }).catch(error => {
+//   }).catch(error => {
-    proxy.$modal.msgError(`审批失败：${error.message}`);
+//     proxy.$modal.msgError(`审批失败：${error.message}`);
-  });
+//   });
-}
+// }
 
-function handleApproveReject() {
+// function handleApproveReject() {
-  approveForm.value.status = 2;
+//   approveForm.value.status = 2;
-  approveScTransGroup(approveForm.value).then(() => {
+//   approveScTransGroup(approveForm.value).then(() => {
-    approveDialog.value = false;
+//     approveDialog.value = false;
-    proxy.$modal.msgSuccess('审批已驳回');
+//     proxy.$modal.msgSuccess('审批已驳回');
-    getList();
+//     getList();
-  }).catch(error => {
+//   }).catch(error => {
-    proxy.$modal.msgError(`审批失败：${error.message}`);
+//     proxy.$modal.msgError(`审批失败：${error.message}`);
-  });
+//   });
-}
+// }
 
 //加载羊舍数据
 function loadSheepfold() {
@@ -720,11 +754,37 @@ function getVarietyOptions() {
   });
 }
 
+// 加载羊只类别数据
+const sheepTypeList = ref([]);
+function loadSheepTypeList() {
+  getSheepTypeList().then(response => {
+    sheepTypeList.value = response.rows || [];
+    sheepTypeOptions.value = (response.rows || []).map(item => ({
+      id: Number(item.id),
+      name: item.name || item.typeName
+    }));
+  }).catch(error => {
+    console.error('加载羊只类别失败', error);
+    sheepTypeList.value = [];
+    sheepTypeOptions.value = [];
+  });
+}
+
 onMounted(() => {
   loadSheepfold();
   loadRanchList();
   getVarietyOptions();
-  getSheepTypeList();
+  loadSheepTypeList();
   getList();
 });
 </script>
+
+<style scoped>
+.tag-count {
+  color: #606266;
+  background-color: #f5f7fa;
+  padding: 2px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+</style>

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

@@ -2,14 +2,36 @@
   <div class="app-container">
     <!-- 查询表单 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
+      <el-form-item label="转场日期" style="width: 308px">
+        <el-date-picker v-model="transitionDateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
-        <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery" style="width: 150px;"/>
+        <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
+          style="width: 150px;" />
       </el-form-item>
       <el-form-item label="品种" prop="varietyId">
         <el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
+      <el-form-item label="事件类型" prop="eventType" style="width: 308px">
+        <el-select v-model="queryParams.eventType" placeholder="请选择事件类型" clearable style="min-width:150px">
+          <el-option label="转场转入" value="转场转入" />
+          <el-option label="转场转出" value="转场转出" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="转场类型" prop="transType" style="width: 308px">
+        <el-select v-model="queryParams.transType" placeholder="请选择转场类型" clearable style="min-width:150px">
+          <el-option label="内部调拨" :value="0" />
+          <el-option label="内部销售" :value="1" />
+          <el-option label="育肥调拨" :value="2" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="转入牧场" prop="transTo">
         <el-select v-model="queryParams.transTo" placeholder="请选择转入牧场" clearable style="min-width:150px">
           <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName" :value="ranch.ranchName" />
@@ -25,10 +47,6 @@
           <el-option v-for="dict in status" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -41,10 +59,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['transition_info:transition_info:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
           v-hasPermi="['transition_info:transition_info:edit']">修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['transition_info:transition_info:remove']">删除</el-button>
@@ -59,9 +77,21 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="transition_infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="耳号" align="center" prop="manageTags" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="130" fixed>
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="转场日期" align="center" prop="transitionDate" min-width="150">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.transitionDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" />
+      <el-table-column label="事件类型" align="center" prop="eventType" min-width="120" />
+      <el-table-column label="转场类型" align="center" prop="transTypeText" />
       <el-table-column label="品种" align="center" prop="varietyName" />
-      <el-table-column label="转入牧场" align="center" prop="transTo" />
+      <el-table-column label="转入牧场" align="center" prop="transTo" min-width="120" />
       <el-table-column label="当前牧场" align="center" prop="transFrom" />
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
@@ -69,18 +99,19 @@
         </template>
       </el-table-column>
       <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="状态" align="center" prop="statusText" />
+      <el-table-column label="当前状态" align="center" prop="status" min-width="120">
-      <el-table-column label="备注" align="center" prop="comment" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span v-if="scope.row.status === 0">待审批</span>
+          <span v-else-if="scope.row.status === 1 || scope.row.status === 2">审批完成</span>
+          <span v-else>未知状态</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" min-width="180">
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="操作" align="center" min-width="180" fixed="right">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
-            v-hasPermi="['transition_info:transition_info:approve']">审批</el-button>
+            v-hasPermi="['transition_info:transition_info:approve']" :disabled="scope.row.status !== 0">审批</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['transition_info:transition_info:remove']">删除</el-button>
         </template>
@@ -94,33 +125,51 @@
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="transition_infoRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="管理耳号" prop="manageTags">
+          <div style="display: flex; align-items: center; gap: 8px;">
             <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" filterable multiple allow-create
-            @change="loadSheepInfo" :disabled="!isAdd" >
+              @change="loadSheepInfo" :disabled="!isAdd" style="flex:1;">
               <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
                 :value="sheep.manageTags" />
             </el-select>
+            <span v-if="form.manageTags?.length > 0" class="tag-count">
+              已选 {{ form.manageTags.length }} 个
+            </span>
+          </div>
         </el-form-item>
 
         <el-form-item label="转入牧场" prop="transTo">
-          <el-select v-model="form.transTo" placeholder="请选择转入牧场" clearable :disabled="!isAdd" >
+          <el-select v-model="form.transTo" placeholder="请选择转入牧场" clearable :disabled="!isAdd">
             <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName"
               :value="ranch.ranchName" />
           </el-select>
         </el-form-item>
 
         <el-form-item label="当前牧场" prop="transFrom">
-          <el-select v-model="form.transFrom" placeholder="请选择当前牧场" clearable @change="handleRanchChange" :disabled="!isAdd" >
+          <el-select v-model="form.transFrom" placeholder="请选择当前牧场" clearable @change="handleRanchChange"
+            :disabled="!isAdd">
             <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName"
               :value="ranch.ranchName" />
           </el-select>
         </el-form-item>
 
+        <el-form-item label="事件类型" prop="eventType">
+          <el-select v-model="form.eventType" placeholder="请选择事件类型">
+            <el-option label="转场转入" value="转场转入" />
+            <el-option label="转场转出" value="转场转出" />
+          </el-select>
+        </el-form-item>
+
         <el-form-item label="转场类型" prop="transType">
           <el-select v-model="form.transType" placeholder="请选择转场类型">
             <el-option v-for="dict in trans_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
 
+        <el-form-item label="转场日期" prop="transitionDate">
+          <el-date-picker v-model="form.transitionDate" value-format="YYYY-MM-DD" type="date" placeholder="请选择转场日期"
+            :disabled="!isAdd"></el-date-picker>
+        </el-form-item>
+
         <el-form-item label="技术员" prop="technician">
           <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
@@ -143,6 +192,9 @@
         <el-form-item label="品种">
           <el-input :value="approveForm.varietyName" disabled />
         </el-form-item>
+        <el-form-item label="事件类型">
+          <el-input :value="approveForm.eventType" disabled />
+        </el-form-item>
         <el-form-item label="转入牧场">
           <el-input :value="approveForm.transTo" disabled />
         </el-form-item>
@@ -161,6 +213,12 @@
         <el-form-item label="状态">
           <el-input :value="getStatusLabel(approveForm.status)" disabled />
         </el-form-item>
+        <el-form-item label="接收羊舍" v-if="approveForm.eventType === '转场转入'">
+          <el-select v-model="approveForm.sheepfoldId" placeholder="请选择接收羊舍" clearable>
+            <el-option v-for="sheepfold in acceptSheepfold" :key="sheepfold.id" :label="sheepfold.sheepfoldName"
+              :value="sheepfold.id" />
+          </el-select>
+        </el-form-item>
       </el-form>
 
       <template #footer>
@@ -174,7 +232,7 @@
 </template>
 
 <script setup name="Transition_info">
-import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, getSheepByRanchId, updateTransition_info, listRanch,approveTransitionInfo } from "@/api/produce/manage_sheep/transition_info"
+import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, getSheepByRanchId, updateTransition_info, listRanch, approveTransitionInfo } from "@/api/produce/manage_sheep/transition_info"
 import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
 import request from '@/utils/request'
 
@@ -191,15 +249,17 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
+const transitionDateRange = ref([])
 const daterangeCreateTime = ref([])
 const approveDialog = ref(false)
 const approveForm = ref({})
 const displayManageTags = ref('')
 const varietyOptions = ref([])
-const ranchOptions = ref([]);
+const ranchOptions = ref([])
-const sheepOptions = ref([]); 
+const sheepOptions = ref([])
-const isAdd = ref(true); 
+const isAdd = ref(true)
-const isEdit = ref(false); 
+const isEdit = ref(false)
+const acceptSheepfold = ref([])
 
 const data = reactive({
   form: {
@@ -207,7 +267,9 @@ const data = reactive({
     manageTags: [],
     transTo: null,
     transFrom: null,
+    eventType: null,
     transType: null,
+    transitionDate: null,
     technician: null,
     tagDetails: {}
   },
@@ -216,13 +278,16 @@ const data = reactive({
     pageSize: 10,
     manageTags: [],
     varietyId: null,
+    eventType: null,
+    transType: null,
     transTo: null,
     transFrom: null,
     status: null,
-    createTime: null
+    createTime: null,
+    transitionDate: null
   },
   rules: {
-    manageTags:[
+    manageTags: [
       { required: true, message: "请输入管理耳号", trigger: "blur" }
     ],
     transTo: [
@@ -231,9 +296,15 @@ const data = reactive({
     transFrom: [
       { required: false, message: "请选择当前牧场", trigger: "blur" }
     ],
+    eventType: [
+      { required: true, message: '请选择事件类型', trigger: 'change' }
+    ],
     transType: [
       { required: true, message: "请选择转场类型", trigger: "change" }
     ],
+    transitionDate: [
+      { required: true, message: "请选择转场日期", trigger: "change" }
+    ],
     technician: [
       { required: true, message: "请输入技术员", trigger: "blur" }
     ]
@@ -249,6 +320,13 @@ function getList() {
     queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
     queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
   }
+  if (queryParams.value.transType !== null) {
+    queryParams.value.params.transType = queryParams.value.transType;
+  }
+  if (transitionDateRange.value && transitionDateRange.value.length > 0) {
+    queryParams.value.params["beginTransitionDate"] = transitionDateRange.value[0];
+    queryParams.value.params["endTransitionDate"] = transitionDateRange.value[1];
+  }
   listTransition_info(queryParams.value).then(res => {
     transition_infoList.value = res.rows
     total.value = res.total
@@ -264,7 +342,7 @@ function reset() {
     transFrom: null,
     transType: null,
     technician: null,
-    createBy:null,
+    createBy: null,
     tagDetails: {}
   };
   sheepOptions.value = [];
@@ -302,6 +380,40 @@ function loadSheepOptions() {
   });
 }
 
+// 加载牧场下的羊舍
+// 修改：加载转入牧场下的接收羊舍（使用牧场ID而非名称）
+function loadSheepfoldsByRanch(ranchName) {
+  // 1. 根据转入牧场名称匹配牧场ID
+  const matchedRanch = ranchOptions.value.find(
+    ranch => ranch.ranchName === ranchName
+  );
+  if (!matchedRanch) {
+    proxy.$modal.msgWarning(`未找到牧场“${ranchName}”的信息`);
+    acceptSheepfold.value = [];
+    return;
+  }
+  const ranchId = matchedRanch.id; // 获取匹配的牧场ID
+
+  // 2. 使用牧场ID调用接口加载羊舍（修正参数）
+  request({
+    url: '/sheepfold_management/sheepfold_management/list',
+    method: 'get',
+    params: {
+      ranchId: ranchId, // 关键：使用牧场ID而非名称
+      pageNum: 1,
+      pageSize: 999
+    }
+  }).then(res => {
+    acceptSheepfold.value = res.rows || [];
+    if (acceptSheepfold.value.length === 0) {
+      proxy.$modal.msgWarning(`转入牧场“${ranchName}”没有可用的接收羊舍`);
+    }
+  }).catch(error => {
+    console.error('加载接收羊舍失败:', error);
+    proxy.$modal.msgError('获取接收羊舍数据失败');
+  });
+}
+
 // 通过牧场 ID 查询牧场名称
 async function getRanchNameByRanchId(ranchId) {
   if (!ranchId) return '';
@@ -418,11 +530,22 @@ function handleExport() {
 
 // 审批
 function handleApprove(row) {
+  if (row.status !== 0) {
+    proxy.$modal.msgWarning("该记录已完成审批，无法重复操作");
+    return;
+  }
   approveForm.value = { ...row };
   approveDialog.value = true;
   displayManageTags.value = Array.isArray(row.manageTags)
     ? row.manageTags.join(',')
     : row.manageTags || '';
+
+  if (row.eventType === '转场转入') {
+    loadSheepfoldsByRanch(row.transTo);
+  } else {
+    acceptSheepfold.value = [];
+  }
+  approveDialog.value = true;
 }
 
 // 审批同意
@@ -433,10 +556,13 @@ function handleApproveAgree() {
   }
 
   approveForm.value.status = 1;
-  
+  if (approveForm.value.eventType === '转场转入' && !approveForm.value.sheepfoldId) {
+    proxy.$modal.msgError('请选择接收羊舍');
+    return;
+  }
   approveTransitionInfo(approveForm.value).then(() => {
     approveDialog.value = false;
-    proxy.$modal.msgSuccess('审批通过，已更新羊只所在牧场');
+    proxy.$modal.msgSuccess('通过请求，已更新羊只信息');
     getList();
   }).catch(error => {
     proxy.$modal.msgError(`审批失败：${error.message}`);
@@ -448,8 +574,10 @@ function handleApproveReject() {
   approveForm.value.status = 2;
   updateTransition_info(approveForm.value).then(() => {
     approveDialog.value = false;
-    proxy.$modal.msgSuccess('审批成功，状态已更新为驳回');
+    proxy.$modal.msgSuccess('驳回请求');
     getList();
+  }).catch(error => {
+    proxy.$modal.msgError(`审批失败：${error.message}`);
   });
 }
 
@@ -488,6 +616,8 @@ function handleQuery() {
 //重置
 function resetQuery() {
   daterangeCreateTime.value = []
+  queryParams.value.transType = null;
+  transitionDateRange.value = [];
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -563,6 +693,8 @@ async function submitForm() {
         transTo: form.value.transTo,
         transFrom: form.value.tagDetails[tag].ranchName,
         transType: form.value.transType,
+        eventType: form.value.eventType,
+        transitionDate: form.value.transitionDate,
         technician: form.value.technician,
         comment: form.value.tagDetails[tag].comment,
         status: 0,
@@ -571,6 +703,7 @@ async function submitForm() {
       submitData = {
         ...form.value,
         manageTags: validTags.join(','),
+        eventType: form.value.eventType,
       };
     }
 
@@ -602,7 +735,7 @@ function getVarietyOptions() {
 //删除
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除转场编号为"' + _ids + '"的数据项？')
+  proxy.$modal.confirm('是否确认删除这条记录数据')
     .then(() => delTransition_info(_ids))
     .then(() => {
       getList()
@@ -618,3 +751,13 @@ onMounted(() => {
   getList();
 });
 </script>
+
+<style scoped>
+.tag-count {
+  color: #606266;
+  background-color: #f5f7fa;
+  padding: 2px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+</style>

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

@@ -2,28 +2,24 @@
   <div class="app-container">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="width: 150px;" />
       </el-form-item>
-
       <el-form-item label="羊舍" prop="sheepfold">
         <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
       </el-form-item>
-
       <el-form-item label="品种" prop="varietyId">
         <el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
-
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -56,17 +52,18 @@
     <el-table v-loading="loading" :data="castrateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="耳号" align="center" prop="manageTags" />
-      <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
       <el-table-column label="品种" align="center" prop="varietyName" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="技术员" align="center" prop="technician" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <!-- 按需添加 是否需要修改功能 -->
@@ -85,11 +82,16 @@
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="castrateRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="管理耳号" prop="manageTags">
+          <div style="display: flex; align-items: center; gap: 8px;">
             <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
-            style="width: 100%" @change="loadSheepInfo" @blur="loadSheepInfo">
+              style="width: 100%; flex:1;" @change="loadSheepInfo" @blur="loadSheepInfo">
               <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
                 :value="sheep.manageTags" />
             </el-select>
+            <span v-if="form.manageTags?.length > 0" class="tag-count">
+              已选 {{ form.manageTags.length }} 个
+            </span>
+          </div>
         </el-form-item>
         <el-form-item label="羊舍" prop="sheepfold">
           <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable @change="loadSheepBySheepfold">
@@ -405,7 +407,7 @@ function submitForm() {
 //删除
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm(`是否确认删除去势编号为"${_ids}"的数据项？`).then(() => {
+  proxy.$modal.confirm(`是否确认删除这条记录数据`).then(() => {
     return delCastrate(_ids)
   }).then(() => {
     getList()
@@ -432,3 +434,13 @@ onMounted(() => {
   getList()
 })
 </script>
+
+<style scoped>
+.tag-count {
+  color: #606266;
+  background-color: #f5f7fa;
+  padding: 2px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+</style>

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

@@ -1,11 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="width: 150px;" />
       </el-form-item>
-
       <el-form-item label="羊舍" prop="sheepfold">
         <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
           <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
@@ -16,12 +19,6 @@
           <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
         </el-select>
       </el-form-item>
-
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -53,17 +50,18 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="fixHoofList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="耳号" align="center" prop="manageTags" />
-      <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" width="120" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
       <el-table-column label="品种" align="center" prop="varietyName" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="技术员" align="center" prop="technician" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <!-- 按需添加 是否需要修改功能 -->
@@ -82,11 +80,16 @@
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="fixHoofRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="耳号" prop="manageTags">
+          <div style="display: flex; align-items: center; gap: 8px;">
             <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
-            style="width: 100%" @change="loadSheepInfo">
+              style="width: 100%; flex:1;" @change="loadSheepInfo">
               <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
                 :value="sheep.manageTags" />
             </el-select>
+            <span v-if="form.manageTags?.length > 0" class="tag-count">
+              已选 {{ form.manageTags.length }} 个
+            </span>
+          </div>
         </el-form-item>
         <el-form-item label="羊舍" prop="sheepfolds">
           <el-select v-model="form.sheepfold" filterable style="width: 100%" @change="loadSheepBySheepfold">
@@ -345,7 +348,7 @@ function submitForm() {
 //删除
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm(`是否确认删除修蹄编号为"${_ids}"的数据项？`).then(() => {
+  proxy.$modal.confirm(`是否确认删除这条记录数据`).then(() => {
     return delFixHoof(_ids)
   }).then(() => {
     getList()
@@ -372,3 +375,13 @@ onMounted(() => {
   getList()
 })
 </script>
+
+<style scoped>
+.tag-count {
+  color: #606266;
+  background-color: #f5f7fa;
+  padding: 2px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+</style>