新增羊只，转群，修蹄，去势页面品种功能的完善

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

@@ -1,48 +1,65 @@
 <template>
   <div class="app-container">
+    <!-- 搜索 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="羊只id" prop="sheepId">
         <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
       </el-form-item>
+
       <el-form-item label="羊舍" prop="sheepfold">
-        <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width: 150px;" clearable>
+        <el-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="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+
+      <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>
       </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="['fixHoof:fixHoof:add']">新增</el-button>
+                   v-hasPermi="['fixHoof:fixHoof:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button>
+                   v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
+                   v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="Download" @click="handleExport"
-          v-hasPermi="['fixHoof:fixHoof:export']">导出</el-button>
+                   v-hasPermi="['fixHoof:fixHoof:export']">导出</el-button>
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
 
+    <!-- 列表 -->
     <el-table v-loading="loading" :data="fixHoofList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
       <el-table-column label="羊只id" align="center" prop="sheepId" />
       <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
+      <el-table-column label="品种" align="center" prop="varietyName" />
       <el-table-column label="备注" align="center" prop="comment" />
       <el-table-column label="技术员" align="center" prop="technician" />
       <el-table-column label="创建人" align="center" prop="createBy" />
@@ -54,17 +71,20 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button>
+                     v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
+                     v-hasPermi="['fixHoof:fixHoof: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" />
+    <pagination v-show="total > 0"
+                :total="total"
+                v-model:page="queryParams.pageNum"
+                v-model:limit="queryParams.pageSize"
+                @pagination="getList" />
 
-    <!-- 添加或修改修蹄对话框 -->
+    <!-- 弹窗 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="fixHoofRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="羊只id" prop="sheepId">
@@ -75,6 +95,11 @@
             <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
           </el-select>
         </el-form-item>
+        <el-form-item label="品种" prop="varietyId">
+          <el-select v-model="form.varietyId" placeholder="请选择品种" clearable>
+            <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="备注" prop="comment">
           <el-input v-model="form.comment" placeholder="请输入备注" />
         </el-form-item>
@@ -93,8 +118,9 @@
 </template>
 
 <script setup name="FixHoof">
-import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof } from "@/api/produce/other/fixHoof/fixHoof"
-import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management';
+import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof } from '@/api/produce/other/fixHoof/fixHoof'
+import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
+import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance()
 
@@ -106,7 +132,7 @@ const ids = ref([])
 const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
