修蹄,去势,转群的新增功能完善
This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
<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 label="耳号" prop="manageTags">
|
||||
<el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="羊舍" prop="sheepfold">
|
||||
@@ -35,10 +35,11 @@
|
||||
<el-button type="primary" plain icon="Plus" @click="handleAdd"
|
||||
v-hasPermi="['produce:castrate:add']">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<!-- 按需添加 是否需要修改功能 -->
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
|
||||
v-hasPermi="['produce:castrate:edit']">修改</el-button>
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
<el-col :span="1.5">
|
||||
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
|
||||
v-hasPermi="['produce:castrate:remove']">删除</el-button>
|
||||
@@ -53,7 +54,8 @@
|
||||
<!-- 列表表格 -->
|
||||
<el-table v-loading="loading" :data="castrateList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="羊只id" align="center" prop="sheepId" />
|
||||
<!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
|
||||
<el-table-column label="耳号" align="center" prop="manageTags" />
|
||||
<el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
|
||||
<el-table-column label="品种" align="center" prop="varietyName" />
|
||||
<el-table-column label="备注" align="center" prop="comment" />
|
||||
@@ -65,8 +67,9 @@
|
||||
</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)"
|
||||
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>
|
||||
@@ -79,25 +82,21 @@
|
||||
<!-- 新增/修改弹窗 -->
|
||||
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
|
||||
<el-form ref="castrateRef" :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="sheepfold">
|
||||
<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-form-item label="耳号" prop="manageTags">
|
||||
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable collapse-tags allow-create
|
||||
style="width: 100%" @change="loadSheepInfo">
|
||||
<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="varietyId">
|
||||
<el-select v-model="form.varietyId" placeholder="请选择品种" clearable>
|
||||
<el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
|
||||
<el-form-item label="羊舍" prop="sheepfold">
|
||||
<el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable @change="loadSheepBySheepfold">
|
||||
<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="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
@@ -111,8 +110,8 @@
|
||||
|
||||
<script setup name="castrate">
|
||||
import { listCastrate, getCastrate, delCastrate, addCastrate, updateCastrate } from '@/api/produce/other/castrate/castrate'
|
||||
import { checkSheepByManageTags, getVarietyOptions, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof/fixHoof'
|
||||
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
|
||||
import request from '@/utils/request'
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
|
||||
@@ -126,28 +125,37 @@ const multiple = ref(true)
|
||||
const total = ref(0)
|
||||
const title = ref('')
|
||||
const daterangeCreateTime = ref([])
|
||||
const sheepOptions = ref([])
|
||||
const varietyOptions = ref([])
|
||||
|
||||
|
||||
const data = reactive({
|
||||
form: {},
|
||||
form: {
|
||||
manageTags: [],
|
||||
sheepfold: null,
|
||||
technician: null,
|
||||
tagDetails: {}
|
||||
},
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
sheepId: null,
|
||||
manageTags: null,
|
||||
// sheepId: null,
|
||||
sheepfold: null,
|
||||
varietyId: null,
|
||||
technician: null,
|
||||
createTime: null
|
||||
},
|
||||
rules: {
|
||||
sheepId: [
|
||||
{ required: true, message: '羊只id不能为空', trigger: 'blur' }
|
||||
// sheepId: [
|
||||
// { required: true, message: '羊只id不能为空', trigger: 'blur' }
|
||||
// ],
|
||||
manageTags: [
|
||||
{ required: true, message: '耳号不能为空', trigger: 'blur' }
|
||||
],
|
||||
sheepfold: [
|
||||
{ required: true, message: '羊舍不能为空', trigger: 'change' }
|
||||
],
|
||||
varietyId: [
|
||||
{ required: true, message: '品种不能为空', trigger: 'change' }
|
||||
],
|
||||
technician: [
|
||||
{ required: true, message: '技术员不能为空', trigger: 'blur' }
|
||||
]
|
||||
@@ -155,20 +163,97 @@ const data = reactive({
|
||||
})
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data)
|
||||
function loadSheepBySheepfold() {
|
||||
const sheepfoldId = form.value.sheepfold;
|
||||
if (!sheepfoldId) {
|
||||
sheepOptions.value = [];
|
||||
return;
|
||||
}
|
||||
|
||||
// 加载选择的羊舍的耳号
|
||||
getSheepBySheepfoldId(sheepfoldId)
|
||||
.then(res => {
|
||||
const sheepList = res.data || [];
|
||||
if (sheepList.length === 0) {
|
||||
proxy.$modal.msgInfo('该羊舍暂无可用耳号');
|
||||
}
|
||||
|
||||
sheepOptions.value = sheepList.map(sheep => ({
|
||||
id: sheep.id,
|
||||
manageTags: sheep.manageTags,
|
||||
sheepfoldId: sheepfoldId
|
||||
}));
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('加载羊舍耳号失败', error);
|
||||
proxy.$modal.msgError(`加载耳号失败: ${error.message}`);
|
||||
sheepOptions.value = [];
|
||||
});
|
||||
}
|
||||
|
||||
// 输入耳号后校验并获取品种/羊舍等信息
|
||||
async function loadSheepInfo() {
|
||||
const tags = form.value.manageTags;
|
||||
if (!tags || tags.length === 0) return;
|
||||
|
||||
const tagDetails = {}; // 存储每个耳号的信息
|
||||
const validResults = [];
|
||||
|
||||
for (const tag of tags) {
|
||||
try {
|
||||
const { data: sheepData } = await checkSheepByManageTags(tag.trim());
|
||||
if (!sheepData) {
|
||||
validResults.push(false);
|
||||
proxy.$modal.msgError(`耳号 ${tag} 不存在`);
|
||||
} else {
|
||||
validResults.push(true);
|
||||
// 存储当前耳号的备注、品种、羊舍等信息
|
||||
tagDetails[tag] = {
|
||||
comment: sheepData.comment || '', // 备注信息
|
||||
varietyId: sheepData.varietyId,
|
||||
sheepfoldId: sheepData.sheepfoldId,
|
||||
sheepId: sheepData.id
|
||||
};
|
||||
// 自动填充第一个耳号的羊舍(不影响备注,仅优化用户体验)
|
||||
if (validResults.length === 1) {
|
||||
form.value.sheepfold = sheepData.sheepfoldId;
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取耳号信息失败:', error);
|
||||
proxy.$modal.msgError(`耳号 ${tag} 验证失败`);
|
||||
validResults.push(false);
|
||||
}
|
||||
}
|
||||
|
||||
// 过滤不合法耳号
|
||||
if (validResults.includes(false)) {
|
||||
form.value.manageTags = tags.filter((_, index) => validResults[index]);
|
||||
proxy.$message.warning('部分耳号不合法,已过滤');
|
||||
}
|
||||
|
||||
// 保存所有耳号的信息(关键:用于后续提交时匹配备注)
|
||||
form.value.tagDetails = tagDetails;
|
||||
}
|
||||
|
||||
/** 查询列表 */
|
||||
function getList() {
|
||||
loading.value = true
|
||||
queryParams.value.params = {}
|
||||
if (daterangeCreateTime.value && daterangeCreateTime.value.length === 2) {
|
||||
queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
|
||||
queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
|
||||
loading.value = true;
|
||||
const q = { ...queryParams.value };
|
||||
|
||||
if (q.manageTags === '') q.manageTags = null;
|
||||
|
||||
q.params = {};
|
||||
if (daterangeCreateTime.value?.length) {
|
||||
q.params.beginCreateTime = daterangeCreateTime.value[0];
|
||||
q.params.endCreateTime = daterangeCreateTime.value[1];
|
||||
}
|
||||
listCastrate(queryParams.value).then(res => {
|
||||
castrateList.value = res.rows
|
||||
total.value = res.total
|
||||
loading.value = false
|
||||
})
|
||||
|
||||
listCastrate(q).then(res => {
|
||||
castrateList.value = res.rows;
|
||||
total.value = res.total;
|
||||
loading.value = false;
|
||||
});
|
||||
}
|
||||
|
||||
function cancel() {
|
||||
@@ -179,20 +264,17 @@ function cancel() {
|
||||
function reset() {
|
||||
form.value = {
|
||||
id: null,
|
||||
sheepId: null,
|
||||
manageTags: [],
|
||||
sheepfold: null,
|
||||
varietyId: null,
|
||||
comment: null,
|
||||
technician: null,
|
||||
createBy: null,
|
||||
createTime: null
|
||||
}
|
||||
proxy.resetForm('castrateRef')
|
||||
};
|
||||
sheepOptions.value = [];
|
||||
proxy.resetForm('castrateRef');
|
||||
}
|
||||
|
||||
function handleQuery() {
|
||||
queryParams.value.pageNum = 1
|
||||
getList()
|
||||
queryParams.value.pageNum = 1;
|
||||
getList();
|
||||
}
|
||||
|
||||
function resetQuery() {
|
||||
@@ -214,34 +296,90 @@ function handleAdd() {
|
||||
}
|
||||
|
||||
function handleUpdate(row) {
|
||||
reset()
|
||||
const _id = row.id || ids.value
|
||||
reset();
|
||||
const _id = row.id || ids.value;
|
||||
getCastrate(_id).then(res => {
|
||||
form.value = res.data
|
||||
open.value = true
|
||||
title.value = '修改去势'
|
||||
})
|
||||
const data = res.data;
|
||||
const manageTags = Array.isArray(data.manageTags)
|
||||
? data.manageTags
|
||||
: [data.manageTags || ''];
|
||||
|
||||
form.value = {
|
||||
...data,
|
||||
manageTags: manageTags.filter(tag => tag),
|
||||
};
|
||||
|
||||
if (form.value.sheepfold) {
|
||||
loadSheepBySheepfold();
|
||||
}
|
||||
|
||||
validateAllTags();
|
||||
|
||||
open.value = true;
|
||||
title.value = '修改去势';
|
||||
});
|
||||
}
|
||||
|
||||
// 新增:校验所有回显的耳号是否存在
|
||||
async function validateAllTags() {
|
||||
const tags = form.value.manageTags || [];
|
||||
if (tags.length === 0) return;
|
||||
|
||||
for (const tag of tags) {
|
||||
try {
|
||||
const { data } = await checkSheepByManageTags(tag.trim());
|
||||
if (!data) {
|
||||
proxy.$modal.msgWarning(`耳号 ${tag} 不存在,已移除`);
|
||||
form.value.manageTags = form.value.manageTags.filter(t => t !== tag);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`校验耳号 ${tag} 失败`, error);
|
||||
form.value.manageTags = form.value.manageTags.filter(t => t !== tag);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function submitForm() {
|
||||
proxy.$refs.castrateRef.validate(valid => {
|
||||
if (!valid) return
|
||||
if (form.value.id) {
|
||||
updateCastrate(form.value).then(() => {
|
||||
proxy.$modal.msgSuccess('修改成功')
|
||||
open.value = false
|
||||
getList()
|
||||
})
|
||||
} else {
|
||||
addCastrate(form.value).then(() => {
|
||||
proxy.$modal.msgSuccess('新增成功')
|
||||
open.value = false
|
||||
getList()
|
||||
})
|
||||
if (!valid) return;
|
||||
|
||||
const allTags = form.value.manageTags;
|
||||
const tagDetails = form.value.tagDetails || {};
|
||||
if (!allTags || allTags.length === 0) {
|
||||
proxy.$modal.msgError('请选择耳号');
|
||||
return;
|
||||
}
|
||||
})
|
||||
|
||||
// 循环处理每个耳号,逐个提交
|
||||
const requests = allTags.map(async (tag) => {
|
||||
const details = tagDetails[tag] || {};
|
||||
const formData = {
|
||||
...form.value,
|
||||
manageTags: tag,
|
||||
comment: details.comment || '', // 关键:每个耳号的备注
|
||||
sheepId: details.sheepId,
|
||||
varietyId: details.varietyId,
|
||||
sheepfold: details.sheepfoldId || form.value.sheepfold
|
||||
};
|
||||
|
||||
// 提交单个去势记录(与后端接口匹配)
|
||||
return addCastrate(formData);
|
||||
});
|
||||
|
||||
// 并行处理所有请求
|
||||
Promise.all(requests)
|
||||
.then(() => {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
open.value = false;
|
||||
getList();
|
||||
})
|
||||
.catch(error => {
|
||||
proxy.$modal.msgError(`处理失败:${error.message}`);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
function handleDelete(row) {
|
||||
const _ids = row.id || ids.value
|
||||
proxy.$modal.confirm(`是否确认删除去势编号为"${_ids}"的数据项?`).then(() => {
|
||||
@@ -263,19 +401,6 @@ function getSheepfoldOptions() {
|
||||
})
|
||||
}
|
||||
|
||||
const varietyOptions = ref([])
|
||||
function getVarietyOptions() {
|
||||
request({
|
||||
url: '/base/variety/list',
|
||||
method: 'get',
|
||||
params: { pageNum: 1, pageSize: 9999 }
|
||||
}).then(res => {
|
||||
varietyOptions.value = res.rows || []
|
||||
console.log(varietyOptions.value);
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
getList()
|
||||
getSheepfoldOptions()
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<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="请输入管理耳号" clearable @keyup.enter="handleQuery" />
|
||||
@@ -11,7 +10,6 @@
|
||||
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="品种" prop="varietyId">
|
||||
<el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
|
||||
<el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
|
||||
@@ -35,10 +33,11 @@
|
||||
<el-button type="primary" plain icon="Plus" @click="handleAdd"
|
||||
v-hasPermi="['fixHoof:fixHoof:add']">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<!-- 按需添加 是否需要修改功能 -->
|
||||
<!-- <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> -->
|
||||
<el-col :span="1.5">
|
||||
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
|
||||
v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
|
||||
@@ -66,8 +65,9 @@
|
||||
</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="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>
|
||||
@@ -81,21 +81,17 @@
|
||||
<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="耳号" prop="manageTags">
|
||||
<el-input v-model="form.manageTags" placeholder="请输入耳号" @blur="validateSheep" />
|
||||
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable collapse-tags allow-create
|
||||
style="width: 100%" @change="loadSheepInfo">
|
||||
<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="sheepfold">
|
||||
<el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
|
||||
<el-form-item label="羊舍" prop="sheepfolds">
|
||||
<el-select v-model="form.sheepfold" filterable style="width: 100%" @change="loadSheepBySheepfold">
|
||||
<el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="品种" prop="varietyId">
|
||||
<el-select v-model="form.varietyId" placeholder="请选择品种" clearable>
|
||||
<el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="comment">
|
||||
<el-input v-model="form.comment" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
<el-form-item label="技术员" prop="technician">
|
||||
<el-input v-model="form.technician" placeholder="请输入技术员" />
|
||||
</el-form-item>
|
||||
@@ -111,9 +107,8 @@
|
||||
</template>
|
||||
|
||||
<script setup name="FixHoof">
|
||||
import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof, checkSheepByManageTags, getVarietyOptions } from '@/api/produce/other/fixHoof/fixHoof'
|
||||
import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof, checkSheepByManageTags, getVarietyOptions, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof/fixHoof'
|
||||
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
|
||||
// import request from '@/utils/request'
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
|
||||
@@ -128,9 +123,14 @@ const total = ref(0)
|
||||
const title = ref('')
|
||||
const daterangeCreateTime = ref([])
|
||||
const varietyOptions = ref([])
|
||||
const sheepOptions = ref([])
|
||||
|
||||
const data = reactive({
|
||||
form: {},
|
||||
form: {
|
||||
sheepfold: null,
|
||||
manageTags: [],
|
||||
tagDetails: {}
|
||||
},
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
@@ -141,17 +141,11 @@ const data = reactive({
|
||||
createTime: null
|
||||
},
|
||||
rules: {
|
||||
// sheepId: [
|
||||
// { required: true, message: '耳号不能为空', trigger: 'blur' }
|
||||
// ],
|
||||
manageTags: [
|
||||
{ required: true, message: '耳号不能为空', trigger: 'blur' }
|
||||
],
|
||||
sheepfold: [
|
||||
{ required: true, message: '羊舍id不能为空', trigger: 'change' }
|
||||
],
|
||||
varietyId: [
|
||||
{ required: true, message: '品种不能为空', trigger: 'change' }
|
||||
{ required: true, message: '请选择羊舍', trigger: 'change' }
|
||||
],
|
||||
technician: [
|
||||
{ required: true, message: '技术员不能为空', trigger: 'blur' }
|
||||
@@ -161,12 +155,76 @@ const data = reactive({
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data)
|
||||
|
||||
/* 列表 */
|
||||
function loadSheepBySheepfold() {
|
||||
const currentSheepfoldId = form.value.sheepfold;
|
||||
|
||||
if (!currentSheepfoldId) {
|
||||
sheepOptions.value = [];
|
||||
return;
|
||||
}
|
||||
|
||||
// 加载选择的羊舍的耳号
|
||||
getSheepBySheepfoldId(currentSheepfoldId)
|
||||
.then(res => {
|
||||
const newSheepList = res.data || [];
|
||||
sheepOptions.value = newSheepList.map(sheep => ({
|
||||
id: sheep.id,
|
||||
manageTags: sheep.manageTags,
|
||||
sheepfoldId: currentSheepfoldId
|
||||
}));
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('加载新羊舍耳号失败', error);
|
||||
proxy.$modal.msgError('切换羊舍失败,请重试');
|
||||
sheepOptions.value = [];
|
||||
});
|
||||
}
|
||||
|
||||
async function loadSheepInfo() {
|
||||
const tags = form.value.manageTags;
|
||||
if (!tags || tags.length === 0) return;
|
||||
|
||||
const tagDetails = {}; // 存储每个耳号的信息
|
||||
const validResults = [];
|
||||
|
||||
for (const tag of tags) {
|
||||
try {
|
||||
const { data: sheepData } = await checkSheepByManageTags(tag.trim());
|
||||
if (!sheepData) {
|
||||
validResults.push(false);
|
||||
proxy.$modal.msgError(`耳号 ${tag} 不存在`);
|
||||
} else {
|
||||
validResults.push(true);
|
||||
// 存储当前耳号的备注、品种、羊舍等信息
|
||||
tagDetails[tag] = {
|
||||
comment: sheepData.comment || '', // 备注
|
||||
varietyId: sheepData.varietyId,
|
||||
sheepfoldId: sheepData.sheepfoldId,
|
||||
sheepId: sheepData.id
|
||||
};
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取耳号信息失败:', error);
|
||||
proxy.$modal.msgError(`耳号 ${tag} 验证失败`);
|
||||
validResults.push(false);
|
||||
}
|
||||
}
|
||||
|
||||
// 过滤不合法耳号
|
||||
if (validResults.includes(false)) {
|
||||
form.value.manageTags = tags.filter((_, index) => validResults[index]);
|
||||
proxy.$message.warning('部分耳号不合法,已过滤');
|
||||
}
|
||||
|
||||
// 保存所有耳号的信息
|
||||
form.value.tagDetails = tagDetails;
|
||||
}
|
||||
function getList() {
|
||||
loading.value = true
|
||||
const q = { ...queryParams.value }
|
||||
if (q.sheepId === '') q.sheepId = null
|
||||
if (q.sheepfold === '') q.sheepfold = null
|
||||
if (q.varietyId === '') q.varietyId = null
|
||||
q.params = {}
|
||||
if (daterangeCreateTime.value?.length) {
|
||||
q.params.beginCreateTime = daterangeCreateTime.value[0]
|
||||
@@ -177,7 +235,7 @@ function getList() {
|
||||
total.value = res.total
|
||||
loading.value = false
|
||||
})
|
||||
getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
|
||||
getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
|
||||
varietyOptions.value = res.rows || []
|
||||
})
|
||||
}
|
||||
@@ -190,14 +248,12 @@ function cancel() {
|
||||
function reset() {
|
||||
form.value = {
|
||||
id: null,
|
||||
sheepId: null,
|
||||
sheepfold: null,
|
||||
manageTags: [],
|
||||
varietyId: null,
|
||||
comment: null,
|
||||
technician: null,
|
||||
createBy: null,
|
||||
createTime: null
|
||||
varietyName: null
|
||||
}
|
||||
sheepOptions.value = [];
|
||||
proxy.resetForm('fixHoofRef')
|
||||
}
|
||||
|
||||
@@ -208,6 +264,7 @@ function handleQuery() {
|
||||
|
||||
function resetQuery() {
|
||||
daterangeCreateTime.value = []
|
||||
queryParams.value.varietyId = null
|
||||
proxy.resetForm('queryRef')
|
||||
handleQuery()
|
||||
}
|
||||
@@ -228,7 +285,9 @@ function handleUpdate(row) {
|
||||
reset()
|
||||
const _id = row.id || ids.value
|
||||
getFixHoof(_id).then(res => {
|
||||
form.value = res.data
|
||||
const fixHoofData = res.data;
|
||||
fixHoofData.manageTags = fixHoofData.manageTags ? [fixHoofData.manageTags] : [];
|
||||
form.value = fixHoofData;
|
||||
open.value = true
|
||||
title.value = '修改修蹄'
|
||||
})
|
||||
@@ -236,21 +295,39 @@ function handleUpdate(row) {
|
||||
|
||||
function submitForm() {
|
||||
proxy.$refs.fixHoofRef.validate(valid => {
|
||||
if (!valid) return
|
||||
if (form.value.id) {
|
||||
updateFixHoof(form.value).then(() => {
|
||||
proxy.$modal.msgSuccess('修改成功')
|
||||
open.value = false
|
||||
getList()
|
||||
})
|
||||
} else {
|
||||
addFixHoof(form.value).then(() => {
|
||||
proxy.$modal.msgSuccess('新增成功')
|
||||
open.value = false
|
||||
getList()
|
||||
})
|
||||
if (!valid) return;
|
||||
|
||||
const allTags = form.value.manageTags;
|
||||
const tagDetails = form.value.tagDetails || {};
|
||||
if (!allTags || allTags.length === 0) {
|
||||
proxy.$modal.msgError('请选择至少一个耳号');
|
||||
return;
|
||||
}
|
||||
})
|
||||
|
||||
// 构建ScFixHoof对象列表
|
||||
const fixHoofList = allTags.map(tag => {
|
||||
const details = tagDetails[tag] || {};
|
||||
return {
|
||||
...form.value,
|
||||
manageTags: tag,
|
||||
comment: details.comment || '',
|
||||
sheepId: details.sheepId,
|
||||
varietyId: details.varietyId,
|
||||
sheepfold: details.sheepfoldId || form.value.sheepfold
|
||||
};
|
||||
});
|
||||
|
||||
// 一次性提交所有修蹄记录
|
||||
addFixHoof(fixHoofList)
|
||||
.then(() => {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
open.value = false;
|
||||
getList();
|
||||
})
|
||||
.catch(error => {
|
||||
proxy.$modal.msgError(`处理失败:${error.message}`);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function handleDelete(row) {
|
||||
@@ -267,7 +344,6 @@ function handleExport() {
|
||||
proxy.download('/produce/other/fixHoof/export', { ...queryParams.value }, `fixHoof_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
|
||||
/* 羊舍 */
|
||||
const sheepfoldOptions = ref([])
|
||||
function getSheepfoldOptions() {
|
||||
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
|
||||
@@ -275,30 +351,6 @@ function getSheepfoldOptions() {
|
||||
})
|
||||
}
|
||||
|
||||
//校验羊只是否存在 失焦时校验
|
||||
async function validateSheep() {
|
||||
if (!form.value.manageTags) return;
|
||||
try {
|
||||
const { data } = await checkSheepByManageTags(form.value.manageTags.trim())
|
||||
if (!data) {
|
||||
proxy.$modal.msgError('该管理耳号不存在');
|
||||
// 清空
|
||||
form.value.manageTags = null;
|
||||
form.value.sheepId = null;
|
||||
form.value.sheepfold = null;
|
||||
form.value.varietyId = null;
|
||||
} else {
|
||||
// 隐藏字段:真正保存用
|
||||
form.value.sheepId = data.id;
|
||||
// 自动带出下拉框
|
||||
form.value.sheepfold = data.sheepfoldId;
|
||||
form.value.varietyId = data.varietyId;
|
||||
}
|
||||
} catch {
|
||||
proxy.$modal.msgError('校验失败');
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
getSheepfoldOptions()
|
||||
getVarietyOptions()
|
||||
|
||||
Reference in New Issue
Block a user