admin/zhyc-sheep-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

干奶录入问题，干奶查询问题，断奶录入问题，断奶查询问题，死亡录入问题，死亡查询问题

Browse Source
This commit is contained in:
ll
2026-02-01 21:51:52 +08:00
parent df88846432
commit a2bf9b9cf9
6 changed files with 551 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/Weaning/weaning_record.js
View File

@@ -49,4 +49,13 @@ export function getSheepIdByEarNumber(earNumber) {
url: '/Weaning/weaning_record/sheepId/' + earNumber,
method: 'get'
})
}
// 新增：模糊查询耳号列表 (用于远程搜索)
export function searchEarNumbers(query) {
return request({
url: '/Weaning/weaning_record/search_ear_numbers',
method: 'get',
params: { query }
})
}

16
src/api/drymilk/drymilk.js
View File

@@ -49,4 +49,20 @@ export function delDrymilk(id) {
url: '/drymilk/drymilk/' + id,
method: 'delete'
})
}
// 查询羊舍列表下拉框
export function listSheepfoldOptions() {
return request({
url: '/drymilk/drymilk/sheepfoldList',
method: 'get'
})
}
// 查询技术员列表下拉框
export function listTechnicianOptions() {
return request({
url: '/drymilk/drymilk/technicianList',
method: 'get'
})
}

31
src/api/sheep_death/death.js
View File