-const title = ref("")
+const title = ref('')
 const daterangeCreateTime = ref([])
 
 const data = reactive({
@@ -116,31 +142,31 @@ const data = reactive({
     pageSize: 10,
     sheepId: null,
     sheepfold: null,
+    varietyId: null,
     technician: null,
     createTime: null
   },
   rules: {
-    id: [
-      { required: true, message: "$comment不能为空", trigger: "blur" }
-    ],
     sheepId: [
-      { required: true, message: "羊只id不能为空", trigger: "blur" }
+      { required: true, message: '羊只id不能为空', trigger: 'blur' }
     ],
     sheepfold: [
-      { required: true, message: "羊舍id不能为空", trigger: "change" }
+      { required: true, message: '羊舍id不能为空', trigger: 'change' }
+    ],
+    varietyId: [
+      { required: true, message: '品种不能为空', trigger: 'change' }
     ],
     technician: [
-      { required: true, message: "技术员不能为空", trigger: "blur" }
-    ],
+      { required: true, message: '技术员不能为空', trigger: 'blur' }
+    ]
   }
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
-/** 查询修蹄列表 */
-function getList() {
+/* 列表 */
+function getList () {
   loading.value = true
-  // 空字符串转 null
   const q = { ...queryParams.value }
   if (q.sheepId === '') q.sheepId = null
   if (q.sheepfold === '') q.sheepfold = null
@@ -156,114 +182,114 @@ function getList() {
   })
 }
 
-// 取消按钮
-function cancel() {
+function cancel () {
   open.value = false
   reset()
 }
 
-// 表单重置
-function reset() {
+function reset () {
   form.value = {
     id: null,
     sheepId: null,
     sheepfold: null,
+    varietyId: null,
     comment: null,
     technician: null,
     createBy: null,
     createTime: null
   }
-  proxy.resetForm("fixHoofRef")
+  proxy.resetForm('fixHoofRef')
 }
 
-/** 搜索按钮操作 */
-function handleQuery() {
+function handleQuery () {
   queryParams.value.pageNum = 1
   getList()
 }
 
-/** 重置按钮操作 */
-function resetQuery() {
+function resetQuery () {
   daterangeCreateTime.value = []
-  proxy.resetForm("queryRef")
+  proxy.resetForm('queryRef')
   handleQuery()
 }
 
-// 多选框选中数据
-function handleSelectionChange(selection) {
+function handleSelectionChange (selection) {
   ids.value = selection.map(item => item.id)
-  single.value = selection.length != 1
+  single.value = selection.length !== 1
   multiple.value = !selection.length
 }
 
-/** 新增按钮操作 */
-function handleAdd() {
+function handleAdd () {
   reset()
   open.value = true
-  title.value = "添加修蹄"
+  title.value = '添加修蹄'
 }
 
-/** 修改按钮操作 */
-function handleUpdate(row) {
+function handleUpdate (row) {
   reset()
   const _id = row.id || ids.value
-  getFixHoof(_id).then(response => {
-    form.value = response.data
+  getFixHoof(_id).then(res => {
+    form.value = res.data
     open.value = true
-    title.value = "修改修蹄"
+    title.value = '修改修蹄'
   })
 }
 
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["fixHoofRef"].validate(valid => {
-    if (valid) {
-      if (form.value.id != null) {
-        updateFixHoof(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addFixHoof(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
-      }
+function submitForm () {
+  proxy.$refs.fixHoofRef.validate(valid => {
+    if (!valid) return
+    if (form.value.id) {
+      updateFixHoof(form.value).then(() => {
+        proxy.$modal.msgSuccess('修改成功')
+        open.value = false
+        getList()
+      })
+    } else {
+      addFixHoof(form.value).then(() => {
+        proxy.$modal.msgSuccess('新增成功')
+        open.value = false
+        getList()
+      })
     }
   })
 }
 
-/** 删除按钮操作 */
-function handleDelete(row) {
+function handleDelete (row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除修蹄编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal.confirm(`是否确认删除修蹄编号为"${_ids}"的数据项？`).then(() => {
     return delFixHoof(_ids)
   }).then(() => {
     getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => { })
+    proxy.$modal.msgSuccess('删除成功')
+  })
 }
 
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('/produce/other/fixHoof/export', {
-    ...queryParams.value
-  }, `fixHoof_${new Date().getTime()}.xlsx`)
+function handleExport () {
+  proxy.download('/produce/other/fixHoof/export', { ...queryParams.value }, `fixHoof_${new Date().getTime()}.xlsx`)
 }
 
-/**加载所有羊舍*/
-const sheepfoldOptions = ref([]);
-function getSheepfoldOptions() {
+/* 下拉数据 */
+const sheepfoldOptions = ref([])
+function getSheepfoldOptions () {
   listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
-    sheepfoldOptions.value = res.rows;
-  });
+    sheepfoldOptions.value = res.rows
+  })
 }
-onMounted(() => {
-  getList();
-  getSheepfoldOptions();
-});
 
-getList()
-</script>
+const varietyOptions = ref([])
+function getVarietyOptions () {
+  request({
+    url: '/base/variety/list',
+    method: 'get',
+    params: { pageNum: 1, pageSize: 9999 }
+  }).then(res => {
+    varietyOptions.value = res.rows || []
+  })
+}
+
+/* 只保留一个 onMounted */
+onMounted(() => {
+  getList()
+  getSheepfoldOptions()
+  getVarietyOptions()
+})
+</script>