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

package.json

@@ -22,7 +22,7 @@
     "axios": "0.28.1",
     "clipboard": "2.0.11",
     "echarts": "5.5.1",
-    "element-plus": "2.7.6",
+    "element-plus": "^2.7.6",
     "file-saver": "2.0.5",
     "fuse.js": "6.6.2",
     "js-beautify": "1.14.11",

src/api/produce/manage_sheep/add_sheep/add_sheep.js

@@ -0,0 +1,20 @@
+import request from '@/utils/request';
+
+// 新增羊只
+export function addSheep(data) {
+  return request({
+    url: '/produce/manage_sheep/add_sheep', 
+    method: 'post',
+    data: data
+  });
+}
+
+//导出模板
+export function exportSheepForm(data) {
+  return request({
+    url: '/produce/manage_sheep/add_sheep/exportForm',
+    method: 'post',
+    data,
+    responseType: 'blob'
+  });
+}

src/api/produce/manage_sheep/trans_group/trans_group.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询转群记录列表
+export function listTrans_group(query) {
+  return request({
+    url: '/produce/manage_sheep/trans_group/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询转群记录详细
+export function getTrans_group(id) {
+  return request({
+    url: '/produce/manage_sheep/trans_group/' + id,
+    method: 'get'
+  })
+}
+
+// 新增转群记录
+export function addTrans_group(data) {
+  return request({
+    url: '/produce/manage_sheep/trans_group',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改转群记录
+export function updateTrans_group(data) {
+  return request({
+    url: '/produce/manage_sheep/trans_group',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除转群记录
+export function delTrans_group(id) {
+  return request({
+    url: '/produce/manage_sheep/trans_group/' + id,
+    method: 'delete'
+  })
+}

src/api/produce/manage_sheep/transition_info/transition_info.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询转场列表
+export function listTransition_info(query) {
+  return request({
+    url: 'produce/manage_sheep/transition_info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询转场详细
+export function getTransition_info(id) {
+  return request({
+    url: 'produce/manage_sheep/transition_info/' + id,
+    method: 'get'
+  })
+}
+
+// 新增转场
+export function addTransition_info(data) {
+  return request({
+    url: 'produce/manage_sheep/transition_info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改转场
+export function updateTransition_info(data) {
+  return request({
+    url: 'produce/manage_sheep/transition_info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除转场
+export function delTransition_info(id) {
+  return request({
+    url: 'produce/manage_sheep/transition_info/' + id,
+    method: 'delete'
+  })
+}

src/api/produce/other/castrate/castrate.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询去势列表
 export function listCastrate(query) {
   return request({
-    url: '/produce/castrate/list',
+    url: '/produce/other/castrate/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listCastrate(query) {
 // 查询去势详细
 export function getCastrate(id) {
   return request({
-    url: '/produce/castrate/' + id,
+    url: '/produce/other/castrate/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getCastrate(id) {
 // 新增去势
 export function addCastrate(data) {
   return request({
-    url: '/produce/castrate',
+    url: '/produce/other/castrate',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addCastrate(data) {
 // 修改去势
 export function updateCastrate(data) {
   return request({
-    url: '/produce/castrate',
+    url: '/produce/other/castrate',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateCastrate(data) {
 // 删除去势
 export function delCastrate(id) {
   return request({
-    url: '/produce/castrate/' + id,
+    url: '/produce/other/castrate/' + id,
     method: 'delete'
   })
 }

src/api/produce/other/fixHoof/fixHoof.js

@@ -0,0 +1,93 @@
+// import request from '@/utils/request'
+
+// // 查询修蹄列表
+// export function listFixHoof(query) {
+//   return request({
+//     url: '/produce/other/fixHoof/list',
+//     method: 'get',
+//     params: query
+//   })
+// }
+
+// // 查询修蹄详细
+// export function getFixHoof(id) {
+//   return request({
+//     url: '/produce/other/fixHoof' + id,
+//     method: 'get'
+//   })
+// }
+
+// // 新增修蹄
+// export function addFixHoof(data) {
+//   return request({
+//     url: '/produce/other/fixHoof',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+// // 修改修蹄
+// export function updateFixHoof(data) {
+//   return request({
+//     url: '/produce/other/fixHoof/',
+//     method: 'put',
+//     data: data
+//   })
+// }
+
+// // 删除修蹄
+// export function delFixHoof(id) {
+//   return request({
+//     url: '/produce/other/fixHoof/' + id,
+//     method: 'delete'
+//   })
+// }
+// fixHoof.js
+import request from '@/utils/request'
+// 查询修蹄列表
+export function listFixHoof(query) {
+  return request({
+    url: '/produce/other/fixHoof/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询修蹄详细
+export function getFixHoof(id) {
+  return request({
+    url: '/produce/other/fixHoof/${id}',
+    method: 'get'
+  })
+}
+// 新增修蹄
+export function addFixHoof(data) {
+  return request({
+    url: '/produce/other/fixHoof',
+    method: 'post',
+    data: data
+  })
+}
+// 修改修蹄
+export function updateFixHoof(data) {
+  return request({
+    url: '/produce/other/fixHoof',
+    method: 'put',
+    data: data
+  })
+}
+// 删除修蹄
+export function delFixHoof(ids) {
+  return request({
+    url: `/produce/other/fixHoof/${ids.join(',')}`,
+    method: 'delete'
+  })
+}
+//导出
+export function exportFixHoof(query) {
+  return request({
+    url: '/produce/other/fixHoof/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob' // 导出功能需要设置响应类型为blob
+  })
+}

src/settings.js

@@ -45,5 +45,5 @@ export default {
    * The default is only used in the production env
    * If you want to also use it in dev, you can pass ['production', 'development']
    */
-  errorLog: 'production'
+  errorLog: 'production',
 }

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

@@ -0,0 +1,223 @@
+<template>
+  <div class="app-container">
+    <el-button type="warning" @click="handleExportForm">导出当前表单</el-button>
+    <el-button type="info" plain icon="Upload" @click="handleImport"
+      v-hasPermi="['produce:add_sheep:import']">导入</el-button>
+    <el-form :model="form" ref="formRef" label-position="left" label-width="100px">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="羊只id" prop="sheepId">
+            <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="羊舍" prop="sheepfold">
+            <el-input v-model="form.sheepfold" placeholder="请输入羊舍" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="父号" prop="father">
+            <el-input v-model="form.father" placeholder="请输入父号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="母号" prop="mother">
+            <el-input v-model="form.mother" placeholder="请输入母号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="出生体重" prop="bornWeight">
+            <el-input v-model="form.bornWeight" placeholder="请输入出生体重" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="出生日期" prop="birthday">
+            <el-date-picker v-model="form.birthday" type="date" placeholder="选择出生日期" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="性别" prop="gender">
+            <el-select v-model="form.gender" placeholder="请选择性别">
+              <el-option label="公" value="1" />
+              <el-option label="母" value="0" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="胎次" prop="parity">
+            <el-input v-model="form.parity" placeholder="请输入胎次" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="品种" prop="varietyId">
+            <el-input v-model="form.varietyId" placeholder="请输入品种" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="入群日期" prop="joinDate">
+            <el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form-item label="技术员" prop="technician">
+            <el-input v-model="form.technician" placeholder="请输入技术员" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="16">
+          <el-form-item label="备注" prop="comment">
+            <el-input v-model="form.comment" type="textarea" rows="3" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">提交</el-button>
+        <el-button @click="resetForm">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+
+  <el-dialog title="导入羊只信息" v-model="importOpen" width="400px" append-to-body>
+    <el-upload ref="uploadRef" :limit="1" accept=".xlsx,.xls" :action="importUrl" :headers="headers"
+      :auto-upload="false" :on-success="handleImportSuccess" :on-error="handleImportError" drag>
+      <i class="el-icon-upload"></i>
+      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+    </el-upload>
+    <template #footer>
+      <el-button type="info" @click="downloadTemplate">下载模板</el-button>
+      <el-button type="primary" @click="submitUpload">确 定</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import { addSheep } from '@/api/produce/manage_sheep/add_sheep/add_sheep';
+
+const form = ref({
+  sheepId: '',
+  sheepfold: '',
+  father: '',
+  mother: '',
+  bornWeight: '',
+  birthday: '',
+  gender: '',
+  parity: '',
+  varietyId: '',
+  joinDate: '',
+  comment: '',
+  technician: '',
+});
+
+const formRef = ref(null);
+
+const rules = {
+  sheepId: [{ required: true, message: '请输入羊只id', trigger: 'blur' }],
+  sheepfold: [{ required: true, message: '请输入羊舍', trigger: 'blur' }],
+  father: [{ message: '请输入父号', trigger: 'blur' }],
+  mother: [{ message: '请输入母号', trigger: 'blur' }],
+  bornWeight: [{ required: true, message: '请输入出生体重', trigger: 'blur' }],
+  birthday: [{ required: true, message: '请选择出生日期', trigger: 'change' }],
+  gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
+  parity: [{ message: '请输入胎次', trigger: 'blur' }],
+  varietyId: [{ required: true, message: '请输入品种', trigger: 'blur' }],
+  joinDate: [{ message: '请选择入群日期', trigger: 'change' }],
+  technician: [{ message: '请输入技术员', trigger: 'blur' }],
+};
+
+
+//表单验证
+const submitForm = () => {
+  formRef.value.validate((valid) => {
+    console.log('表单验证结果:', valid);
+    if (valid) {
+      addSheep(form.value)
+        .then(response => {
+          console.log('后端响应:', response);
+          if (response.code === 200) {
+            alert('新增成功');
+            resetForm();
+          } else {
+            alert(response.msg || '新增失败');
+          }
+        })
+    } else {
+      alert('请填写所有必填字段');
+    }
+  });
+};
+const resetForm = () => {
+  form.value = {
+    sheepId: '',
+    sheepfold: '',
+    father: '',
+    mother: '',
+    bornWeight: '',
+    birthday: '',
+    gender: '',
+    parity: '',
+    varietyId: '',
+    joinDate: '',
+    comment: '',
+    technician: '',
+  };
+};
+
+
+//导出
+import { exportSheepForm } from '@/api/produce/manage_sheep/add_sheep/add_sheep';
+
+function handleExportForm() {
+  // 把当前表单数据直接传后端
+  exportSheepForm(form.value).then(res => {
+    // 使用 Ruoyi 自带的下载方法
+    const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+    const fileName = `羊只信息_${new Date().getTime()}.xlsx`;
+    const link = document.createElement('a');
+    link.href = URL.createObjectURL(blob);
+    link.download = fileName;
+    link.click();
+  });
+}
+
+
+//导入
+import { getToken } from '@/utils/auth';
+
+const uploadRef = ref();
+const importOpen = ref(false);
+const importUrl = ref(import.meta.env.VITE_APP_BASE_API + '/produce/manage_sheep/add_sheep/importData');
+const headers = ref({ Authorization: 'Bearer ' + getToken() });
+
+function handleImport() { importOpen.value = true; }
+function downloadTemplate() {
+  proxy.download('/produce/manage_sheep/add_sheep/importTemplate', {}, `羊只模板_${Date.now()}.xlsx`);
+}
+function submitUpload() { uploadRef.value?.submit(); }
+function handleImportSuccess(res) {
+  proxy.$modal.msgSuccess(res.msg || '导入成功');
+  importOpen.value = false;
+  uploadRef.value?.clearFiles();
+}
+function handleImportError(err) {
+  proxy.$modal.msgError(JSON.parse(err.message)?.msg || '导入失败');
+}
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+</style>

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

@@ -0,0 +1,359 @@
+<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="foldTo">
+        <el-input v-model="queryParams.foldTo" placeholder="请输入转入羊舍" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="转出羊舍" prop="foldFrom">
+        <el-input v-model="queryParams.foldFrom" placeholder="请输入转出羊舍" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" style="width: 150px;" placeholder="请选择状态" clearable>
+          <el-option v-for="dict in status" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+          v-hasPermi="['trans_group:trans_group:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['trans_group:trans_group:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['trans_group:trans_group:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['trans_group:trans_group:export']">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="trans_groupList" @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="foldTo" />
+      <el-table-column label="转出羊舍" align="center" prop="foldFrom" />
+      <el-table-column label="转群原因" align="center" prop="reason"  min-width="160">
+        <template #default="scope">
+          <dict-tag :options="trans_group_reason" :value="scope.row.reason" />
+        </template>
+      </el-table-column>
+      <el-table-column label="技术员" align="center" prop="technician" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="status" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime">
+        <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="160">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
+            v-hasPermi="['trans_group:trans_group:approve']">
+            审批
+          </el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['trans_group:trans_group:remove']">
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改转群记录对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="trans_groupRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="羊只id" prop="sheepId">
+          <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+        </el-form-item>
+        <el-form-item label="转入羊舍" prop="foldTo">
+          <el-input v-model="form.foldTo" placeholder="请输入转入羊舍" />
+        </el-form-item>
+        <el-form-item label="转出羊舍" prop="foldFrom">
+          <el-input v-model="form.foldFrom" placeholder="请输入转出羊舍" />
+        </el-form-item>
+        <el-form-item label="转群原因" prop="reason">
+          <el-select v-model="form.reason" placeholder="请选择转群原因">
+            <el-option v-for="dict in trans_group_reason" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="技术员" prop="technician">
+          <el-input v-model="form.technician" placeholder="请输入技术员" />
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+
+  <!-- 审批对话框 -->
+  <el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
+    <el-form ref="approveFormRef" :model="approveForm" label-width="120px">
+      <el-form-item label="羊只id">
+        <el-input v-model="approveForm.sheepId" disabled />
+      </el-form-item>
+      <el-form-item label="转入羊舍">
+        <el-input v-model="approveForm.foldTo" disabled />
+      </el-form-item>
+      <el-form-item label="转出羊舍">
+        <el-input v-model="approveForm.foldFrom" disabled />
+      </el-form-item>
+      <el-form-item label="转群原因">
+        <el-select v-model="approveForm.reason" disabled>
+          <el-option v-for="dict in trans_group_reason" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="技术员">
+        <el-input v-model="approveForm.technician" disabled />
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input v-model="approveForm.comment" disabled />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleApproveAgree">同意</el-button>
+        <el-button type="danger" @click="handleApproveReject">驳回</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup name="Trans_group">
+import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group } from "@/api/produce/manage_sheep/trans_group/trans_group"
+
+const { proxy } = getCurrentInstance()
+const { trans_group_reason, status } = proxy.useDict('trans_group_reason', 'status')
+
+const trans_groupList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref("")
+const daterangeCreateTime = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    sheepId: null,
+    foldTo: null,
+    foldFrom: null,
+    status: null,
+    createTime: null
+  },
+  rules: {
+    id: [
+      { required: true, message: "$comment不能为空", trigger: "blur" }
+    ],
+    sheepId: [
+      { required: true, message: "羊只id不能为空", trigger: "blur" }
+    ],
+    foldTo: [
+      { required: true, message: "转入羊舍不能为空", trigger: "blur" }
+    ],
+    foldFrom: [
+      { required: true, message: "转出羊舍不能为空", trigger: "blur" }
+    ],
+    reason: [
+      { required: true, message: "转群原因不能为空", trigger: "change" }
+    ],
+    technician: [
+      { required: true, message: "技术员不能为空", trigger: "blur" }
+    ],
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询转群记录列表 */
+function getList() {
+  loading.value = true
+  queryParams.value.params = {}
+  if (null != daterangeCreateTime && '' != daterangeCreateTime) {
+    queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
+    queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
+  }
+  listTrans_group(queryParams.value).then(response => {
+    trans_groupList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    foldTo: null,
+    foldFrom: null,
+    reason: null,
+    technician: null,
+    status: null,
+    comment: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("trans_groupRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  daterangeCreateTime.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加转群记录"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getTrans_group(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改转群记录"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["trans_groupRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateTrans_group(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addTrans_group(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除转群记录编号为"' + _ids + '"的数据项？').then(function () {
+    return delTrans_group(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => { })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('/produce/manage_sheep/trans_group/export', {
+    ...queryParams.value
+  }, `trans_group_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+
+// 审批记录的对话框
+const approveDialog = ref(false);
+const approveForm = ref({});
+
+// 审批按钮操作
+function handleApprove(row) {
+  // 打开审批对话框
+  approveForm.value = { ...row };
+  approveDialog.value = true;
+}
+
+// 同意审批
+function handleApproveAgree() {
+  approveForm.value.status = 1; // 状态设置为同意
+  updateTrans_group(approveForm.value).then(() => {
+    approveDialog.value = false;
+    proxy.$modal.msgSuccess("审批成功，状态已更新为同意");
+    getList();
+  }).catch((error) => {
+    proxy.$modal.msgError(`审批失败：${error}`);
+  });
+}
+
+// 驳回审批
+function handleApproveReject() {
+  approveForm.value.status = 2; // 状态设置为驳回
+  updateTrans_group(approveForm.value).then(() => {
+    approveDialog.value = false;
+    proxy.$modal.msgSuccess("审批成功，状态已更新为驳回");
+    getList();
+  }).catch((error) => {
+    proxy.$modal.msgError(`审批失败：${error}`);
+  });
+}
+</script>

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

@@ -0,0 +1,413 @@
+<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="transTo">
+        <el-input
+          v-model="queryParams.transTo"
+          placeholder="请输入转入牧场"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="当前牧场" prop="transFrom">
+        <el-input
+          v-model="queryParams.transFrom"
+          placeholder="请输入当前牧场"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" style="width: 150px;" placeholder="请选择状态" clearable>
+          <el-option
+            v-for="dict in status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['transition_info:transition_info:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['transition_info:transition_info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['transition_info:transition_info:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['transition_info:transition_info:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="transition_infoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="" align="center" prop="id" /> -->
+      <el-table-column label="羊只id" align="center" prop="sheepId" />
+      <el-table-column label="转入牧场" align="center" prop="transTo" />
+      <el-table-column label="当前牧场" align="center" prop="transFrom" />
+      <el-table-column label="转场类型" align="center" prop="transType">
+        <template #default="scope">
+          <dict-tag :options="trans_type" :value="scope.row.transType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="技术员" align="center" prop="technician" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="180">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)" v-hasPermi="['transition_info:transition_info:approve']">审批</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['transition_info:transition_info:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改转场对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="transition_infoRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="羊只id" prop="sheepId">
+          <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+        </el-form-item>
+        <el-form-item label="转入牧场" prop="transTo">
+          <el-input v-model="form.transTo" placeholder="请输入转入牧场" />
+        </el-form-item>
+        <el-form-item label="当前牧场" prop="transFrom">
+          <el-input v-model="form.transFrom" placeholder="请输入当前牧场" />
+        </el-form-item>
+        <el-form-item label="转场类型" prop="transType">
+          <el-select v-model="form.transType" placeholder="请选择转场类型">
+            <el-option
+              v-for="dict in trans_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="技术员" prop="technician">
+          <el-input v-model="form.technician" placeholder="请输入技术员" />
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+
+  <!-- 审批对话框 -->
+<el-dialog :title="'审批转场记录'" v-model="approveDialog" width="500px" append-to-body>
+  <el-form ref="approveFormRef" :model="approveForm" label-width="120px">
+    <el-form-item label="羊只id">
+      <el-input v-model="approveForm.sheepId" disabled />
+    </el-form-item>
+    <el-form-item label="转入牧场">
+      <el-input v-model="approveForm.transTo" disabled />
+    </el-form-item>
+    <el-form-item label="当前牧场">
+      <el-input v-model="approveForm.transFrom" disabled />
+    </el-form-item>
+    <el-form-item label="转场类型">
+      <el-select v-model="approveForm.transType" disabled>
+        <el-option
+          v-for="dict in trans_type"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="技术员">
+      <el-input v-model="approveForm.technician" disabled />
+    </el-form-item>
+    <el-form-item label="备注">
+      <el-input v-model="approveForm.comment" disabled />
+    </el-form-item>
+  </el-form>
+  <template #footer>
+    <div class="dialog-footer">
+      <el-button type="primary" @click="handleApproveAgree">同意</el-button>
+      <el-button type="danger" @click="handleApproveReject">驳回</el-button>
+    </div>
+  </template>
+</el-dialog>
+</template>
+
+<script setup name="Transition_info">
+import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, updateTransition_info } from "@/api/produce/manage_sheep/transition_info/transition_info"
+
+const { proxy } = getCurrentInstance()
+const { status, trans_type } = proxy.useDict('status', 'trans_type')
+
+const transition_infoList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref("")
+const daterangeCreateTime = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    sheepId: null,
+    transTo: null,
+    transFrom: null,
+    status: null,
+    createTime: null
+  },
+  rules: {
+    id: [
+      { required: true, message: "不能为空", trigger: "blur" }
+    ],
+    sheepId: [
+      { required: true, message: "羊只id不能为空", trigger: "blur" }
+    ],
+    transTo: [
+      { required: true, message: "转入牧场不能为空", trigger: "blur" }
+    ],
+    transFrom: [
+      { required: true, message: "当前牧场不能为空", trigger: "blur" }
+    ],
+    transType: [
+      { required: true, message: "转场类型不能为空", trigger: "change" }
+    ],
+    technician: [
+      { required: true, message: "技术员不能为空", trigger: "blur" }
+    ],
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询转场列表 */
+function getList() {
+  loading.value = true
+  queryParams.value.params = {}
+  if (null != daterangeCreateTime && '' != daterangeCreateTime) {
+    queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
+    queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
+  }
+  listTransition_info(queryParams.value).then(response => {
+    transition_infoList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    transTo: null,
+    transFrom: null,
+    transType: null,
+    technician: null,
+    status: null,
+    comment: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("transition_infoRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  daterangeCreateTime.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加转场"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getTransition_info(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改转场"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["transition_infoRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateTransition_info(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addTransition_info(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除转场编号为"' + _ids + '"的数据项？').then(function() {
+    return delTransition_info(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('/produce/manage_sheep/transition_info/export', {
+    ...queryParams.value
+  }, `transition_info_${new Date().getTime()}.xlsx`)
+}
+// 审批记录的对话框
+const approveDialog = ref(false);
+const approveForm = ref({});
+
+// 审批按钮操作
+function handleApprove(row) {
+  // 打开审批对话框
+  approveForm.value = { ...row };
+  approveDialog.value = true;
+}
+
+// 同意审批
+function handleApproveAgree() {
+  approveForm.value.status = 1; // 状态设置为同意
+  updateTransition_info(approveForm.value).then(() => {
+    approveDialog.value = false;
+    proxy.$modal.msgSuccess("审批成功，状态已更新为同意");
+    getList();
+  }).catch((error) => {
+    proxy.$modal.msgError(`审批失败：${error}`);
+  });
+}
+
+// 驳回审批
+function handleApproveReject() {
+  approveForm.value.status = 2; // 状态设置为驳回
+  updateTransition_info(approveForm.value).then(() => {
+    approveDialog.value = false;
+    proxy.$modal.msgSuccess("审批成功，状态已更新为驳回");
+    getList();
+  }).catch((error) => {
+    proxy.$modal.msgError(`审批失败：${error}`);
+  });
+}
+getList()
+</script>

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

@@ -2,30 +2,16 @@
   <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
+        <el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
-          v-model="queryParams.sheepId"
-          placeholder="请输入羊只id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
       </el-form-item>
-      <el-form-item label="羊舍id" prop="sheepfold">
+      <el-form-item label="羊舍" prop="sheepfold">
-        <el-input
+        <el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
-          v-model="queryParams.sheepfold"
+          <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
-          placeholder="请输入羊舍id"
+        </el-select>
-          clearable
-          @keyup.enter="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker
+        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          v-model="daterangeCreateTime"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-          value-format="YYYY-MM-DD"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -35,51 +21,29 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
-          type="primary"
+          v-hasPermi="['produce:castrate:add']">新增</el-button>
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['produce:castrate:add']"
-        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-          type="success"
+          v-hasPermi="['produce:castrate:edit']">修改</el-button>
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['produce:castrate:edit']"
-        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-          type="danger"
+          v-hasPermi="['produce:castrate:remove']">删除</el-button>
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['produce:castrate:remove']"
-        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="warning" plain icon="Download" @click="handleExport"
-          type="warning"
+          v-hasPermi="['produce:castrate:export']">导出</el-button>
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['produce:castrate:export']"
-        >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="castrateList" @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="${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">
@@ -89,19 +53,16 @@
       </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)" v-hasPermi="['produce:castrate:edit']">修改</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['produce:castrate:remove']">删除</el-button>
+            v-hasPermi="['produce:castrate:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['produce:castrate:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-show="total>0"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
-      :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>
@@ -109,8 +70,13 @@
         <el-form-item label="羊只id" prop="sheepId">
           <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
         </el-form-item>
-        <el-form-item label="羊舍id" prop="sheepfold">
+        <el-form-item label="羊舍" prop="sheepfold">
-          <el-input v-model="form.sheepfold" placeholder="请输入羊舍id" />
+          <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
+            <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="technician">
+          <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
         <el-form-item label="备注" prop="comment">
           <el-input v-model="form.comment" placeholder="请输入备注" />
@@ -126,8 +92,9 @@
   </div>
 </template>
 
-<script setup name="Castrate">
+<script setup name="castrate">
-import { listCastrate, getCastrate, delCastrate, addCastrate, updateCastrate } from "@/api/produce/castrate"
+import { listCastrate, getCastrate, delCastrate, addCastrate, updateCastrate } from "@/api/produce/other/castrate/castrate"
+import { listSheepfold_management as listSheepfold } from '@/api/sheepfold_management/sheepfold_management';
 
 const { proxy } = getCurrentInstance()
 
@@ -153,6 +120,18 @@ const data = reactive({
     createTime: null
   },
   rules: {
+    id: [
+      { required: true, message: "$comment不能为空", trigger: "blur" }
+    ],
+    sheepId: [
+      { required: true, message: "羊只id不能为空", trigger: "blur" }
+    ],
+    sheepfold: [
+      { required: true, message: "羊舍不能为空", trigger: "change" }
+    ],
+    technician: [
+      { required: true, message: "技术员不能为空", trigger: "blur" }
+    ],
   }
 })
 
@@ -255,20 +234,31 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除去势编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除去势编号为"' + _ids + '"的数据项？').then(function () {
     return delCastrate(_ids)
   }).then(() => {
     getList()
     proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+  }).catch(() => { })
 }
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download('produce/castrate/export', {
+  proxy.download('/produce/other/castrate/export', {
     ...queryParams.value
   }, `castrate_${new Date().getTime()}.xlsx`)
 }
 
+/** 加载所有羊舍 */
+const sheepfoldOptions = ref([]);
+function getSheepfoldOptions() {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+    sheepfoldOptions.value = res.rows;   // [{id, sheepfoldName}, ...]
+  });
+}
+onMounted(() => {
+  getList();
+  getSheepfoldOptions();  
+});
 getList()
 </script>

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

@@ -0,0 +1,291 @@
+<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="羊舍id" prop="sheepfold">
+        <el-input
+          v-model="queryParams.sheepfold"
+          placeholder="请输入羊舍id"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </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>
+      </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>
+      </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>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['fixHoof:fixHoof:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </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="羊舍id" align="center" prop="sheepfold" />
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="技术员" align="center" prop="technician" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" 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>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改修蹄对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="fixHoofRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="羊只id" prop="sheepId">
+          <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+        </el-form-item>
+        <el-form-item label="羊舍id" prop="sheepfold">
+          <el-input v-model="form.sheepfold" placeholder="请输入羊舍id" />
+        </el-form-item>
+        <el-form-item label="备注" prop="comment">
+          <el-input v-model="form.comment" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="技术员" prop="technician">
+          <el-input v-model="form.technician" placeholder="请输入技术员" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="FixHoof">
+import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof } from "@/api/produce/other/fixHoof/fixHoof"
+
+const { proxy } = getCurrentInstance()
+
+const fixHoofList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref("")
+const daterangeCreateTime = ref([])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    sheepId: null,
+    sheepfold: null,
+    technician: null,
+    createTime: null
+  },
+  rules: {
+    id: [
+      { required: true, message: "$comment不能为空", trigger: "blur" }
+    ],
+    sheepId: [
+      { required: true, message: "羊只id不能为空", trigger: "blur" }
+    ],
+    sheepfold: [
+      { required: true, message: "羊舍id不能为空", trigger: "change" }
+    ],
+    technician: [
+      { required: true, message: "技术员不能为空", trigger: "blur" }
+    ],
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询修蹄列表 */
+function getList() {
+  loading.value = true
+  queryParams.value.params = {}
+  if (null != daterangeCreateTime && '' != daterangeCreateTime) {
+    queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
+    queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
+  }
+  listFixHoof(queryParams.value).then(response => {
+    fixHoofList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    sheepId: null,
+    sheepfold: null,
+    comment: null,
+    technician: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("fixHoofRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  daterangeCreateTime.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加修蹄"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getFixHoof(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    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 handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除修蹄编号为"' + _ids + '"的数据项？').then(function() {
+    return delFixHoof(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('/produce/other/fixHoof/export', {
+    ...queryParams.value
+  }, `fixHoof_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>