src/api/produce/bodyManage/body_measure.js

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

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

@@ -8,25 +8,6 @@
         <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>
@@ -62,24 +43,6 @@
       <!-- <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" />
@@ -90,30 +53,6 @@
       <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" />
@@ -145,10 +84,7 @@
               <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>
@@ -213,11 +149,10 @@
 </template>
 
 <script setup name="Body_measure">
-import { listBody_measure, getBody_measure, delBody_measure, addBody_measure, updateBody_measure, getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
+import { listBody_measure, getBody_measure, delBody_measure, addBody_measure, updateBody_measure } from "@/api/produce/bodyManage/body_measure"
-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'
+import { getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
+
 const { proxy } = getCurrentInstance()
 
 const body_measureList = ref([])
@@ -231,13 +166,6 @@ 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 },
@@ -245,10 +173,7 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     sheepId: null,
-    sheepfoldId: null,
-    varietyId: null,
     manageTags: null,
-    measureDate: null,
     createTime: null
   },
   rules: {
@@ -258,12 +183,7 @@ const data = reactive({
     technician: [
       { required: true, message: '请输入技术员', trigger: 'blur' }
     ],
-    measureDate: [
+  }
-      { required: true, message: '请选择测量日期', trigger: 'change' }
-    ]
-  },
-  sheepfoldName: '',
-  varietyName: '',
 })
 
 const { queryParams, form, rules } = toRefs(data)
@@ -276,10 +196,6 @@ 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
@@ -336,7 +252,6 @@ function reset() {
     comment: null,
     technician: null,
     createBy: null,
-    measureDate: null,
     createTime: null
   }
   proxy.resetForm("body_measureRef")
@@ -350,14 +265,9 @@ function handleQuery() {
 
 /** 重置按钮操作 */
 function resetQuery() {
-  daterangeCreateTime.value = [];
+  daterangeCreateTime.value = []
-  queryParams.value.sheepfoldId = null;
+  proxy.resetForm("queryRef")
-  data.sheepfoldName = '';
+  handleQuery()
-  queryParams.value.varietyId = null;
-  data.varietyName = '';
-  daterangeMeasureDate.value = [];
-  proxy.resetForm("queryRef");
-  handleQuery();
 }
 
 // 多选框选中数据
@@ -426,36 +336,5 @@ function handleExport() {
   }, `body_measure_${new Date().getTime()}.xlsx`)
 }
 
-//加载羊舍数据
-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,11 +8,6 @@
         <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>
@@ -22,8 +17,8 @@
           style="max-width: 150px;" />
       </el-form-item>
       <el-form-item label="羊舍" prop="sheepfold">
-        <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
+        <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" clearable filterable @keyup.enter="handleQuery">
-          <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
+          <el-option v-for="item in sheepfoldList" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
         </el-select>
       </el-form-item>
       <!-- <el-form-item label="羊舍id" prop="sheepfold">
@@ -44,10 +39,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>
@@ -63,29 +58,27 @@
       <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="manageTags" fixed />
-      <el-table-column label="品种" align="center" prop="varietyName" />
+      <el-table-column label="事件日期" align="center" prop="datetime" width="180">
-      <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" min-width="100px" />
+      <el-table-column label="羊舍" align="center" prop="sheepfoldName" />
-      <el-table-column label="备注" align="center" prop="comment" min-width="130px" />
+      <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="130px">
+      <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" min-width="150px" fixed="right">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150px">
         <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>
@@ -140,8 +133,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_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
+import { listSheepfold } from "@/api/produce/manage_sheep/trans_group"
-import { checkSheepByManageTags, getVarietyOptions } from "@/api/produce/other/fixHoof"
+import { checkSheepByManageTags } from "@/api/produce/other/fixHoof"
 import { getCurrentInstance, ref, reactive, toRefs } from 'vue'
 
 const { proxy } = getCurrentInstance()
