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

package.json

@@ -21,6 +21,7 @@
     "@vueuse/core": "10.11.0",
     "axios": "0.28.1",
     "clipboard": "2.0.11",
+    "date-fns": "^4.1.0",
     "echarts": "5.5.1",
     "element-plus": "^2.7.6",
     "file-saver": "2.0.5",

src/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js

@@ -1,44 +1,29 @@
+// src/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js
 import request from '@/utils/request'
 
-// 查询羊奶出入库列表
+// 查询羊奶产量分析列表（分页 + 条件）
-export function listMilkInOutStore(query) {
+export function listSheepMilkAnalysis(query) {
   return request({
-    url: '/milkInOutStore/milkInOutStore/list',
+    url: '/dairyProducts/sheepMilkAnalysis/list',
     method: 'get',
     params: query
   })
 }
 
-// 查询羊奶出入库详细
+// 查询单个羊奶产量分析详细信息
-export function getMilkInOutStore(id) {
+export function getSheepMilkAnalysis(sheepId) {
   return request({
-    url: '/milkInOutStore/milkInOutStore/' + id,
+    url: '/dairyProducts/sheepMilkAnalysis/' + sheepId,
     method: 'get'
   })
 }
 
-// 新增羊奶出入库
+// 导出羊奶产量分析 Excel
-export function addMilkInOutStore(data) {
+export function exportSheepMilkAnalysis(query) {
   return request({
-    url: '/milkInOutStore/milkInOutStore',
+    url: '/dairyProducts/sheepMilkAnalysis/export',
-    method: 'post',
+    method: 'get',
-    data: data
+    params: query,
-  })
+    responseType: 'blob' // 返回二进制流
-}
-
-// 修改羊奶出入库
-export function updateMilkInOutStore(data) {
-  return request({
-    url: '/milkInOutStore/milkInOutStore',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除羊奶出入库
-export function delMilkInOutStore(id) {
-  return request({
-    url: '/milkInOutStore/milkInOutStore/' + id,
-    method: 'delete'
   })
 }

src/api/produce/bodyManage/body_measure.js

@@ -42,3 +42,10 @@ export function delBody_measure(id) {
     method: 'delete'
   })
 }
+//获取羊只类别列表
+export function getSheepTypeList() {
+  return request({
+    url: '/base/base/list', 
+    method: 'get'
+  })
+}

src/views/biosafety/diagnosis/index.vue

@@ -68,7 +68,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="180">
+      <el-table-column label="时间日期" align="center" prop="datetime" width="150">
         <template #default="scope">
           <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -83,19 +83,19 @@
       <el-table-column label="诊疗结果" align="center" prop="result">
         <template #default="scope"><dict-tag :options="diag_result" :value="scope.row.result" /></template>
       </el-table-column>
-      <el-table-column label="开始时间" align="center" prop="begindate">
+      <el-table-column label="开始时间" align="center" prop="begindate" width="150">
         <template #default="scope">
           <span>{{ parseTime(scope.row.begindate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="enddate">
+      <el-table-column label="结束时间" align="center" prop="enddate" width="150">
         <template #default="scope">
           <span>{{ parseTime(scope.row.enddate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="治疗天数" align="center" prop="treatDay" />
-      <el-table-column label="羊舍" align="center" prop="sheepfold" width="100px" />
+      <el-table-column label="羊舍" align="center" prop="sheepfold" width="150px" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100px">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140px">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['diagnosis:diagnosis:edit']">修改</el-button>

src/views/biosafety/disinfect/index.vue

@@ -34,7 +34,7 @@
     <!-- 列表 -->
     <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="sheepfoldName" />
       <el-table-column label="消毒日期" align="center" prop="datetime" width="180">
         <template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
       </el-table-column>
@@ -164,7 +164,7 @@
       <el-form ref="editFormRef" :model="editForm" :rules="rules" label-width="100px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="羊舍" >
+            <el-form-item label="羊舍">
               <span>{{ editForm.sheepfoldName }}</span>
             </el-form-item>
           </el-col>
@@ -208,7 +208,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" />
+                <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/health/index.vue

@@ -122,7 +122,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" />
+                <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/medicine/index.vue

@@ -41,7 +41,6 @@
 
     <el-table v-loading="loading" :data="medicineList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" />
       <el-table-column label="药品编号" align="center" prop="medica" />
       <el-table-column label="药品名称" align="center" prop="name" />
       <el-table-column label="药品类型" align="center" prop="medicType" :formatter="formatType"></el-table-column>

src/views/dairyProducts/sheepMilkAnalysis/index.vue

@@ -6,7 +6,7 @@
         <el-input v-model="queryParams.manageEarTag" placeholder="请输入耳号" />
       </el-form-item>
       <el-form-item label="筛选天数">
-        <el-input-number v-model="queryParams.screenDays" :min="0" placeholder="请输入天数" />
+        <el-input-number v-model="queryParams.screenDays" :min="1" placeholder="请输入天数" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleQuery">查询</el-button>
@@ -18,34 +18,25 @@
     <div class="button-group">
       <el-button type="success" @click="handleExport">导出</el-button>
 
-      <el-popover
+      <el-popover placement="bottom" width="400" trigger="click">
-        placement="bottom"
-        width="400"
-        trigger="click"
-        >
         <el-checkbox-group v-model="selectedFields" class="checkbox-columns">
-                <el-checkbox
+            <el-checkbox v-for="col in allColumns" :key="col.prop" :label="col.prop">{{ col.label }}</el-checkbox>
-                    v-for="col in allColumns"
-                    :key="col.prop"
-                    :label="col.prop"
-                >{{ col.label }}</el-checkbox>
         </el-checkbox-group>
-
         <template #reference>
             <el-button type="info">展示列</el-button>
         </template>
       </el-popover>
-
     </div>
 
     <!-- 数据表格 -->
-    <el-table :data="list" border style="width: 100%" v-loading="loading" :row-key="row => row.id">
+    <el-table :data="list" border style="width: 100%" v-loading="loading" :row-key="row => row.sheepId">
       <el-table-column
         v-for="col in visibleColumns"
         :key="col.prop"
         :label="col.label"
         :prop="col.prop"
         :min-width="col.minWidth || 120"
+        :formatter="col.formatter || undefined"
       />
     </el-table>
 
@@ -65,6 +56,7 @@
 
 <script>
 import { listSheepMilkAnalysis, exportSheepMilkAnalysis } from "@/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js";
+import { format } from 'date-fns';
 
 export default {
   name: "SheepMilkAnalysis",
@@ -77,47 +69,47 @@ export default {
         pageNum: 1,
         pageSize: 10,
         manageEarTag: null,
-        screenDays: null
+        screenDays: 100 // 默认筛选天数
       },
       selectedFields: [],
       allColumns: [
         { label: "耳号", prop: "manageEarTag" },
         { label: "品种", prop: "variety" },
-        { label: "挤奶时间", prop: "milkingDate" },
+        { label: "挤奶开始时间", prop: "milkingStartTime", formatter: row => row.milkingStartTime ? format(new Date(row.milkingStartTime),'yyyy-MM-dd') : '' },
-        { label: "干奶时间", prop: "dryDate" },
+        { label: "干奶时间", prop: "dryEndTime", formatter: row => row.dryEndTime ? format(new Date(row.dryEndTime),'yyyy-MM-dd') : '' },
-        { label: "筛选天数", prop: "screeningDays" },
+        { label: "筛选天数", prop: "screenDays" },
         { label: "挤奶天数", prop: "milkingDays" },
-        { label: "校正后最大胎次", prop: "maxCorrectedParity" },
+        { label: "校正后最大胎次", prop: "maxParity" },
-        { label: "系统奶量之合计", prop: "systemMilkTotal" },
+        { label: "系统奶量之合计", prop: "sumSystemMilk" },
-        { label: "校正奶量之合计", prop: "correctedMilkTotal" },
+        { label: "校正奶量之合计", prop: "sumCorrectedMilk" },
-        { label: "校正日平均奶量", prop: "avgDailyCorrectedMilk" },
+        { label: "校正日平均奶量", prop: "avgCorrectedDaily" },
-        { label: "胎次1的总产奶量", prop: "parity1TotalMilk" },
+        { label: "胎次1的总奶量", prop: "sumParity1Milk" },
-        { label: "胎次2的总产奶量", prop: "parity2TotalMilk" },
+        { label: "胎次2的总奶量", prop: "sumParity2Milk" },
-        { label: "胎次3的总产奶量", prop: "parity3TotalMilk" },
+        { label: "胎次3的总奶量", prop: "sumParity3Milk" },
-        { label: "胎次4的总产奶量", prop: "parity4TotalMilk" },
+        { label: "胎次4的总奶量", prop: "sumParity4Milk" },
-        { label: "胎次1的日平均产量", prop: "parity1AvgDailyMilk" },
+        { label: "胎次1日平均", prop: "avgParity1Daily" },
-        { label: "胎次2的日平均产量", prop: "parity2AvgDailyMilk" },
+        { label: "胎次2日平均", prop: "avgParity2Daily" },
-        { label: "胎次3的日平均产量", prop: "parity3AvgDailyMilk" },
+        { label: "胎次3日平均", prop: "avgParity3Daily" },
-        { label: "胎次4的日平均产量", prop: "parity4AvgDailyMilk" },
+        { label: "胎次4日平均", prop: "avgParity4Daily" },
         { label: "泌乳天数", prop: "lactationDays" },
-        { label: "过去7日日平均奶量", prop: "past7DaysAvgMilk" },
+        { label: "过去7日均奶量", prop: "avgLast7Milk" },
-        { label: "校正过去7日日平均奶量", prop: "past7DaysAvgCorrectedMilk" },
+        { label: "校正过去7日均", prop: "avgLast7Corrected" },
-        { label: "过去14日日平均奶量", prop: "past14DaysAvgMilk" },
+        { label: "过去14日均奶量", prop: "avgLast14Milk" },
-        { label: "过去30日日平均奶量", prop: "past30DaysAvgMilk" },
+        { label: "过去30日均奶量", prop: "avgLast30Milk" },
-        { label: "羊只类型", prop: "sheepType" },
+        { label: "羊只类别", prop: "sheepCategory" },
-        { label: "生日", prop: "birthDate" },
+        { label: "生日", prop: "birthday", formatter: row => row.birthday ? format(new Date(row.birthday),'yyyy-MM-dd') : '' },
-        { label: "当前胎次", prop: "currentParity" },
+        { label: "当前胎次", prop: "parity" },
-        { label: "月龄", prop: "ageMonths" },
+        { label: "月龄", prop: "monthAge" },
         { label: "当前体重", prop: "currentWeight" },
         { label: "繁育状态", prop: "breedStatus" },
-        { label: "父号", prop: "fatherTag" },
+        { label: "父号", prop: "fatherManageTags" },
-        { label: "母号", prop: "motherTag" },
+        { label: "母号", prop: "motherManageTags" },
-        { label: "牧场名称", prop: "ranchName" },
+        { label: "牧场", prop: "ranchName" },
-        { label: "家系", prop: "familyLine" },
+        { label: "家系", prop: "family" },
         { label: "母亲挤奶天数", prop: "motherMilkingDays" },
-        { label: "母亲校正奶量之合计", prop: "motherCorrectedMilkTotal" },
+        { label: "母亲校正奶量之合计", prop: "motherSumCorrected" },
-        { label: "母亲校正后最大胎次", prop: "motherMaxCorrectedParity" },
+        { label: "母亲校正后最大胎次", prop: "motherMaxParity" },
-        { label: "母亲校正日平均奶量", prop: "motherAvgDailyCorrectedMilk" }
+        { label: "母亲校正日平均奶量", prop: "motherAvgCorrectedDaily" }
       ]
     };
   },
@@ -134,10 +126,12 @@ export default {
     getList() {
       this.loading = true;
       listSheepMilkAnalysis(this.queryParams).then(response => {
-        this.list = response.rows;
+        // 兼容可能的 axios wrapper：有的返回 { data: { rows, total } }, 有的直接返回 { rows, total }
-        this.total = response.total;
+        const res = response && response.data ? response.data : response;
+        this.list = res.rows || res;
+        this.total = res.total || (Array.isArray(this.list) ? this.list.length : 0);
         this.loading = false;
-      });
+      }).catch(()=>{ this.loading = false; });
     },
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -148,7 +142,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         manageEarTag: null,
-        screenDays: null
+        screenDays: 100
       };
       this.selectedFields = this.allColumns.map(c => c.prop);
       this.getList();
@@ -163,7 +157,8 @@ export default {
     },
     handleExport() {
       exportSheepMilkAnalysis(this.queryParams).then(response => {
-        const blob = new Blob([response], { type: 'application/vnd.ms-excel' });
+        const data = response && response.data ? response.data : response;
+        const blob = new Blob([data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
         const url = window.URL.createObjectURL(blob);
         const link = document.createElement('a');
         link.href = url;
@@ -171,6 +166,9 @@ export default {
         document.body.appendChild(link);
         link.click();
         document.body.removeChild(link);
+        window.URL.revokeObjectURL(url);
+      }).catch(err => {
+        this.$message.error('导出失败，请检查后端是否正确返回文件流');
       });
     }
   }

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

@@ -8,6 +8,25 @@
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
       </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="品种" 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="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>
@@ -43,6 +62,24 @@
       <!-- <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" fixed 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="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="sheepTypeName" />
+      <el-table-column label="性别" align="center">
+        <template #default="scope">
+          <span>{{ genderMap[scope.row.gender] || '未知' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="胎次" align="center" prop="parity" />
+      <el-table-column label="出生体重(kg)" align="center" prop="birthWeight" min-width="100px" />
+      <el-table-column label="断奶体重(kg)" align="center" prop="weaningWeight" min-width="100px" />
+      <el-table-column label="当前体重(kg)" align="center" prop="currentWeight" min-width="100px" />
       <el-table-column label="体高" align="center" prop="height" />
       <el-table-column label="胸围" align="center" prop="bust" />
       <el-table-column label="体斜长" align="center" prop="bodyLength" />
@@ -53,6 +90,30 @@
       <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>
+        </template>
+      </el-table-column>
       <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" />
@@ -84,7 +145,10 @@
               <el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="onManageTagsBlur" :disabled="!isAdd"
                 clearable />
             </el-form-item>
-
+            <el-form-item label="测量日期" prop="measureDate">
+              <el-date-picker v-model="form.measureDate" value-format="YYYY-MM-DD" type="date" placeholder="请选择测量日期"
+                :disabled="!isAdd"></el-date-picker>
+            </el-form-item>
             <el-form-item label="体高" prop="height">
               <el-input v-model="form.height" placeholder="请输入体高" :disabled="!isAdd" clearable />
             </el-form-item>
@@ -149,10 +213,11 @@
 </template>
 
 <script setup name="Body_measure">
-import { listBody_measure, getBody_measure, delBody_measure, addBody_measure, updateBody_measure } from "@/api/produce/bodyManage/body_measure"
+import { listBody_measure, getBody_measure, delBody_measure, addBody_measure, updateBody_measure, getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
-import { getCurrentInstance } from 'vue'
 import { getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
-
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
+import { getVarietyOptions } from '@/api/produce/other/fixHoof'
+import { getCurrentInstance } from 'vue'
 const { proxy } = getCurrentInstance()
 
 const body_measureList = ref([])
@@ -166,6 +231,13 @@ const total = ref(0)
 const title = ref("")
 const daterangeCreateTime = ref([])
 const isAdd = ref(false)
+const daterangeMeasureDate = ref([]);
+
+const genderMap = {
+  1: '母',
+  2: '公',
+  3: '阉羊'
+};
 
 const data = reactive({
   form: { manageTags: null, technician: null },
@@ -173,7 +245,10 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     sheepId: null,
+    sheepfoldId: null,
+    varietyId: null,
     manageTags: null,
+    measureDate: null,
     createTime: null
   },
   rules: {
@@ -183,7 +258,12 @@ const data = reactive({
     technician: [
       { required: true, message: '请输入技术员', trigger: 'blur' }
     ],
-  }
+    measureDate: [
+      { required: true, message: '请选择测量日期', trigger: 'change' }
+    ]
+  },
+  sheepfoldName: '',
+  varietyName: '',
 })
 
 const { queryParams, form, rules } = toRefs(data)
@@ -196,6 +276,10 @@ function getList() {
     queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
     queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
   }
+  if (daterangeMeasureDate.value.length > 0) {
+    queryParams.value.params["beginMeasureDate"] = daterangeMeasureDate.value[0];
+    queryParams.value.params["endMeasureDate"] = daterangeMeasureDate.value[1];
+  }
   listBody_measure(queryParams.value).then(response => {
     body_measureList.value = response.rows
     total.value = response.total
@@ -252,6 +336,7 @@ function reset() {
     comment: null,
     technician: null,
     createBy: null,
+    measureDate: null,
     createTime: null
   }
   proxy.resetForm("body_measureRef")
@@ -265,9 +350,14 @@ function handleQuery() {
 
 /** 重置按钮操作 */
 function resetQuery() {
-  daterangeCreateTime.value = []
+  daterangeCreateTime.value = [];
-  proxy.resetForm("queryRef")
+  queryParams.value.sheepfoldId = null;
-  handleQuery()
+  data.sheepfoldName = '';
+  queryParams.value.varietyId = null;
+  data.varietyName = '';
+  daterangeMeasureDate.value = [];
+  proxy.resetForm("queryRef");
+  handleQuery();
 }
 
 // 多选框选中数据
@@ -336,5 +426,36 @@ function handleExport() {
   }, `body_measure_${new Date().getTime()}.xlsx`)
 }
 
-getList()
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
+}
+//加载品种数据
+const varietyOptions = ref([])
+function loadVarietyOptions() {
+  getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
+    varietyOptions.value = res.rows;
+  })
+}
+
+// 加载羊只类别数据
+const sheepTypeList = ref([]);
+function loadSheepTypeList() {
+  getSheepTypeList().then(response => {
+    sheepTypeList.value = response.rows || [];
+  }).catch(error => {
+    console.error('加载羊只类别失败', error);
+  });
+}
+
+
+onMounted(() => {
+  getSheepfoldOptions()
+  loadSheepTypeList()
+  loadVarietyOptions()
+  getList()
+})
 </script>

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

@@ -8,6 +8,11 @@
         <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
       </el-form-item>
+      <el-form-item label="品种" prop="varietyId">
+        <el-select v-model="queryParams.varietyId" placeholder="请选择品种" clearable style="min-width:150px">
+          <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="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
@@ -17,8 +22,8 @@
           style="max-width: 150px;" />
       </el-form-item>
       <el-form-item label="羊舍" prop="sheepfold">
-        <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" clearable filterable @keyup.enter="handleQuery">
+        <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
-          <el-option v-for="item in sheepfoldList" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
+          <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">
@@ -39,10 +44,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['body_score:body_score: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="['body_score:body_score: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="['body_score:body_score:remove']">删除</el-button>
@@ -58,27 +63,29 @@
       <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" fixed />
+      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" fixed />
-      <el-table-column label="事件日期" align="center" prop="datetime" width="180">
+      <el-table-column label="品种" align="center" prop="varietyName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" />
+      <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="score" />
       <!-- <el-table-column label="羊舍id" align="center" prop="sheepfold" /> -->
-      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
-      <el-table-column label="备注" align="center" prop="comment" />
+      <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" width="180">
+      <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">
+      <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)"
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['body_score:body_score:edit']">修改</el-button>
+            v-hasPermi="['body_score:body_score:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['body_score:body_score:remove']">删除</el-button>
         </template>
@@ -133,8 +140,8 @@
 
 <script setup name="Body_score">
 import { listBody_score, getBody_score, delBody_score, addBody_score, updateBody_score } from "@/api/produce/bodyManage/body_score"
-import { listSheepfold } from "@/api/produce/manage_sheep/trans_group"
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
-import { checkSheepByManageTags } from "@/api/produce/other/fixHoof"
+import { checkSheepByManageTags, getVarietyOptions } from "@/api/produce/other/fixHoof"
 import { getCurrentInstance, ref, reactive, toRefs } from 'vue'
 
 const { proxy } = getCurrentInstance()
@@ -167,6 +174,8 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     manageTags: null,
+    varietyId: null,
+    sheepfold: null,
     score: null,
     createTime: null
   },
@@ -234,14 +243,12 @@ function onManageTagsBlur() {
   });
 }
 
-// 加载羊舍列表
+//加载羊舍数据
-function loadSheepfoldList() {
+const sheepfoldOptions = ref([])
-  listSheepfold().then(response => {
+function getSheepfoldOptions() {
-    sheepfoldList.value = response.rows || [];
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
-  }).catch(err => {
+    sheepfoldOptions.value = res.rows
-    console.error("加载羊舍列表失败：", err);
+  })
-    proxy.$modal.msgError("加载羊舍列表失败，请刷新页面重试");
-  });
 }
 
 // 取消按钮
@@ -276,6 +283,7 @@ function handleQuery() {
 function resetQuery() {
   daterangeDatetime.value = []
   daterangeCreateTime.value = []
+  queryParams.value.varietyId = null;
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -350,6 +358,17 @@ function handleExport() {
   }, `body_score_${new Date().getTime()}.xlsx`)
 }
 
-getList()
+//加载品种数据
-loadSheepfoldList(); 
+const varietyOptions = ref([])
+function loadVarietyOptions() {
+  getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
+    varietyOptions.value = res.rows;
+  })
+}
+
+onMounted(() => {
+  loadVarietyOptions()
+  getSheepfoldOptions()
+  getList()
+})
 </script>

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

@@ -8,6 +8,20 @@
         <el-input v-model="queryParams.manageTags" placeholder="请输入耳号搜索" clearable @keyup.enter="handleQuery"
           style="max-width: 160px;" />
       </el-form-item>
+      <el-form-item label="品种" prop="varietyId">
+        <el-select v-model="queryParams.varietyId" placeholder="请选择品种" clearable style="min-width:150px">
+          <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>
@@ -23,10 +37,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['breast_rating:breast_rating: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="['breast_rating:breast_rating: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="['breast_rating:breast_rating:remove']">删除</el-button>
@@ -42,25 +56,33 @@
       <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" />
+      <el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" fixed />
+      <el-table-column label="品种" align="center" prop="varietyName" />
+      <el-table-column label="事件类型" align="center" prop="eventType" />
+      <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="sheepfoldName" min-width="120px" />
       <el-table-column label="乳房深度" align="center" prop="depth" />
       <el-table-column label="乳房长度" align="center" prop="length" />
       <el-table-column label="乳房位置" align="center" prop="position" />
       <el-table-column label="乳房附着" align="center" prop="adbere" />
-      <el-table-column label="乳房间隔度" align="center" prop="spacing" />
+      <el-table-column label="乳房间隔度" align="center" prop="spacing" min-width="120px" />
       <el-table-column label="乳房评分" align="center" prop="score" />
       <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="150">
+      <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">
+      <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)"
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['breast_rating:breast_rating:edit']">修改</el-button>
+            v-hasPermi="['breast_rating:breast_rating:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['breast_rating:breast_rating:remove']">删除</el-button>
         </template>
@@ -80,6 +102,11 @@
           <el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="onManageTagsBlur" clearable
             :disabled="!isAdd" />
         </el-form-item>
+        <el-form-item label="事件日期" prop="eventDate">
+          <el-date-picker clearable v-model="form.eventDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择事件日期"
+            :disabled="!isAdd">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="乳房深度" prop="depth">
           <el-input v-model="form.depth" placeholder="请输入乳房深度" :disabled="!isAdd" />
         </el-form-item>
@@ -117,7 +144,8 @@
 
 <script setup name="Breast_rating">
 import { listBreast_rating, getBreast_rating, delBreast_rating, addBreast_rating, updateBreast_rating } from "@/api/produce/bodyManage/breast_rating"
-import { checkSheepByManageTags } from "@/api/produce/other/fixHoof"
+import { checkSheepByManageTags, getVarietyOptions } from "@/api/produce/other/fixHoof"
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { getCurrentInstance, reactive, ref } from "vue"
 
 const { proxy } = getCurrentInstance()
@@ -132,11 +160,13 @@ const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
 const daterangeCreateTime = ref([])
+const daterangeEventDate = ref([]);
 const isAdd = ref(false)
 const data = reactive({
   form: {
     id: null,
     manageTags: null,
+    eventDate: null,
     depth: null,
     length: null,
     position: null,
@@ -170,6 +200,10 @@ const { queryParams, form, rules } = toRefs(data)
 function getList() {
   loading.value = true
   queryParams.value.params = {}
+  if (daterangeEventDate.value.length) {
+    queryParams.value.params["beginEventDate"] = daterangeEventDate.value[0]
+    queryParams.value.params["endEventDate"] = daterangeEventDate.value[1]
+  }
   if (daterangeCreateTime.value.length) {
     queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
     queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
@@ -241,6 +275,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
+  daterangeEventDate.value = [];
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -315,5 +350,25 @@ function handleExport() {
   }, `breast_rating_${new Date().getTime()}.xlsx`)
 }
 
-getList()
+//加载羊舍数据
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows
+  })
+}
+
+//加载品种数据
+const varietyOptions = ref([])
+function loadVarietyOptions() {
+  getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
+    varietyOptions.value = res.rows;
+  })
+}
+
+onMounted(() => {
+  loadVarietyOptions()
+  getSheepfoldOptions()
+  getList()
+})
 </script>

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

@@ -36,10 +36,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['changeComment:changeComment: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="['changeComment:changeComment: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="['changeComment:changeComment:remove']">删除</el-button>
@@ -66,8 +66,8 @@
       </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)"
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['changeComment:changeComment:edit']">修改</el-button>
+            v-hasPermi="['changeComment:changeComment:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['changeComment:changeComment:remove']">删除</el-button>
         </template>
@@ -90,7 +90,7 @@
           <el-input v-model="form.newComment" placeholder="请输入新备注" :disabled="!isAddMode" />
         </el-form-item>
         <el-form-item label="原备注" prop="oldComment">
-          <el-input v-model="form.oldComment" placeholder="请输入原备注" :disabled="!isAddMode" />
+          <el-input v-model="form.oldComment" placeholder="请输入原备注" disabled />
         </el-form-item>
       </el-form>
       <template #footer>

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

@@ -31,10 +31,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['changeEar:changeEar: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="['changeEar:changeEar: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="['changeEar:changeEar:remove']">删除</el-button>
@@ -67,8 +67,8 @@
       </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)"
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['changeEar:changeEar:edit']">修改</el-button>
+            v-hasPermi="['changeEar:changeEar:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['changeEar:changeEar:remove']">删除</el-button>
         </template>
@@ -98,7 +98,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="!isAddMode" />
+          <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" />
@@ -115,7 +115,7 @@
 </template>
 
 <script setup name="ChangeEar">
-import { listChangeEar, getChangeEar, delChangeEar, addChangeEar, updateChangeEar, getSheepByEarNumber,checkTagExists } from "@/api/produce/manage_sheep/changeEar"
+import { listChangeEar, getChangeEar, delChangeEar, addChangeEar, updateChangeEar, getSheepByEarNumber, checkTagExists } from "@/api/produce/manage_sheep/changeEar"
 
 const { proxy } = getCurrentInstance()
 

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

@@ -38,10 +38,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['changeVariety:changeVariety: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="['changeVariety:changeVariety: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="['changeVariety:changeVariety:remove']">删除</el-button>
@@ -69,8 +69,8 @@
       </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)"
+          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['changeVariety:changeVariety:edit']">修改</el-button>
+            v-hasPermi="['changeVariety:changeVariety:edit']">修改</el-button> -->
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['changeVariety:changeVariety:remove']">删除</el-button>
         </template>
@@ -90,7 +90,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="!isAdd" />
+          <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">

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

@@ -102,14 +102,12 @@
               :value="sheep.manageTags" />
           </el-select>
         </el-form-item>
-        <!-- 在el-form中新增牧场选择项 -->
         <el-form-item label="牧场" prop="ranchId">
           <el-select v-model="form.ranchId" placeholder="请选择牧场" clearable @change="handleRanchChange">
             <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName" :value="ranch.id" />
           </el-select>
         </el-form-item>
 
-        <!-- 调整转出羊舍的options为当前牧场的羊舍 -->
         <el-form-item label="转出羊舍" prop="foldFrom">
           <el-select v-model="form.foldFrom" placeholder="请选择转出羊舍" clearable :disabled="!form.ranchId"
             @change="handleSheepFilter">
@@ -118,7 +116,6 @@
           </el-select>
         </el-form-item>
 
-        <!-- 调整转入羊舍的options为当前牧场的羊舍 -->
         <el-form-item label="转入羊舍" prop="foldTo">
           <el-select v-model="form.foldTo" placeholder="请选择转入羊舍" clearable :disabled="!form.ranchId">
             <el-option v-for="fold in currentRanchSheepfolds" :key="fold.id" :label="fold.sheepfoldName"

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

@@ -3,7 +3,8 @@
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="管理耳号" prop="manageTags">
-        <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery" 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="sheepfold">
@@ -154,9 +155,9 @@ const data = reactive({
     manageTags: [
       { required: true, message: '请输入管理耳号', trigger: 'blur' }
     ],
-    sheepfold: [
+    // sheepfold: [
-      { required: true, message: '请选择羊舍', trigger: 'change' }
+    //   { required: true, message: '请选择羊舍', trigger: 'change' }
-    ],
+    // ],
     technician: [
       { required: true, message: '请输入技术员', trigger: 'blur' }
     ]
@@ -426,8 +427,8 @@ function getSheepfoldOptions() {
 }
 
 onMounted(() => {
-  getList()
   getSheepfoldOptions()
   getVarietyOptions()
+  getList()
 })
 </script>

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

@@ -219,7 +219,7 @@ async function loadSheepInfo() {
   form.value.tagDetails = tagDetails;
 
   if (validTags.length > 0) {
-    const firstValidTag = validTags[0]; 耳号
+    const firstValidTag = validTags[0]; 
     const firstSheepfoldId = tagDetails[firstValidTag].sheepfoldId;
     form.value.sheepfold = firstSheepfoldId; 
   }