From 0ae58dff21226347c547d38883d7f7568d62921f Mon Sep 17 00:00:00 2001
From: zyh <2066096076@qq.com>
Date: Sat, 12 Jul 2025 18:00:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=BB=E5=8A=BF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/produce/other/castrate/index.vue | 29 +++++++++++++---------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/views/produce/other/castrate/index.vue b/src/views/produce/other/castrate/index.vue
index bfb81a5..3c6ea8b 100644
--- a/src/views/produce/other/castrate/index.vue
+++ b/src/views/produce/other/castrate/index.vue
@@ -4,8 +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="羊舍id" prop="sheepfold">
-        <el-input v-model="queryParams.sheepfold" placeholder="请输入羊舍id" clearable @keyup.enter="handleQuery" />
+      <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="创建时间" style="width: 308px">
         <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
@@ -41,7 +43,7 @@
       <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="羊舍id" align="center" prop="sheepfold" />
+      <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="技术员" align="center" prop="technician" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -92,7 +94,7 @@
 
 <script setup name="castrate">
 import { listCastrate, getCastrate, delCastrate, addCastrate, updateCastrate } from "@/api/produce/other/castrate/castrate"
-// import { list as listSheepfold } from '@/api/system/sheepfold'; 
+import { listSheepfold_management as listSheepfold } from '@/api/sheepfold_management/sheepfold_management';
 
 const { proxy } = getCurrentInstance()
 
@@ -106,8 +108,6 @@ const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
 const daterangeCreateTime = ref([])
-//自定义一个空数组，为羊舍做准备
-const sheepfoldOptions = ref([]);
 
 const data = reactive({
   form: {},
@@ -127,7 +127,7 @@ const data = reactive({
       { required: true, message: "羊只id不能为空", trigger: "blur" }
     ],
     sheepfold: [
-      { required: true, message: "羊舍id不能为空", trigger: "change" }
+      { required: true, message: "羊舍不能为空", trigger: "change" }
     ],
     technician: [
       { required: true, message: "技术员不能为空", trigger: "blur" }
@@ -250,10 +250,15 @@ function handleExport() {
 }
 
 /** 加载所有羊舍 */
-// function getSheepfoldOptions() {
-//   listSheepfold().then(res => {
-//     sheepfoldOptions.value = res.rows || res; 
-//   });
-// }
+const sheepfoldOptions = ref([]);
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows;   // [{id, sheepfoldName}, ...]
+  });
+}
+onMounted(() => {
+  getList();
+  getSheepfoldOptions();  
+});
 getList()
 </script>