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

This commit is contained in:
zyh
2025-07-17 10:02:56 +08:00
parent 369ed7a052
commit 71076e0df0
6 changed files with 465 additions and 403 deletions

View File

@@ -14,6 +14,11 @@
<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" />
</el-select>
</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" />
@@ -55,17 +60,10 @@
<el-table-column label="羊只id" align="center" prop="sheepId" />
<el-table-column label="转出羊舍" align="center" prop="foldFromName" />
<el-table-column label="转入羊舍" align="center" prop="foldToName" />
<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="varietyName" />
<el-table-column label="转群原因" align="center" prop="reasonText" />
<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="statusText" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime">
@@ -106,9 +104,15 @@
<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="Number(item.id)" />
</el-select>
</el-form-item>
<el-form-item label="转群原因" prop="reason">
<el-select v-model="form.reason" placeholder="请选择转群原因" clearable>
<el-option v-for="dict in trans_group_reason" :key="dict.value" :label="dict.label" :value="dict.value" />
<el-option v-for="dict in trans_group_reason" :key="dict.value" :label="dict.label"
:value="Number(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="技术员" prop="technician">
@@ -139,11 +143,14 @@
<el-form-item label="转入羊舍">
<el-input :value="sheepfoldNameMap[approveForm.foldTo] || approveForm.foldTo" disabled />
</el-form-item>
<el-form-item label="品种">
<el-input :value="approveForm.varietyName" disabled />
</el-form-item>
<el-form-item label="转群原因">
<el-select v-model="approveForm.reason" disabled>
<el-option :label="trans_group_reason.find(d => d.value == approveForm.reason)?.label || ''"
:value="approveForm.reason" />
</el-select>
<el-input :value="approveForm.reasonText" disabled />
</el-form-item>
<el-form-item label="状态">
<el-input :value="approveForm.statusText" disabled />
</el-form-item>
<el-form-item label="技术员">
<el-input v-model="approveForm.technician" disabled />
@@ -162,13 +169,20 @@
</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"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management';
import {
listTrans_group,
getTrans_group,
delTrans_group,
addTrans_group,
updateTrans_group
} from '@/api/produce/manage_sheep/trans_group/trans_group'
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import request from '@/utils/request'
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)
@@ -177,9 +191,17 @@ const ids = ref([])
const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const title = ref('')
const daterangeCreateTime = ref([])
const approveDialog = ref(false)
const approveForm = ref({})
const sheepfoldOptions = ref([])
const sheepfoldNameMap = ref({})
const varietyOptions = ref([])
/* -------------------- 表单 & 查询 -------------------- */
const data = reactive({
form: {},
queryParams: {
@@ -188,61 +210,43 @@ const data = reactive({
sheepId: null,
foldTo: null,
foldFrom: null,
varietyId: 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" }
],
sheepId: [{ required: true, message: '羊只id不能为空', trigger: 'blur' }],
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)
/** 查询转群记录列表 */
/* -------------------- 业务函数 -------------------- */
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]
if (daterangeCreateTime.value?.length) {
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
listTrans_group(queryParams.value).then(res => {
trans_groupList.value = res.rows
total.value = res.total
loading.value = false
})
}
// 取消按钮
function cancel() {
open.value = false
reset()
}
// 表单重置
function reset() {
form.value = {
id: null,
sheepId: null,
foldTo: null,
foldFrom: null,
foldTo: null,
varietyId: null, // 新增
reason: null,
technician: null,
status: null,
@@ -250,160 +254,130 @@ function reset() {
createBy: null,
createTime: null
}
proxy.resetForm("trans_groupRef")
proxy.resetForm('trans_groupRef')
}
function cancel() {
open.value = false
reset()
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1
getList()
}
/** 重置按钮操作 */
function resetQuery() {
daterangeCreateTime.value = []
proxy.resetForm("queryRef")
proxy.resetForm('queryRef')
handleQuery()
}
// 多选框选中数据
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id)
single.value = selection.length != 1
single.value = selection.length !== 1
multiple.value = !selection.length
}
/** 新增按钮操作 */
function handleAdd() {
reset()
open.value = true
title.value = "添加转群记录"
title.value = '添加转群记录'
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
const _id = row.id || ids.value
getTrans_group(_id).then(response => {
const data = response.data
data.foldFrom = Number(data.foldFrom)
data.foldTo = Number(data.foldTo)
data.reason = String(data.reason)
form.value = data
getTrans_group(_id).then(res => {
const d = res.data
// 统一转成 Number避免 undefined
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)
form.value = d
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()
})
}
}
proxy.$refs.trans_groupRef.validate(valid => {
if (!valid) return
const api = form.value.id ? updateTrans_group : addTrans_group
api(form.value).then(() => {
proxy.$modal.msgSuccess(form.value.id ? '修改成功' : '新增成功')
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(() => { })
proxy.$modal.confirm(`是否确认删除转群记录编号为${_ids}”的数据项?`)
.then(() => delTrans_group(_ids))
.then(() => {
getList()
proxy.$modal.msgSuccess('删除成功')
})
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('/produce/manage_sheep/trans_group/export', {
...queryParams.value
}, `trans_group_${new Date().getTime()}.xlsx`);
proxy.download(
'/produce/manage_sheep/trans_group/export',
{ ...queryParams.value },
`trans_group_${Date.now()}.xlsx`
)
}
// 审批记录的对话框
const approveDialog = ref(false);
const approveForm = ref({});
// 审批按钮操作
/* -------------------- 审批 -------------------- */
function handleApprove(row) {
approveForm.value = { ...row };
approveDialog.value = true;
approveForm.value = { ...row }
approveDialog.value = true
}
// 同意审批
function handleApproveAgree() {
approveForm.value.status = 1; // 状态设置为同意
approveForm.value.status = 1
updateTrans_group(approveForm.value).then(() => {
approveDialog.value = false;
proxy.$modal.msgSuccess("审批成功,状态已更新为同意");
getList();
}).catch((error) => {
proxy.$modal.msgError(`审批失败:${error}`);
});
approveDialog.value = false
proxy.$modal.msgSuccess('审批成功,状态已更新为同意')
getList()
})
}
// 驳回审批
function handleApproveReject() {
approveForm.value.status = 2; // 状态设置为驳回
approveForm.value.status = 2
updateTrans_group(approveForm.value).then(() => {
approveDialog.value = false;
proxy.$modal.msgSuccess("审批成功,状态已更新为驳回");
getList();
}).catch((error) => {
proxy.$modal.msgError(`审批失败:${error}`);
});
approveDialog.value = false
proxy.$modal.msgSuccess('审批成功,状态已更新为驳回')
getList()
})
}
//加载所有羊舍
const sheepfoldOptions = ref([]);
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows; // [{id, sheepfoldName}, ...]
});
}
onMounted(() => {
getSheepfoldOptions();
});
const sheepfoldNameMap = ref({})
function loadSheepfoldMap() {
/* -------------------- 下拉数据 -------------------- */
function loadSheepfold() {
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
}, {})
})
}
onMounted(() => {
nextTick(() => {
if (trans_group_reason.value && trans_group_reason.value.length) {
trans_group_reason.value.forEach(item => {
item.value = Number(item.value)
})
}
loadSheepfoldMap()
function getVarietyOptions() {
request({
url: '/base/variety/list',
method: 'get',
params: { pageNum: 1, pageSize: 9999 }
}).then(res => {
varietyOptions.value = res.rows || []
})
}
/* -------------------- 初始化 -------------------- */
onMounted(() => {
loadSheepfold()
getVarietyOptions()
getList()
})
getList()
</script>
</script>