新增羊只,转场,转群,改耳号,改品种,改备注,体尺测量,体况评分,乳况评分,修蹄,去势初版

This commit is contained in:
zyh
2025-07-29 22:01:14 +08:00
parent d9ef69f89f
commit 9ea5c35d85
22 changed files with 3201 additions and 429 deletions

View File

@@ -1,11 +1,9 @@
<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="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery" />
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery"
style="width: 150px;" />
</el-form-item>
<el-form-item label="转出羊舍" prop="foldFrom">
<el-select v-model="queryParams.foldFrom" placeholder="请选择转出羊舍" style="min-width:150px" clearable>
@@ -59,15 +57,17 @@
<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="manageTags" />
<el-table-column label="管理耳号" align="center" prop="manageTags" />
<el-table-column label="转出羊舍" align="center" prop="foldFromName" />
<el-table-column label="转入羊舍" align="center" prop="foldToName" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="转群原因" align="center" prop="reasonText" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="状态" align="center" prop="statusText" />
<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">
@@ -95,27 +95,25 @@
<!-- 添加或修改转群记录对话框 -->
<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="manageTags">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable collapse-tags allow-create
style="width: 100%" @change="loadSheepInfo">
<el-form-item label="管理耳号" prop="manageTags">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
style="width: 100%" @change="loadSheepInfo" :disabled="!isAdd">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
</el-form-item>
<el-form-item label="转出羊舍" prop="foldFrom">
<el-select v-model="form.foldFrom" placeholder="请选择转出羊舍" clearable @change="handleSheepFilter">
<el-select v-model="form.foldFrom" placeholder="请选择转出羊舍" clearable @change="handleSheepFilter"
:disabled="!isAdd">
<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="foldTo">
<el-select v-model="form.foldTo" placeholder="请选择转入羊舍" clearable>
<el-select v-model="form.foldTo" placeholder="请选择转入羊舍" clearable :disabled="!isAdd">
<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="sheepTypeId">
<el-form-item v-if="isAdd" label="羊只类型" prop="sheepTypeId">
<el-select v-model="form.sheepTypeId" placeholder="请选择羊只类型" clearable @change="handleSheepFilter">
<el-option v-for="type in sheepTypeOptions" :key="type.id" :label="type.name" :value="type.id" />
</el-select>
@@ -142,9 +140,6 @@
<!-- 审批对话框 -->
<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="displayManageTags" disabled />
</el-form-item>
@@ -180,33 +175,34 @@
</template>
<script setup name="Trans_group">
import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group } from '@/api/produce/manage_sheep/trans_group'
import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group, approveScTransGroup } from '@/api/produce/manage_sheep/trans_group'
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof/fixHoof'
import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
import request from '@/utils/request'
const { proxy } = getCurrentInstance()
const { trans_group_reason, status } = proxy.useDict('trans_group_reason', 'status')
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(false)
const total = ref(0)
const title = ref('')
const daterangeCreateTime = ref([])
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(false);
const total = ref(0);
const title = ref('');
const daterangeCreateTime = ref([]);
const approveDialog = ref(false)
const approveForm = ref({})
const displayManageTags = ref('')
const sheepOptions = ref([])
const sheepfoldOptions = ref([])
const sheepfoldNameMap = ref({})
const varietyOptions = ref([])
const approveDialog = ref(false);
const approveForm = ref({});
const displayManageTags = ref('');
const sheepOptions = ref([]);
const sheepfoldOptions = ref([]);
const sheepfoldNameMap = ref({});
const varietyOptions = ref([]);
const sheepTypeOptions = ref([]);
const isAdd = ref(false);
const data = reactive({
form: {
@@ -222,35 +218,34 @@ const data = reactive({
foldFrom: null,
varietyId: null,
status: null,
createTime: null
createTime: null,
},
rules: {
// sheepId: [{ required: true, message: '羊只id不能为空', trigger: 'blur' }],
manageTags: [{ required: true, message: '耳号不能为空', trigger: 'blue' }],
// foldFrom: [{ required: true, message: '转出羊舍不能为空', trigger: 'change' }],
foldTo: [{ required: true, message: '转入羊舍不能为空', trigger: 'change' }],
varietyId: [{ required: true, message: '品种不能为空', trigger: 'change' }],
reason: [{ required: true, message: '转群原因不能为空', trigger: 'change' }],
technician: [{ required: true, message: '技术员不能为空', trigger: 'blur' }]
}
})
const { queryParams, form, rules } = toRefs(data)
manageTags: [{ required: true, message: '请输入耳号', trigger: 'blur' }],
foldTo: [{ required: true, message: '请选择转入羊舍', trigger: 'change' }],
varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }],
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 = {}
loading.value = true;
queryParams.value.params = {};
if (daterangeCreateTime.value?.length) {
queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0];
queryParams.value.params.endCreateTime = daterangeCreateTime.value[1];
}
listTrans_group(queryParams.value).then(res => {
trans_groupList.value = res.rows
total.value = res.total
loading.value = false
})
listTrans_group(queryParams.value).then((res) => {
trans_groupList.value = res.rows;
total.value = res.total;
loading.value = false;
});
}
//重置按钮
function reset() {
form.value = {
id: null,
@@ -263,129 +258,151 @@ function reset() {
status: null,
comment: null,
createBy: null,
createTime: null
}
proxy.resetForm('trans_groupRef')
createTime: null,
manageTags: [],
tagDetails: {},
sheepTypeId: null,
};
proxy.resetForm('trans_groupRef');
}
//新增时判断筛选条件
async function handleSheepFilter() {
const { foldFrom, sheepTypeId } = form.value;
sheepOptions.value = [];
let loadedSheep = [];
let isOnlySheepfold = false;
let isOnlyTypeOrCombined = false;
if (!foldFrom && !sheepTypeId) return;
if (foldFrom && sheepTypeId) {
loadedSheep = await loadSheepBySheepfoldAndType(foldFrom, sheepTypeId);
if (loadedSheep.length > 0) {
form.value.manageTags = loadedSheep.map(sheep => sheep.manageTags);
loadSheepInfo();
}
} else if (foldFrom) {
loadedSheep = await loadSheepBySheepfoldOnly(foldFrom);
if (foldFrom && !sheepTypeId) {
isOnlySheepfold = true;
} else if (!foldFrom && sheepTypeId) {
isOnlyTypeOrCombined = true;
} else if (foldFrom && sheepTypeId) {
isOnlyTypeOrCombined = true;
} else {
form.value.manageTags = [];
} else if (sheepTypeId) {
loadedSheep = await loadSheepByTypeOnly(sheepTypeId);
sheepOptions.value = [];
return;
}
if (isOnlySheepfold) {
await loadSheepBySheepfoldOnly(foldFrom);
}
else if (isOnlyTypeOrCombined) {
form.value.manageTags = [];
let loadedSheep = [];
if (foldFrom && sheepTypeId) {
loadedSheep = await loadSheepBySheepfoldAndType(foldFrom, sheepTypeId);
} else if (sheepTypeId) {
loadedSheep = await loadSheepByTypeOnly(sheepTypeId);
}
if (loadedSheep.length > 0) {
form.value.manageTags = loadedSheep.map(sheep => sheep.manageTags);
loadSheepInfo();
form.value.manageTags = loadedSheep.map((sheep) => sheep.manageTags);
await loadSheepInfo();
}
}
}
//转群类型列表
function getSheepTypeList() {
request({
url: '/base/base/list',
method: 'get',
params: { pageNum: 1, pageSize: 9999 }
}).then(res => {
sheepTypeOptions.value = res.rows || [];
}).catch(error => {
console.error('获取羊只类型失败', error);
proxy.$modal.msgError('加载羊只类型失败,请重试');
return new Promise((resolve, reject) => {
request({
url: '/base/base/list',
method: 'get',
params: { pageNum: 1, pageSize: 9999 },
}).then((res) => {
sheepTypeOptions.value = res.rows.map(item => ({
id: Number(item.id),
name: item.name || item.typeName
})) || [];
resolve();
}).catch((error) => {
console.error('获取羊只类型失败', error);
proxy.$modal.msgError('加载羊只类型失败,请重试');
reject(error);
});
});
}
//只通过羊舍
async function loadSheepBySheepfoldOnly(sheepfoldId) {
try {
const res = await getSheepBySheepfoldId(String(sheepfoldId));
const newSheepList = (res.data || []).map((sheep) => ({
id: sheep.id,
manageTags: sheep.manageTags,
sheepfoldId: sheepfoldId,
}));
const existingTags = new Set(sheepOptions.value.map((item) => item.manageTags));
const mergedSheep = newSheepList.filter((item) => !existingTags.has(item.manageTags));
sheepOptions.value.push(...mergedSheep);
return mergedSheep;
} catch (error) {
console.error('根据羊舍加载耳号失败', error);
proxy.$modal.msgError('加载羊舍耳号失败,请重试');
return [];
}
}
//通过羊舍和羊只类型
async function loadSheepBySheepfoldAndType(sheepfoldId, typeId) {
try {
const res = await request({
url: '/sheep/sheep/listBySheepfoldAndType',
method: 'get',
params: { sheepfoldId, typeId, _t: Date.now() }
params: { sheepfoldId, typeId, _t: Date.now() },
});
const sheepList = res.rows || [];
const formattedSheep = sheepList.map(sheep => ({
const formattedSheep = sheepList.map((sheep) => ({
id: sheep.id,
manageTags: sheep.manageTags,
sheepfoldId: sheepfoldId
sheepfoldId: sheepfoldId,
}));
sheepOptions.value = formattedSheep;
if (sheepOptions.value.length === 0) {
proxy.$message.error(`该羊舍没有该类型羊只`);
}
return formattedSheep;
} catch (error) {
console.error('根据羊舍+类型加载耳号失败', error);
proxy.$modal.msgError("加载耳号失败,请重试");
return [];
}
}
async function loadSheepBySheepfoldOnly(sheepfoldId) {
try {
const res = await getSheepBySheepfoldId(String(sheepfoldId));
const sheepList = res.data || [];
const formattedSheep = sheepList.map(sheep => ({
id: sheep.id,
manageTags: sheep.manageTags,
sheepfoldId: sheepfoldId
}));
sheepOptions.value = formattedSheep;
if (sheepOptions.value.length === 0) {
proxy.$message.error(`该羊舍下没有羊只数据`);
} else {
proxy.$message.success(`成功加载 ${sheepOptions.value.length} 个耳号`);
}
return formattedSheep;
} catch (error) {
console.error('根据羊舍加载耳号失败', error);
proxy.$modal.msgError("加载羊舍耳号失败,请重试");
proxy.$modal.msgError('加载耳号失败,请重试');
return [];
}
}
//只通过羊只类型
async function loadSheepByTypeOnly(typeId) {
try {
const res = await request({
url: '/sheep/sheep/listByTypeId',
method: 'get',
params: { typeId }
params: { typeId },
});
const sheepList = res.rows || [];
const formattedSheep = sheepList.map(sheep => ({
const formattedSheep = sheepList.map((sheep) => ({
id: sheep.id,
manageTags: sheep.manageTags,
sheepfoldId: sheep.sheepfoldId
sheepfoldId: sheep.sheepfoldId,
}));
sheepOptions.value = formattedSheep;
if (sheepOptions.value.length === 0) {
proxy.$message.error(`未查询到“${getSheepTypeName(typeId)}”类型的羊只`);
}
return formattedSheep;
} catch (error) {
console.error('根据类型加载耳号失败', error);
proxy.$modal.msgError("加载耳号失败,请重试");
proxy.$modal.msgError('加载耳号失败,请重试');
return [];
}
}
function getSheepTypeName(typeId) {
if (!typeId) return '未知类型';
const type = sheepTypeOptions.value.find(item => item.id === typeId);
return type ? type.name : '未知类型';
}
//加载羊只信息
async function loadSheepInfo() {
const tags = form.value.manageTags;
if (!tags || tags.length === 0) return;
const tagDetails = {};
const validResults = [];
let firstSheepfoldId = null;
for (const tag of tags) {
try {
@@ -399,8 +416,11 @@ async function loadSheepInfo() {
comment: sheepData.comment || '',
varietyId: sheepData.varietyId,
sheepId: sheepData.id,
sheepfoldId: sheepData.sheepfoldId
sheepfoldId: sheepData.sheepfoldId,
};
if (!firstSheepfoldId) {
firstSheepfoldId = sheepData.sheepfoldId;
}
}
} catch (error) {
console.error('获取耳号信息失败:', error);
@@ -414,62 +434,105 @@ async function loadSheepInfo() {
proxy.$message.warning('部分耳号不合法,已自动过滤');
}
form.value.tagDetails = tagDetails;
if (firstSheepfoldId && isAdd.value) {
form.value.foldFrom = Number(firstSheepfoldId);
}
}
//取消按钮
function cancel() {
open.value = false
reset()
open.value = false;
reset();
}
//搜索按钮
function handleQuery() {
queryParams.value.pageNum = 1
getList()
queryParams.value.pageNum = 1;
getList();
}
//重置搜索框
function resetQuery() {
daterangeCreateTime.value = []
proxy.resetForm('queryRef')
handleQuery()
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
ids.value = selection.map((item) => item.id);
single.value = selection.length !== 1;
multiple.value = !selection.length;
}
//新增
function handleAdd() {
reset();
open.value = true;
title.value = '添加转群记录';
isAdd.value = true;
sheepOptions.value = [];
form.value.manageTags = [];
}
function handleUpdate(row) {
//修改
async function handleUpdate(row) {
reset();
const _id = row.id || ids.value;
loading.value = true;
isAdd.value = false;
const { data: d } = await getTrans_group(_id);
getTrans_group(_id).then(res => {
const d = res.data;
d.foldFrom = Number(d.foldFrom ?? 0);
d.foldTo = Number(d.foldTo ?? 0);
d.reason = Number(d.reason ?? 0);
d.status = Number(d.status ?? 0);
d.varietyId = Number(d.varietyId ?? 0);
try {
await Promise.all([
sheepfoldOptions.value.length === 0 ? loadSheepfold() : Promise.resolve(),
sheepTypeOptions.value.length === 0 ? getSheepTypeList() : Promise.resolve()
]);
form.value = { ...d, manageTags: d.manageTags, isEdit: true };
const { data: d } = await getTrans_group(_id);
handleSheepFilter();
const manageTags = Array.isArray(d.manageTags)
? d.manageTags
: d.manageTags ? [d.manageTags] : [];
const formData = {
...d,
manageTags: manageTags,
foldFrom: Number(d.foldFrom || 0),
foldTo: Number(d.foldTo || 0),
sheepTypeId: Number(d.sheepTypeId || 0),
reason: Number(d.reason || 0),
status: Number(d.status || 0),
varietyId: Number(d.varietyId || 0),
isEdit: true
};
// 5. 验证匹配情况(调试用)
// const foldFromItem = sheepfoldOptions.value.find(item => item.id === formData.foldFrom);
// const foldToItem = sheepfoldOptions.value.find(item => item.id === formData.foldTo);
// const sheepTypeItem = sheepTypeOptions.value.find(item => item.id === formData.sheepTypeId);
// console.log("转出羊舍匹配结果:", foldFromItem ? foldFromItem.sheepfoldName : "未找到");
// console.log("转入羊舍匹配结果:", foldToItem ? foldToItem.sheepfoldName : "未找到");
// console.log("羊只类型匹配结果:", sheepTypeItem ? sheepTypeItem.name : "未找到");
form.value = formData;
if (manageTags.length > 0) {
await loadSheepInfo();
}
open.value = true;
title.value = '修改转群记录';
});
} catch (error) {
console.error('修改加载失败:', error);
proxy.$modal.msgError('加载数据失败');
} finally {
loading.value = false;
}
}
//提交
function submitForm() {
proxy.$refs.trans_groupRef.validate(valid => {
proxy.$refs.trans_groupRef.validate((valid) => {
if (!valid) return;
const allTags = form.value.manageTags;
@@ -501,78 +564,88 @@ function submitForm() {
open.value = false;
getList();
})
.catch(error => {
.catch((error) => {
proxy.$modal.msgError(`处理失败:${error.message}`);
});
});
}
//删除
function handleDelete(row) {
const _ids = row.id || ids.value
const _ids = row.id || ids.value;
proxy.$modal.confirm(`是否确认删除转群记录编号为“${_ids}”的数据项?`)
.then(() => delTrans_group(_ids))
.then(() => {
getList()
proxy.$modal.msgSuccess('删除成功')
})
getList();
proxy.$modal.msgSuccess('删除成功');
});
}
//导出
function handleExport() {
proxy.download(
'/produce/manage_sheep/trans_group/export',
{ ...queryParams.value },
`trans_group_${Date.now()}.xlsx`
)
);
}
//审核
// 审核
function handleApprove(row) {
approveForm.value = { ...row }
approveDialog.value = true
approveForm.value = { ...row };
approveDialog.value = true;
displayManageTags.value = row.manageTags;
}
}
// 审批同意
function handleApproveAgree() {
approveForm.value.status = 1
updateTrans_group(approveForm.value).then(() => {
approveDialog.value = false
proxy.$modal.msgSuccess('审批成功,状态已更新为同意')
getList()
})
if (typeof approveForm.value.foldTo !== 'number') {
approveForm.value.foldTo = Number(approveForm.value.foldTo);
}
approveForm.value.status = 1;
approveScTransGroup(approveForm.value).then(() => {
approveDialog.value = false;
proxy.$modal.msgSuccess('审批通过,羊只所在羊舍已更新');
getList();
}).catch(error => {
proxy.$modal.msgError(`审批失败:${error.message}`);
});
}
function handleApproveReject() {
approveForm.value.status = 2
updateTrans_group(approveForm.value).then(() => {
approveDialog.value = false
proxy.$modal.msgSuccess('审批成功,状态已更新为驳回')
getList()
})
approveForm.value.status = 2;
approveScTransGroup(approveForm.value).then(() => {
approveDialog.value = false;
proxy.$modal.msgSuccess('审批驳回');
getList();
}).catch(error => {
proxy.$modal.msgError(`审批失败:${error.message}`);
});
}
function loadSheepfold() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows
listSheepfold({ pageNum: 1, pageSize: 9999 }).then((res) => {
sheepfoldOptions.value = res.rows;
sheepfoldNameMap.value = res.rows.reduce((acc, item) => {
acc[item.id] = item.sheepfoldName
return acc
}, {})
})
acc[item.id] = item.sheepfoldName;
return acc;
}, {});
});
}
function getVarietyOptions() {
request({
url: '/base/variety/list',
method: 'get',
params: { pageNum: 1, pageSize: 9999 }
}).then(res => {
params: { pageNum: 1, pageSize: 9999 },
}).then((res) => {
varietyOptions.value = res.rows || [];
});
}
onMounted(() => {
loadSheepfold();
getVarietyOptions();
getSheepTypeList();
getList();
})
});
</script>