@@ -43,7 +43,7 @@ export function delDeath(id) {
})
}
// 根据管理耳号查询羊只信息
// 根据耳号查询羊只信息
export function getSheepInfo(manageTags) {
return request({
url: '/sheep_death/death/sheepInfo/' + manageTags,
@@ -57,4 +57,33 @@ export function getDiseaseTree() {
url: '/sheep_death/death/disease/tree',
method: 'get'
})
}
// --- 远程搜索 API ---
// 搜索耳号
export function searchEarNo(query) {
return request({
url: '/sheep_death/death/search/earNo',
method: 'get',
params: { query }
})
}
// 搜索技术员
export function searchTechnician(query) {
return request({
url: '/sheep_death/death/search/technician',
method: 'get',
params: { query }
})
}
// 搜索处理人
export function searchHandler(query) {
return request({
url: '/sheep_death/death/search/handler',
method: 'get',
params: { query }
})
}

195
src/views/Weaning/weaning_record/index.vue
View File

@@ -1,92 +1,77 @@
<template>
<div class="app-container">
<!-- 查询表单 -->
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="耳号" prop="earNumber">
<el-input
v-model="queryParams.earNumber"
placeholder="请输入耳号"
clearable
@keyup.enter="handleQuery"
/>
<el-form-item label="耳号" prop="allEarNumbers">
<el-select
v-model="queryParams.allEarNumbers"
multiple
filterable
remote
reserve-keyword
placeholder="请输入耳号搜索"
:remote-method="searchEarNumber"
:loading="earNumberLoading"
style="width: 240px"
clearable
>
<el-option
v-for="item in earNumberOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="品种" prop="breed">
<el-input
v-model="queryParams.breed"
placeholder="请输入品种"
clearable
@keyup.enter="handleQuery"
/>
<el-form-item label="是否在群" prop="isInHerd">
<el-select v-model="queryParams.isInHerd" placeholder="请选择" clearable style="width: 240px">
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item label="断奶日期" prop="datetime">
<el-date-picker clearable
v-model="queryParams.datetime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择断奶日期">
</el-date-picker>
<el-form-item label="断奶日期" style="width: 340px">
<el-date-picker
v-model="daterangeTime"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 240px"
></el-date-picker>
</el-form-item>
<el-form-item label="羊只类别" prop="sheepCategory">
<el-select v-model="queryParams.sheepCategory" placeholder="请选择羊只类别" clearable style="width: 240px">
<el-option label="种公羊" value="种公羊"></el-option>
<el-option label="基础母羊" value="基础母羊"></el-option>
<el-option label="后备羊" value="后备羊"></el-option>
<el-option label="羔羊" value="羔羊"></el-option>
</el-select>
</el-form-item>
<el-form-item label="性别" prop="gender">
<el-select v-model="queryParams.gender" placeholder="请选择性别" clearable>
<el-select v-model="queryParams.gender" placeholder="请选择性别" clearable style="width: 240px">
<el-option label="公" value="公"></el-option>
<el-option label="母" value="母"></el-option>
</el-select>
</el-form-item>
<el-form-item label="父号" prop="fatherNumber">
<el-input
v-model="queryParams.fatherNumber"
placeholder="请输入父号"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="母号" prop="motherNumber">
<el-input
v-model="queryParams.motherNumber"
placeholder="请输入母号"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="是否留养" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择是否留养" clearable>
<el-select v-model="queryParams.status" placeholder="请选择是否留养" clearable style="width: 240px">
<el-option label="留养" value="1"></el-option>
<el-option label="不留养" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="羊舍" prop="sheepPen">
<el-input
v-model="queryParams.sheepPen"
placeholder="请输入羊舍"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input
v-model="queryParams.technician"
placeholder="请输入技术员"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<!-- 修改后的选项，与数据库实际值保持一致 -->
<el-form-item label="繁殖状态" prop="breedingStatus">
<el-select v-model="queryParams.breedingStatus" placeholder="请选择繁殖状态" clearable>
<el-option label="后备" value="后备"></el-option>
<el-option label="已配" value="已配"></el-option>
<el-option label="可配" value="可配"></el-option>
<el-option label="妊娠" value="妊娠"></el-option>
<el-option label="公羊" value="公羊"></el-option>
</el-select>
</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
@@ -129,10 +114,8 @@
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 数据表格 -->
<el-table v-loading="loading" :data="weaning_recordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 日期作为第一列 -->
<el-table-column label="断奶日期" align="center" prop="datetime" width="120" fixed="left">
<template #default="scope">
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
@@ -157,7 +140,7 @@
<el-table-column label="电子耳号" align="center" prop="electronicTags" width="120" />
<el-table-column label="羊舍" align="center" prop="sheepPen" width="100" />
<el-table-column label="技术员" align="center" prop="technician" width="100" />
<el-table-column label="繁育状态" align="center" prop="breedingStatus" width="100" />
<el-table-column label="羊只类别" align="center" prop="breedingStatus" width="100" />
<el-table-column label="创建人" align="center" prop="createBy" width="100" />
<el-table-column label="创建日期" align="center" prop="createTime" width="120">
<template #default="scope">
@@ -173,7 +156,6 @@
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination
v-show="total>0"
:total="total"
@@ -182,7 +164,6 @@
@pagination="getList"
/>
<!-- 添加或修改断奶记录对话框 -->
<el-dialog :title="title" v-model="open" width="600px" append-to-body>
<el-form ref="weaning_recordRef" :model="form" :rules="rules" label-width="100px">
<el-row>
@@ -197,7 +178,8 @@
v-model="form.datetime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择断奶日期">
placeholder="请选择断奶日期"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
@@ -205,15 +187,15 @@
<el-row>
<el-col :span="12">
<el-form-item label="断奶重量(kg)" prop="weight">
<el-input-number v-model="form.weight" :precision="2" :step="0.1" placeholder="请输入断奶重量" />
<el-input-number v-model="form.weight" :precision="2" :step="0.1" placeholder="请输入" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否留养" prop="status">
<el-select v-model="form.status" placeholder="请选择是否留养">
<el-option label="留养" value="1"></el-option>
<el-option label="不留养" value="0"></el-option>
</el-select>
<el-radio-group v-model="form.status">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
@@ -248,7 +230,7 @@
</template>
<script setup name="Weaning_record">
import { listWeaning_record, getWeaning_record, delWeaning_record, addWeaning_record, updateWeaning_record, getSheepIdByEarNumber } from "@/api/Weaning/weaning_record"
import { listWeaning_record, getWeaning_record, delWeaning_record, addWeaning_record, updateWeaning_record, getSheepIdByEarNumber, searchEarNumbers } from "@/api/Weaning/weaning_record"
const { proxy } = getCurrentInstance()
@@ -261,27 +243,27 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const daterangeTime = ref([]) // 时间范围数组
// 远程搜索相关
const earNumberOptions = ref([])
const earNumberLoading = ref(false)
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
earNumber: null,
breed: null,
datetime: null,
weight: null,
allEarNumbers: [], // 核心：多选数组
isInHerd: null, // 新增：是否在群
sheepCategory: null, // 新增：羊只类别
status: null,
technician: null,
comment: null,
createBy: null,
createTime: null,
electronicTags: null,
gender: null,
fatherNumber: null,
motherNumber: null,
breed: null,
technician: null,
sheepPen: null,
breedingStatus: null
fatherNumber: null,
motherNumber: null
},
rules: {
earNumber: [
@@ -304,6 +286,12 @@ const { queryParams, form, rules } = toRefs(data)
/** 查询断奶记录列表 */
function getList() {
loading.value = true
// 处理时间范围
queryParams.value.params = {};
if (null != daterangeTime.value && '' != daterangeTime.value) {
queryParams.value.params["beginTime"] = daterangeTime.value[0];
queryParams.value.params["endTime"] = daterangeTime.value[1];
}
listWeaning_record(queryParams.value).then(response => {
weaning_recordList.value = response.rows
total.value = response.total
@@ -311,6 +299,22 @@ function getList() {
})
}
/** 远程搜索耳号 */
function searchEarNumber(query) {
if (query !== '') {
earNumberLoading.value = true
searchEarNumbers(query).then(response => {
earNumberOptions.value = response.data || []
earNumberLoading.value = false
}).catch(() => {
earNumberOptions.value = []
earNumberLoading.value = false
})
} else {
earNumberOptions.value = []
}
}
// 取消按钮
function cancel() {
open.value = false
@@ -325,7 +329,7 @@ function reset() {
earNumber: null,
datetime: null,
weight: null,
status: null,
status: "1", // 修改：默认设为 '1' (是)
technician: null,
comment: null,
createBy: null,
@@ -343,7 +347,11 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
daterangeTime.value = []
earNumberOptions.value = []
proxy.resetForm("queryRef")
// 必须手动清空多选数组
queryParams.value.allEarNumbers = []
handleQuery()
}
@@ -433,4 +441,7 @@ getList()
.app-container {
padding: 20px;
}
.mb8 {
margin-bottom: 8px;
}
</style>

301
src/views/drymilk/drymilk/index.vue
View File

@@ -1,30 +1,41 @@
<template>
<div class="app-container">
<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="请输入耳号"
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="耳号" prop="manageTagsList">
<el-select
v-model="queryParams.manageTagsList"
multiple
filterable
remote
reserve-keyword
placeholder="请输入耳号关键字搜索"
:remote-method="searchEarNumber"
:loading="earNumberLoading"
style="width: 240px"
clearable
@keyup.enter="handleQuery"
/>
@change="handleQuery"
>
<el-option
v-for="item in earNumberOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="品种" prop="variety">
<el-input
v-model="queryParams.variety"
placeholder="请输入品种"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="干奶日期" prop="datetime">
<el-date-picker clearable
v-model="queryParams.datetime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择干奶日期">
</el-date-picker>
<el-form-item label="干奶日期" style="width: 308px">
<el-date-picker
v-model="dateRange"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="技术员" prop="tecahnician">
<el-input
v-model="queryParams.tecahnician"
@@ -33,22 +44,14 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="创建人" prop="createBy">
<el-input
v-model="queryParams.createBy"
placeholder="请输入创建人"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker clearable
v-model="queryParams.createTime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择创建时间">
</el-date-picker>
<el-form-item label="封闭剂" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" clearable style="width: 120px">
<el-option label="是" :value="1" />
<el-option label="否" :value="0" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -57,70 +60,39 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['drymilk:drymilk:add']"
>新增</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['drymilk:drymilk:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['drymilk:drymilk:edit']"
>修改</el-button>
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['drymilk:drymilk:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['drymilk:drymilk:remove']"
>删除</el-button>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['drymilk:drymilk:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['drymilk:drymilk:export']"
>导出</el-button>
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['drymilk:drymilk:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="drymilkList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 日期作为第一列 -->
<el-table-column label="干奶日期" align="center" prop="datetime" width="180" fixed="left">
<el-table-column label="干奶日期" align="center" prop="datetime" width="120">
<template #default="scope">
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="耳号" align="center" prop="manageTags" />
<el-table-column label="耳号" align="center" prop="manageTags" min-width="120" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="事件类型" align="center" prop="eventType" />
<el-table-column label="是否使用乳头封闭剂" align="center" prop="status">
<el-table-column label="乳头封闭剂" align="center" prop="status">
<template #default="scope">
<span>{{ scope.row.status === 1 ? '是' : '否' }}</span>
<el-tag v-if="scope.row.status === 1" type="success">是</el-tag>
<el-tag v-else type="info">否</el-tag>
</template>
</el-table-column>
<el-table-column label="转入羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="技术员" align="center" prop="tecahnician" />
<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" prop="comment" />
<el-table-column label="备注" align="center" prop="comment" show-overflow-tooltip />
<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="['drymilk:drymilk:edit']">修改</el-button>
@@ -137,32 +109,42 @@
@pagination="getList"
/>
<!-- 添加或修改干奶记录对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-dialog :title="title" v-model="open" width="600px" append-to-body>
<el-form ref="drymilkRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="耳号" prop="manageTags">
<el-input v-model="form.manageTags" placeholder="请输入耳号" />
<el-input
v-if="!form.id"
v-model="form.manageTags"
type="textarea"
:rows="4"
placeholder="请输入耳号"
/>
<el-input v-else v-model="form.manageTags" placeholder="请输入耳号" disabled />
</el-form-item>
<el-form-item label="干奶日期" prop="datetime">
<el-date-picker clearable
v-model="form.datetime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择干奶日期">
</el-date-picker>
<el-date-picker clearable v-model="form.datetime" type="date" value-format="YYYY-MM-DD" placeholder="请选择干奶日期"></el-date-picker>
</el-form-item>
<el-form-item label="乳头封闭剂" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="转入羊舍id" prop="sheepfold">
<el-input v-model="form.sheepfold" placeholder="请输入转入羊舍id" />
<el-form-item label="转入羊舍" prop="sheepfold">
<el-select v-model="form.sheepfold" filterable placeholder="请输入关键字选择" style="width: 100%">
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="技术员" prop="tecahnician">
<el-input v-model="form.tecahnician" placeholder="请输入技术员" />
<el-select v-model="form.tecahnician" filterable allow-create default-first-option placeholder="请输入或选择技术员">
<el-option v-for="user in userOptions" :key="user.userName" :label="user.nickName" :value="user.nickName"></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="comment">
<el-input v-model="form.comment" type="textarea" placeholder="请输入备注" />
</el-form-item>
@@ -179,6 +161,9 @@
<script setup name="Drymilk">
import { listDrymilk, getDrymilk, delDrymilk, addDrymilk, updateDrymilk } from "@/api/drymilk/drymilk"
import { listUser } from "@/api/system/user";
import axios from 'axios';
import { getToken } from "@/utils/auth"; // 必须引入token
const { proxy } = getCurrentInstance()
@@ -191,44 +176,99 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const dateRange = ref([])
const sheepfoldOptions = ref([])
const userOptions = ref([])
// 新增：耳号搜索相关变量
const earNumberLoading = ref(false)
const earNumberOptions = ref([])
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
manageTags: null,
manageTags: null, // 字符串字段，用于兼容
manageTagsList: [], // 数组字段，用于el-select多选
variety: null,
datetime: null,
status: null,
sheepfold: null,
tecahnician: null,
createBy: null,
createTime: null
},
rules: {
manageTags: [
{ required: true, message: "耳号不能为空", trigger: "blur" }
],
datetime: [
{ required: true, message: "干奶日期不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "请选择是否使用乳头封闭剂", trigger: "change" }
]
manageTags: [{ required: true, message: "耳号不能为空", trigger: "blur" }],
datetime: [{ required: true, message: "干奶日期不能为空", trigger: "blur" }],
status: [{ required: true, message: "请选择是否使用乳头封闭剂", trigger: "change" }]
}
})
const { queryParams, form, rules } = toRefs(data)
/** 1. 远程搜索耳号方法 */
function searchEarNumber(query) {
if (query) {
earNumberLoading.value = true;
const url = '/drymilk/drymilk/searchEarNumbers?query=' + query;
// 使用统一的request工具或者axios
const req = proxy.$request ? proxy.$request : axios.create({ baseURL: import.meta.env.VITE_APP_BASE_API, headers: { 'Authorization': 'Bearer ' + getToken() } });
req.get(url).then(res => {
earNumberLoading.value = false;
// 兼容返回格式: 可能是 res.data, res.msg, 或直接 res (如果是拦截器处理过)
const list = res.data || res.msg || res;
if (Array.isArray(list)) {
earNumberOptions.value = list;
} else {
earNumberOptions.value = [];
}
}).catch(err => {
console.error(err);
earNumberLoading.value = false;
earNumberOptions.value = [];
});
} else {
earNumberOptions.value = [];
}
}
/** 查询干奶记录列表 */
function getList() {
loading.value = true
listDrymilk(queryParams.value).then(response => {
// 1. 处理日期范围
const params = proxy.addDateRange(queryParams.value, dateRange.value);
// 2. 处理多耳号逻辑
// 前端 el-select 绑定的是 manageTagsList (数组)
// 为了保证后端能稳定接收，如果 queryParams 中有 manageTagsList，则保留它
// 如果后端需要字符串兼容，可以这样处理：
/*
if (params.manageTagsList && params.manageTagsList.length > 0) {
params.manageTags = params.manageTagsList.join(',');
}
*/
listDrymilk(params).then(response => {
drymilkList.value = response.rows
total.value = response.total
loading.value = false
})
}).catch(() => {
loading.value = false;
});
}
// 辅助函数：获取下拉数据
function getSheepfoldList() {
const url = '/drymilk/drymilk/sheepfoldList';
const req = proxy.$request ? proxy.$request : axios.create({ baseURL: import.meta.env.VITE_APP_BASE_API, headers: { 'Authorization': 'Bearer ' + getToken() } });
req.get(url).then(res => {
sheepfoldOptions.value = res.data || res.rows || [];
});
}
function getUserList() {
listUser({ pageNum: 1, pageSize: 1000 }).then(response => {
userOptions.value = response.rows;
});
}
// 取消按钮
@@ -242,8 +282,8 @@ function reset() {
form.value = {
id: null,
manageTags: null,
datetime: null,
status: null,
datetime: new Date().toISOString().split('T')[0],
status: 0,
sheepfold: null,
tecahnician: null,
comment: null
@@ -251,35 +291,39 @@ function reset() {
proxy.resetForm("drymilkRef")
}
// 搜索重置
function resetQuery() {
dateRange.value = []
queryParams.value.manageTagsList = []
earNumberOptions.value = []
proxy.resetForm("queryRef")
handleQuery()
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1
getList()
}
/** 重置按钮操作 */
function resetQuery() {
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()
getSheepfoldList();
getUserList();
open.value = true
title.value = "添加干奶记录"
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
getSheepfoldList();
getUserList();
const _id = row.id || ids.value
getDrymilk(_id).then(response => {
form.value = response.data
@@ -288,7 +332,6 @@ function handleUpdate(row) {
})
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["drymilkRef"].validate(valid => {
if (valid) {
@@ -300,7 +343,12 @@ function submitForm() {
})
} else {
addDrymilk(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功")
if(response.code === 200 || response.code === undefined) {
// 兼容不同版本的AjaxResult结构
proxy.$modal.msgSuccess(response.msg || "新增成功")
} else {
proxy.$modal.msgWarning(response.msg)
}
open.value = false
getList()
})
@@ -309,7 +357,6 @@ function submitForm() {
})
}
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除干奶记录编号为"' + _ids + '"的数据项？').then(function() {
@@ -320,12 +367,18 @@ function handleDelete(row) {
}).catch(() => {})
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('drymilk/drymilk/export', {
...queryParams.value
}, `drymilk_${new Date().getTime()}.xlsx`)
let params = proxy.addDateRange(queryParams.value, dateRange.value);
// 导出时确保数组参数被传递
if (params.manageTagsList && params.manageTagsList.length > 0) {
// 某些后端框架导出只能接字符串，这里转一下以防万一
params.manageTags = params.manageTagsList.join(',');
}
proxy.download('drymilk/drymilk/export', params, `drymilk_${new Date().getTime()}.xlsx`)
}
// 初始化
getList()
getSheepfoldList()
getUserList()
</script>

340
src/views/sheep_death/death/index.vue
View File

@@ -1,31 +1,60 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="管理耳号" prop="manageTags">
<el-input
v-model="queryParams.manageTags"
placeholder="请输入管理耳号"
<el-form-item label="管理耳号" prop="manageTagsList">
<el-select
v-model="queryParams.manageTagsList"
multiple
filterable
remote
reserve-keyword
placeholder="请输入耳号"
:remote-method="remoteSearchEarNo"
:loading="loadingSearch"
allow-create
default-first-option
clearable
@keyup.enter="handleQuery"
@blur="validateManageTagsInQuery"
/>
style="width: 240px"
>
<el-option
v-for="item in earNoOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="事件类型" prop="eventType">
<el-input
v-model="queryParams.eventType"
placeholder="请输入事件类型"
clearable
@keyup.enter="handleQuery"
/>
<el-form-item label="死亡日期" prop="deathDateRange">
<el-date-picker
v-model="queryParams.deathDateRange"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
style="width: 240px"
></el-date-picker>
</el-form-item>
<el-form-item label="死亡日期" prop="deathDate">
<el-date-picker clearable
v-model="queryParams.deathDate"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择死亡日期">
</el-date-picker>
<el-form-item label="羊只类型" prop="sheepTypeList">
<el-select
v-model="queryParams.sheepTypeList"
placeholder="请选择羊只类型"
multiple
clearable
collapse-tags
style="width: 200px">
<el-option
v-for="dict in sys_sheep_type"
:key="dict.value"
:label="dict.label"
:value="dict.label"
/>
</el-select>
</el-form-item>
<el-form-item label="疾病类型" prop="diseaseTypeId">
<el-tree-select
v-model="queryParams.diseaseTypeId"
@@ -38,36 +67,76 @@
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="死淘去向" prop="disposalDirection">
<el-select v-model="queryParams.disposalDirection" placeholder="请选择死淘去向" clearable>
<el-select v-model="queryParams.disposalDirection" placeholder="请选择死淘去向" clearable style="width: 200px;">
<el-option label="深埋" value="深埋" />
<el-option label="无害化" value="无害化" />
</el-select>
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input
v-model="queryParams.technician"
<el-form-item label="技术员" prop="technicianList">
<el-select
v-model="queryParams.technicianList"
multiple
filterable
remote
reserve-keyword
placeholder="请输入技术员"
:remote-method="remoteSearchTechnician"
:loading="loadingSearch"
clearable
@keyup.enter="handleQuery"
/>
style="width: 200px"
>
<el-option
v-for="item in technicianOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="处理人" prop="handler">
<el-input
v-model="queryParams.handler"
<el-form-item label="处理人" prop="handlerList">
<el-select
v-model="queryParams.handlerList"
multiple
filterable
remote
reserve-keyword
placeholder="请输入处理人"
:remote-method="remoteSearchHandler"
:loading="loadingSearch"
clearable
@keyup.enter="handleQuery"
/>
style="width: 200px"
>
<el-option
v-for="item in handlerOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="班组" prop="workGroup">
<el-form-item label="班组" prop="workGroupList">
<el-select v-model="queryParams.workGroupList" placeholder="请选择班组" multiple clearable style="width: 200px">
<el-option label="一组" value="一组" />
<el-option label="二组" value="二组" />
<el-option label="三组" value="三组" />
</el-select>
</el-form-item>
<el-form-item label="羊只品种" prop="variety">
<el-input
v-model="queryParams.workGroup"
placeholder="请输入班组"
v-model="queryParams.variety"
placeholder="请输入羊只品种"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -122,7 +191,6 @@
<el-table v-loading="loading" :data="deathList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<!-- 日期作为第一列 -->
<el-table-column label="死亡日期" align="center" prop="deathDate" width="120" fixed="left">
<template #default="scope">
<span>{{ parseTime(scope.row.deathDate, '{y}-{m}-{d}') }}</span>
@@ -132,7 +200,7 @@
<el-table-column label="管理耳号" align="center" prop="manageTags" width="120"/>
<el-table-column label="品种" align="center" prop="variety" width="100"/>
<el-table-column label="事件类型" align="center" prop="eventType" width="100"/>
<el-table-column label="死亡时羊只类别" align="center" prop="sheepType" width="130"/>
<el-table-column label="羊只类型" align="center" prop="sheepType" width="130"/>
<el-table-column label="性别" align="center" prop="gender" width="80">
<template #default="scope">
<span>{{ scope.row.gender === 1 ? '母' : scope.row.gender === 2 ? '公' : '' }}</span>
@@ -178,7 +246,6 @@
@pagination="getList"
/>
<!-- 添加或修改羊只死淘记录对话框 -->
<el-dialog :title="title" v-model="open" width="700px" append-to-body>
<el-form ref="deathRef" :model="form" :rules="rules" label-width="120px">
<el-row>
@@ -186,9 +253,7 @@
<el-form-item label="管理耳号" prop="manageTags">
<el-input
v-model="form.manageTags"
placeholder="请输入管理耳号"
@blur="validateManageTagsInForm"
:loading="validatingTags"
placeholder="请输入管理耳号 (可多个空格隔开)"
/>
</el-form-item>
</el-col>
@@ -198,12 +263,13 @@
v-model="form.deathDate"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择死亡日期">
placeholder="请选择死亡日期"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="疾病类型" prop="diseaseTypeId">
@@ -284,9 +350,22 @@
</template>
<script setup name="Death">
import {listDeath, getDeath, delDeath, addDeath, updateDeath, getSheepInfo, getDiseaseTree} from "@/api/sheep_death/death"
import {
listDeath,
getDeath,
delDeath,
addDeath,
updateDeath,
getSheepInfo,
getDiseaseTree,
searchEarNo,
searchTechnician,
searchHandler
} from "@/api/sheep_death/death"
const {proxy} = getCurrentInstance()
// 获取字典数据
const { sys_sheep_type } = proxy.useDict("sys_sheep_type");
const deathList = ref([])
const open = ref(false)
@@ -297,26 +376,31 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const validatingTags = ref(false) // 验证管理耳号的loading状态
const diseaseOptions = ref([]) // 疾病类型选项
const diseaseSubtypeOptions = ref([]) // 疾病子类型选项
const diseaseOptions = ref([])
const diseaseSubtypeOptions = ref([])
// 远程搜索相关变量
const loadingSearch = ref(false)
const earNoOptions = ref([])
const technicianOptions = ref([])
const handlerOptions = ref([])
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
manageTags: null,
eventType: null,
deathDate: null,
manageTagsList: [], // 多选耳号
deathDateRange: [], // 死亡日期范围
sheepTypeList: [], // 多选羊只类型
technicianList: [], // 多选技术员
handlerList: [], // 多选处理人
workGroupList: [], // 多选班组
variety: null,
diseaseTypeId: null,
diseaseSubtypeId: null,
disposalDirection: null,
technician: null,
handler: null,
workGroup: null,
comment: null,
isDelete: null
disposalDirection: null
},
rules: {
manageTags: [
@@ -333,32 +417,80 @@ const {queryParams, form, rules} = toRefs(data)
/** 查询羊只死淘记录列表 */
function getList() {
loading.value = true
listDeath(queryParams.value).then(response => {
// 处理日期范围
let params = { ...queryParams.value };
// 处理 params 对象 (BaseEntity 需要)
params.params = {};
if (queryParams.value.deathDateRange && queryParams.value.deathDateRange.length === 2) {
params.params['beginDeathDate'] = queryParams.value.deathDateRange[0];
params.params['endDeathDate'] = queryParams.value.deathDateRange[1];
}
listDeath(params).then(response => {
deathList.value = response.rows
total.value = response.total
loading.value = false
}).catch(() => {
loading.value = false
})
}
/** 远程搜索耳号 */
function remoteSearchEarNo(query) {
if (query) {
loadingSearch.value = true
searchEarNo(query).then(res => {
earNoOptions.value = res.data || []
loadingSearch.value = false
})
} else {
earNoOptions.value = []
}
}
/** 远程搜索技术员 */
function remoteSearchTechnician(query) {
if (query) {
loadingSearch.value = true
searchTechnician(query).then(res => {
technicianOptions.value = res.data || []
loadingSearch.value = false
})
} else {
technicianOptions.value = []
}
}
/** 远程搜索处理人 */
function remoteSearchHandler(query) {
if (query) {
loadingSearch.value = true
searchHandler(query).then(res => {
handlerOptions.value = res.data || []
loadingSearch.value = false
})
} else {
handlerOptions.value = []
}
}
/** 获取疾病树形列表 */
function getDiseaseTreeData() {
getDiseaseTree().then(response => {
if (response.code === 200) {
// 构建树形结构
diseaseOptions.value = proxy.handleTree(response.data, "id", "pid")
}
}).catch(() => {
proxy.$modal.msgError("获取疾病列表失败")
})
}).catch(() => {})
}
/** 疾病类型改变时，更新子类型选项 */
function onDiseaseTypeChange(value) {
form.value.diseaseSubtypeId = null // 清空子类型选择
form.value.diseaseSubtypeId = null
diseaseSubtypeOptions.value = []
if (value) {
// 查找选中疾病类型的子类型
const findChildren = (nodes, targetId) => {
for (const node of nodes) {
if (node.id === targetId) {
@@ -371,62 +503,10 @@ function onDiseaseTypeChange(value) {
}
return []
}
diseaseSubtypeOptions.value = findChildren(diseaseOptions.value, value)
}
}
/** 验证查询条件中的管理耳号 */
function validateManageTagsInQuery() {
const manageTags = queryParams.value.manageTags
if (manageTags && manageTags.trim()) {
validateManageTags(manageTags.trim(), 'query')
}
}
/** 验证表单中的管理耳号 */
function validateManageTagsInForm() {
const manageTags = form.value.manageTags
if (manageTags && manageTags.trim()) {
validateManageTags(manageTags.trim(), 'form')
}
}
/** 验证管理耳号是否存在 */
function validateManageTags(manageTags, source) {
if (validatingTags.value) return // 防止重复请求
validatingTags.value = true
getSheepInfo(manageTags).then(response => {
if (response.code === 200 && response.data) {
if (source === 'form') {
proxy.$modal.msgSuccess("羊只验证成功")
} else {
proxy.$modal.msgSuccess("耳号验证成功")
}
} else {
// 耳号不存在时清空输入并提示
if (source === 'form') {
form.value.manageTags = null
} else {
queryParams.value.manageTags = null
}
proxy.$modal.msgError("该耳号不存在")
}
}).catch(error => {
// 验证失败时清空输入并提示
if (source === 'form') {
form.value.manageTags = null
} else {
queryParams.value.manageTags = null
}
proxy.$modal.msgError("该耳号不存在")
}).finally(() => {
validatingTags.value = false
})
}
// 取消按钮
function cancel() {
open.value = false
@@ -439,8 +519,8 @@ function reset() {
id: null,
sheepId: null,
manageTags: null,
eventType: "死亡", // 默认事件类型
deathDate: new Date().toISOString().split('T')[0], // 默认今日
eventType: "死亡",
deathDate: new Date().toISOString().split('T')[0],
diseaseTypeId: null,
diseaseSubtypeId: null,
disposalDirection: null,
@@ -454,7 +534,6 @@ function reset() {
updateTime: null,
isDelete: null
}
// 重置子类型选项
diseaseSubtypeOptions.value = []
proxy.resetForm("deathRef")
}
@@ -467,6 +546,14 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
// 手动清空数组类型的查询条件
queryParams.value.manageTagsList = []
queryParams.value.sheepTypeList = []
queryParams.value.technicianList = []
queryParams.value.handlerList = []
queryParams.value.workGroupList = []
queryParams.value.deathDateRange = []
proxy.resetForm("queryRef")
handleQuery()
}
@@ -481,7 +568,7 @@ function handleSelectionChange(selection) {
/** 新增按钮操作 */
function handleAdd() {
reset()
getDiseaseTreeData() // 获取疾病数据
getDiseaseTreeData()
open.value = true
title.value = "添加羊只死淘记录"
}
@@ -489,11 +576,10 @@ function handleAdd() {
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
getDiseaseTreeData() // 获取疾病数据
getDiseaseTreeData()
const _id = row.id || ids.value
getDeath(_id).then(response => {
form.value = response.data
// 如果有疾病类型，需要设置子类型选项
if (form.value.diseaseTypeId) {
onDiseaseTypeChange(form.value.diseaseTypeId)
}
@@ -537,9 +623,15 @@ function handleDelete(row) {
/** 导出按钮操作 */
function handleExport() {
proxy.download('sheep_death/death/export', {
...queryParams.value
}, `death_${new Date().getTime()}.xlsx`)
// 导出参数构造
let params = { ...queryParams.value };
params.params = {};
if (queryParams.value.deathDateRange && queryParams.value.deathDateRange.length === 2) {
params.params['beginDeathDate'] = queryParams.value.deathDateRange[0];
params.params['endDeathDate'] = queryParams.value.deathDateRange[1];
}
proxy.download('sheep_death/death/export', params, `death_${new Date().getTime()}.xlsx`)
}
// 初始化