@@ -174,8 +167,6 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     manageTags: null,
-    varietyId: null,
-    sheepfold: null,
     score: null,
     createTime: null
   },
@@ -243,12 +234,14 @@ function onManageTagsBlur() {
   });
 }
 
-//加载羊舍数据
+// 加载羊舍列表
-const sheepfoldOptions = ref([])
+function loadSheepfoldList() {
-function getSheepfoldOptions() {
+  listSheepfold().then(response => {
-  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldList.value = response.rows || [];
-    sheepfoldOptions.value = res.rows
+  }).catch(err => {
-  })
+    console.error("加载羊舍列表失败：", err);
+    proxy.$modal.msgError("加载羊舍列表失败，请刷新页面重试");
+  });
 }
 
 // 取消按钮
@@ -283,7 +276,6 @@ function handleQuery() {
 function resetQuery() {
   daterangeDatetime.value = []
   daterangeCreateTime.value = []
-  queryParams.value.varietyId = null;
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -358,17 +350,6 @@ function handleExport() {
   }, `body_score_${new Date().getTime()}.xlsx`)
 }
 
-//加载品种数据
-const varietyOptions = ref([])
-function loadVarietyOptions() {
-  getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
-    varietyOptions.value = res.rows;
-  })
-}
-
-onMounted(() => {
-  loadVarietyOptions()
-  getSheepfoldOptions()
 getList()
-})
+loadSheepfoldList(); 
 </script>

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

@@ -8,20 +8,6 @@
         <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>
@@ -37,10 +23,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>
@@ -56,33 +42,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="manageTags" />
-      <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" min-width="120px" />
+      <el-table-column label="乳房间隔度" align="center" prop="spacing" />
       <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" min-width="150">
+      <el-table-column label="创建时间" align="center" prop="createTime" 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">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120px">
         <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>
@@ -102,11 +80,6 @@
           <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>
@@ -144,8 +117,7 @@
 
 <script setup name="Breast_rating">
 import { listBreast_rating, getBreast_rating, delBreast_rating, addBreast_rating, updateBreast_rating } from "@/api/produce/bodyManage/breast_rating"
-import { checkSheepByManageTags, getVarietyOptions } from "@/api/produce/other/fixHoof"
+import { checkSheepByManageTags } from "@/api/produce/other/fixHoof"
-import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { getCurrentInstance, reactive, ref } from "vue"
 
 const { proxy } = getCurrentInstance()
@@ -160,13 +132,11 @@ 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,
@@ -200,10 +170,6 @@ 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]
@@ -275,7 +241,6 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   daterangeCreateTime.value = []
-  daterangeEventDate.value = [];
   proxy.resetForm("queryRef")
   handleQuery()
 }
@@ -350,25 +315,5 @@ function handleExport() {
   }, `breast_rating_${new Date().getTime()}.xlsx`)
 }
 
-//加载羊舍数据
-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 />
+          <el-input v-model="form.oldComment" placeholder="请输入原备注" :disabled="!isAddMode" />
         </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/>
+          <el-input v-model="form.oldTag" placeholder="请输入旧耳号/电子耳号" :disabled="!isAddMode" />
         </el-form-item>
         <el-form-item label="备注" prop="comment" v-if="!isAddMode">
           <el-input v-model="form.comment" type="textarea" placeholder="请输入内容" :disabled="!isAddMode" />

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/>
+          <el-input v-model="form.varietyOld" placeholder="请输入原品种" :disabled="!isAdd" />
         </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,12 +102,14 @@
               :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">
@@ -116,6 +118,7 @@
           </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,8 +3,7 @@
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="管理耳号" prop="manageTags">
-        <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
+        <el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery" style="width: 150px;"/>
-          style="width: 150px;" />
       </el-form-item>
 
       <el-form-item label="羊舍" prop="sheepfold">
@@ -155,9 +154,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' }
     ]
@@ -427,8 +426,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;
   }