This commit is contained in:
piaobo 2025-07-18 18:16:15 +08:00
commit 2ff57d9798
18 changed files with 2499 additions and 283 deletions

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询孕检记录列表
export function listPregnancy_Test(query) {
return request({
url: '/Pregnancy_Test/Pregnancy_Test/list',
method: 'get',
params: query
})
}
// 查询孕检记录详细
export function getPregnancy_Test(id) {
return request({
url: '/Pregnancy_Test/Pregnancy_Test/' + id,
method: 'get'
})
}
// 新增孕检记录
export function addPregnancy_Test(data) {
return request({
url: '/Pregnancy_Test/Pregnancy_Test',
method: 'post',
data: data
})
}
// 修改孕检记录
export function updatePregnancy_Test(data) {
return request({
url: '/Pregnancy_Test/Pregnancy_Test',
method: 'put',
data: data
})
}
// 删除孕检记录
export function delPregnancy_Test(id) {
return request({
url: '/Pregnancy_Test/Pregnancy_Test/' + id,
method: 'delete'
})
}

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询酸奶生产,成品检疫记录列表
export function listYogurtTest(query) {
return request({
url: '/yogurtTest/yogurtTest/list',
method: 'get',
params: query
})
}
// 查询酸奶生产,成品检疫记录详细
export function getYogurtTest(id) {
return request({
url: '/yogurtTest/yogurtTest/' + id,
method: 'get'
})
}
// 新增酸奶生产,成品检疫记录
export function addYogurtTest(data) {
return request({
url: '/yogurtTest/yogurtTest',
method: 'post',
data: data
})
}
// 修改酸奶生产,成品检疫记录
export function updateYogurtTest(data) {
return request({
url: '/yogurtTest/yogurtTest',
method: 'put',
data: data
})
}
// 删除酸奶生产,成品检疫记录
export function delYogurtTest(id) {
return request({
url: '/yogurtTest/yogurtTest/' + id,
method: 'delete'
})
}

View File

@ -0,0 +1,52 @@
import request from '@/utils/request'
// 查询干奶记录列表
export function listDrymilk(query) {
return request({
url: '/drymilk/drymilk/list',
method: 'get',
params: query
})
}
// 查询干奶记录详细
export function getDrymilk(id) {
return request({
url: '/drymilk/drymilk/' + id,
method: 'get'
})
}
// 根据耳号查询羊只ID
export function getSheepIdByManageTags(manageTags) {
return request({
url: '/drymilk/drymilk/sheep/' + manageTags,
method: 'get'
})
}
// 新增干奶记录
export function addDrymilk(data) {
return request({
url: '/drymilk/drymilk',
method: 'post',
data: data
})
}
// 修改干奶记录
export function updateDrymilk(data) {
return request({
url: '/drymilk/drymilk',
method: 'put',
data: data
})
}
// 删除干奶记录
export function delDrymilk(id) {
return request({
url: '/drymilk/drymilk/' + id,
method: 'delete'
})
}

View File

@ -9,6 +9,16 @@ export function listSheep_grouping(query) {
})
}
// 查询羊只分组关联列表(联表)
export function listSheep_grouping_join(query) {
return request({
url: '/sheep_grouping/sheep_grouping/listJoin',
method: 'get',
params: query
})
}
// 查询羊只分组关联详细
export function getSheep_grouping(id) {
return request({

View File

@ -0,0 +1,85 @@
import request from '@/utils/request'
// 查询配种计划生成列表
export function listBreedPlanGenerate(query) {
return request({
url: '/mating_plan/generate/list',
method: 'get',
params: query
})
}
// 查询配种计划生成详细
export function getBreedPlanGenerate(id) {
return request({
url: '/mating_plan/generate/' + id,
method: 'get'
})
}
// 筛选符合条件的母羊
export function selectEligibleEwe() {
return request({
url: '/mating_plan/generate/selectEwe',
method: 'get'
})
}
// 筛选符合条件的公羊
export function selectEligibleRam() {
return request({
url: '/mating_plan/generate/selectRam',
method: 'get'
})
}
// 自动生成配种计划
export function autoGenerateBreedPlan(data) {
return request({
url: '/mating_plan/generate/auto',
method: 'post',
data: data
})
}
// 新增配种计划生成
export function addBreedPlanGenerate(data) {
return request({
url: '/mating_plan/generate',
method: 'post',
data: data
})
}
// 修改配种计划生成
export function updateBreedPlanGenerate(data) {
return request({
url: '/mating_plan/generate',
method: 'put',
data: data
})
}
// 审批配种计划
export function approveBreedPlan(id) {
return request({
url: '/mating_plan/generate/approve/' + id,
method: 'put'
})
}
// 查看配种计划详情
export function viewBreedPlan(id) {
return request({
url: '/mating_plan/generate/view/' + id,
method: 'get'
})
}
// 删除配种计划生成
export function delBreedPlanGenerate(id) {
return request({
url: '/mating_plan/generate/' + id,
method: 'delete'
})
}

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询配种计划列表
export function listMating_plan(query) {
return request({
url: '/mating_plan/mating_plan/list',
method: 'get',
params: query
})
}
// 查询配种计划详细
export function getMating_plan(id) {
return request({
url: '/mating_plan/mating_plan/' + id,
method: 'get'
})
}
// 新增配种计划
export function addMating_plan(data) {
return request({
url: '/mating_plan/mating_plan',
method: 'post',
data: data
})
}
// 修改配种计划
export function updateMating_plan(data) {
return request({
url: '/mating_plan/mating_plan',
method: 'put',
data: data
})
}
// 删除配种计划
export function delMating_plan(id) {
return request({
url: '/mating_plan/mating_plan/' + id,
method: 'delete'
})
}

View File

@ -48,3 +48,23 @@ export function exportFixHoof(query) {
responseType: 'blob' // 导出功能需要设置响应类型为blob
})
}
// 按管理耳号查羊只
export function checkSheepByManageTags(manageTags) {
return request({
url: '/sheep/sheep/byManageTags/' + encodeURIComponent(manageTags),
method: 'get'
})
}
//获取品种
export function getVarietyOptions(query){
return request({
url:'/base/variety/list',
method:'get',
params:query
})
}

View File

@ -0,0 +1,294 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<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>
<el-form-item label="孕检结果" prop="result">
<el-input
v-model="queryParams.result"
placeholder="请输入孕检结果"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="${comment}" prop="number">
<el-input
v-model="queryParams.number"
placeholder="请输入${comment}"
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="${comment}" prop="way">
<el-input
v-model="queryParams.way"
placeholder="请输入${comment}"
clearable
@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>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['Pregnancy_Test:Pregnancy_Test:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['Pregnancy_Test:Pregnancy_Test:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['Pregnancy_Test:Pregnancy_Test:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['Pregnancy_Test:Pregnancy_Test:export']"
>导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="Pregnancy_TestList" @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="孕检日期" align="center" prop="datetime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="孕检结果" align="center" prop="result" />
<el-table-column label="${comment}" align="center" prop="number" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="${comment}" align="center" prop="way" />
<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="['Pregnancy_Test:Pregnancy_Test:edit']">修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['Pregnancy_Test:Pregnancy_Test:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改孕检记录对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="Pregnancy_TestRef" :model="form" :rules="rules" label-width="80px">
<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-form-item>
<el-form-item label="孕检结果" prop="result">
<el-input v-model="form.result" placeholder="请输入孕检结果" />
</el-form-item>
<el-form-item label="${comment}" prop="number">
<el-input v-model="form.number" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" />
</el-form-item>
<el-form-item label="${comment}" prop="way">
<el-input v-model="form.way" placeholder="请输入${comment}" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="Pregnancy_Test">
import { listPregnancy_Test, getPregnancy_Test, delPregnancy_Test, addPregnancy_Test, updatePregnancy_Test } from "@/api/Pregnancy_Test/Pregnancy_Test"
const { proxy } = getCurrentInstance()
const Pregnancy_TestList = ref([])
const open = ref(false)
const loading = ref(true)
const showSearch = ref(true)
const ids = ref([])
const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
datetime: null,
result: null,
number: null,
technician: null,
way: null,
},
rules: {
}
})
const { queryParams, form, rules } = toRefs(data)
/** 查询孕检记录列表 */
function getList() {
loading.value = true
listPregnancy_Test(queryParams.value).then(response => {
Pregnancy_TestList.value = response.rows
total.value = response.total
loading.value = false
})
}
//
function cancel() {
open.value = false
reset()
}
//
function reset() {
form.value = {
id: null,
datetime: null,
result: null,
number: null,
technician: null,
way: null,
createBy: null,
createTime: null
}
proxy.resetForm("Pregnancy_TestRef")
}
/** 搜索按钮操作 */
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()
open.value = true
title.value = "添加孕检记录"
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
const _id = row.id || ids.value
getPregnancy_Test(_id).then(response => {
form.value = response.data
open.value = true
title.value = "修改孕检记录"
})
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["Pregnancy_TestRef"].validate(valid => {
if (valid) {
if (form.value.id != null) {
updatePregnancy_Test(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
getList()
})
} else {
addPregnancy_Test(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功")
open.value = false
getList()
})
}
}
})
}
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除孕检记录编号为"' + _ids + '"的数据项?').then(function() {
return delPregnancy_Test(_ids)
}).then(() => {
getList()
proxy.$modal.msgSuccess("删除成功")
}).catch(() => {})
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('Pregnancy_Test/Pregnancy_Test/export', {
...queryParams.value
}, `Pregnancy_Test_${new Date().getTime()}.xlsx`)
}
getList()
</script>

View File

@ -0,0 +1,575 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="来源" prop="source">
<el-input
v-model="queryParams.source"
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>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['yogurtTest:yogurtTest:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['yogurtTest:yogurtTest:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['yogurtTest:yogurtTest:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['yogurtTest:yogurtTest:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="Operation"
@click="columnShowDialogVisible = true"
>列显示</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="yogurtTestList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column
label="来源"
align="center"
prop="source"
v-if="selectedColumns.includes('source')" />
<el-table-column
label="检测日期"
align="center"
prop="datetime"
width="180"
v-if="selectedColumns.includes('datetime')">
<template #default="scope">
<span>{{ formatDate(scope.row.datetime) }}</span>
</template>
</el-table-column>
<el-table-column
label="脂肪g/100g"
align="center"
prop="fat"
v-if="selectedColumns.includes('fat')" />
<el-table-column
label="蛋白质g/100g"
align="center"
prop="protein"
v-if="selectedColumns.includes('protein')" />
<el-table-column
label="非脂g/100g"
align="center"
prop="nonFat"
v-if="selectedColumns.includes('nonFat')" />
<el-table-column
label="酸度oT"
align="center"
prop="acidity"
v-if="selectedColumns.includes('acidity')" />
<el-table-column
label="菌落总数1"
align="center"
prop="bacterialColony1"
v-if="selectedColumns.includes('bacterialColony1')" />
<el-table-column
label="菌落总数2"
align="center"
prop="bacterialClony2"
v-if="selectedColumns.includes('bacterialClony2')" />
<el-table-column
label="菌落总数3"
align="center"
prop="bacterialClony3"
v-if="selectedColumns.includes('bacterialClony3')" />
<el-table-column
label="菌落总数4"
align="center"
prop="bacterialClony4"
v-if="selectedColumns.includes('bacterialClony4')" />
<el-table-column
label="菌落总数5"
align="center"
prop="bacterialClony5"
v-if="selectedColumns.includes('bacterialClony5')" />
<el-table-column
label="酵母菌(CFU/g)"
align="center"
prop="yeast"
v-if="selectedColumns.includes('yeast')" />
<el-table-column
label="霉菌(CFU/g)"
align="center"
prop="mould"
v-if="selectedColumns.includes('mould')" />
<el-table-column
label="乳酸菌(CFU/g)"
align="center"
prop="lacto"
v-if="selectedColumns.includes('lacto')" />
<el-table-column
label="备注"
align="center"
prop="comment"
v-if="selectedColumns.includes('comment')" />
<el-table-column
label="创建人"
align="center"
prop="createBy"
v-if="selectedColumns.includes('createBy')" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180"
v-if="selectedColumns.includes('createTime')">
<template #default="scope">
<span>{{ formatDateTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['yogurtTest:yogurtTest:edit']">修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['yogurtTest:yogurtTest:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="yogurtTestRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="来源" prop="source">
<el-input v-model="form.source" placeholder="请输入来源" />
</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="请选择检测日期"
style="width: 100%">
</el-date-picker>
</el-form-item>
<el-form-item label="脂肪g/100g" prop="fat">
<el-input v-model="form.fat" placeholder="请输入脂肪g/100g" />
</el-form-item>
<el-form-item label="蛋白质g/100g" prop="protein">
<el-input v-model="form.protein" placeholder="请输入蛋白质g/100g" />
</el-form-item>
<el-form-item label="非脂g/100g" prop="nonFat">
<el-input v-model="form.nonFat" placeholder="请输入非脂g/100g" />
</el-form-item>
<el-form-item label="酸度oT" prop="acidity">
<el-input v-model="form.acidity" placeholder="请输入酸度oT" />
</el-form-item>
<el-form-item label="菌落总数1" prop="bacterialColony1">
<el-input v-model="form.bacterialColony1" placeholder="请输入菌落总数1" />
</el-form-item>
<el-form-item label="菌落总数2" prop="bacterialClony2">
<el-input v-model="form.bacterialClony2" placeholder="请输入菌落总数2" />
</el-form-item>
<el-form-item label="菌落总数3" prop="bacterialClony3">
<el-input v-model="form.bacterialClony3" placeholder="请输入菌落总数3" />
</el-form-item>
<el-form-item label="菌落总数4" prop="bacterialClony4">
<el-input v-model="form.bacterialClony4" placeholder="请输入菌落总数4" />
</el-form-item>
<el-form-item label="菌落总数5" prop="bacterialClony5">
<el-input v-model="form.bacterialClony5" placeholder="请输入菌落总数5" />
</el-form-item>
<el-form-item label="酵母菌(CFU/g)" prop="yeast">
<el-input v-model="form.yeast" placeholder="请输入酵母菌(CFU/g)" />
</el-form-item>
<el-form-item label="霉菌(CFU/g)" prop="mould">
<el-input v-model="form.mould" placeholder="请输入霉菌(CFU/g)" />
</el-form-item>
<el-form-item label="乳酸菌(CFU/g)" prop="lacto">
<el-input v-model="form.lacto" placeholder="请输入乳酸菌(CFU/g)" />
</el-form-item>
<el-form-item label="备注" prop="comment">
<el-input v-model="form.comment" placeholder="请输入备注" type="textarea" />
</el-form-item>
<el-form-item label="创建人" v-if="form.id">
<el-input v-model="form.createBy" disabled />
</el-form-item>
<el-form-item label="创建时间" v-if="form.id">
<el-input v-model="form.createTime" disabled />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
<el-dialog title="列显示设置" v-model="columnShowDialogVisible" width="500px">
<el-checkbox-group v-model="selectedColumns">
<el-checkbox label="source">来源</el-checkbox>
<el-checkbox label="datetime">检测日期</el-checkbox>
<el-checkbox label="fat">脂肪g/100g</el-checkbox>
<el-checkbox label="protein">蛋白质g/100g</el-checkbox>
<el-checkbox label="nonFat">非脂g/100g</el-checkbox>
<el-checkbox label="acidity">酸度oT</el-checkbox>
<el-checkbox label="bacterialColony1">菌落总数1</el-checkbox>
<el-checkbox label="bacterialClony2">菌落总数2</el-checkbox>
<el-checkbox label="bacterialClony3">菌落总数3</el-checkbox>
<el-checkbox label="bacterialClony4">菌落总数4</el-checkbox>
<el-checkbox label="bacterialClony5">菌落总数5</el-checkbox>
<el-checkbox label="yeast">酵母菌(CFU/g)</el-checkbox>
<el-checkbox label="mould">霉菌(CFU/g)</el-checkbox>
<el-checkbox label="lacto">乳酸菌(CFU/g)</el-checkbox>
<el-checkbox label="comment">备注</el-checkbox>
<el-checkbox label="createBy">创建人</el-checkbox>
<el-checkbox label="createTime">创建时间</el-checkbox>
</el-checkbox-group>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="columnShowDialogVisible = false"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup>
import { ref, reactive, onMounted } from 'vue';
import { listYogurtTest, getYogurtTest, delYogurtTest, addYogurtTest, updateYogurtTest } from "@/api/dairyProducts/yogurtTest/yogurtTest.js";
import { ElMessage, ElMessageBox } from 'element-plus';
//
const yogurtTestList = ref([]);
const open = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const columnShowDialogVisible = ref(false);
const yogurtTestRef = ref(null);
//
const selectedColumns = ref([
'source', 'datetime', 'fat', 'protein', 'nonFat', 'acidity',
'bacterialColony1', 'bacterialClony2', 'bacterialClony3',
'bacterialClony4', 'bacterialClony5', 'yeast', 'mould',
'lacto', 'comment', 'createBy', 'createTime'
]);
//
const queryParams = reactive({
pageNum: 1,
pageSize: 10,
source: null,
datetime: null,
});
//
const form = reactive({
id: null,
source: null,
datetime: null,
fat: null,
protein: null,
nonFat: null,
acidity: null,
bacterialColony1: null,
bacterialClony2: null,
bacterialClony3: null,
bacterialClony4: null,
bacterialClony5: null,
yeast: null,
mould: null,
lacto: null,
comment: null,
createBy: null,
createTime: null
});
//
const rules = reactive({
source: [
{ required: true, message: "来源不能为空", trigger: "blur" }
],
datetime: [
{ required: true, message: "检测日期不能为空", trigger: "blur" }
]
});
/** 获取当前用户名 */
const getCurrentUsername = () => {
const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
return userInfo.userName || userInfo.username || userInfo.nickName || 'admin'
}
/** 查询列表 */
function getList() {
loading.value = true;
listYogurtTest(queryParams).then(response => {
yogurtTestList.value = response.rows || [];
total.value = response.total || 0;
loading.value = false;
}).catch(error => {
console.error("获取数据失败:", error);
loading.value = false;
ElMessage.error("获取数据失败");
});
}
//
function formatDate(dateString) {
if (!dateString) return '';
try {
const date = new Date(dateString);
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
return `${year}-${month}-${day}`;
} catch (e) {
console.error("日期格式化错误:", e);
return dateString;
}
}
//
function formatDateTime(dateString) {
if (!dateString) return '';
try {
const date = new Date(dateString);
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
const hours = String(date.getHours()).padStart(2, '0');
const minutes = String(date.getMinutes()).padStart(2, '0');
const seconds = String(date.getSeconds()).padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
} catch (e) {
console.error("日期时间格式化错误:", e);
return dateString;
}
}
//
function cancel() {
open.value = false;
resetForm();
}
//
function resetForm() {
Object.assign(form, {
id: null,
source: null,
datetime: null,
fat: null,
protein: null,
nonFat: null,
acidity: null,
bacterialColony1: null,
bacterialClony2: null,
bacterialClony3: null,
bacterialClony4: null,
bacterialClony5: null,
yeast: null,
mould: null,
lacto: null,
comment: null,
createBy: null,
createTime: null
});
if (yogurtTestRef.value) {
yogurtTestRef.value.resetFields();
}
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.pageNum = 1;
getList();
}
/** 重置按钮操作 */
function resetQuery() {
Object.assign(queryParams, {
source: null,
datetime: null,
});
handleQuery();
}
//
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id);
single.value = selection.length !== 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
function handleAdd() {
resetForm();
open.value = true;
title.value = "添加酸奶检疫记录";
//
form.createBy = getCurrentUsername();
form.createTime = new Date().toISOString().replace('T', ' ').substring(0, 19);
}
/** 修改按钮操作 */
function handleUpdate(row) {
resetForm();
const id = row.id || (ids.value.length ? ids.value[0] : null);
if (!id) {
ElMessage.error("请选择要修改的数据");
return;
}
getYogurtTest(id).then(response => {
Object.assign(form, response.data);
open.value = true;
title.value = "修改酸奶检疫记录";
}).catch(error => {
console.error("获取详情失败:", error);
ElMessage.error("获取详情失败");
});
}
/** 提交按钮 */
function submitForm() {
yogurtTestRef.value.validate(valid => {
if (valid) {
//
const submitData = { ...form };
if (!submitData.id) {
submitData.createBy = getCurrentUsername();
submitData.createTime = new Date().toISOString().replace('T', ' ').substring(0, 19);
} else {
delete submitData.createBy;
delete submitData.createTime;
}
const request = submitData.id
? updateYogurtTest(submitData)
: addYogurtTest(submitData);
request.then(response => {
ElMessage.success(submitData.id ? "修改成功" : "新增成功");
open.value = false;
getList();
}).catch(error => {
console.error("操作失败:", error);
ElMessage.error("操作失败");
});
}
});
}
/** 删除按钮操作 */
function handleDelete(row) {
const deleteIds = row.id ? [row.id] : ids.value;
if (!deleteIds.length) {
ElMessage.error("请选择要删除的数据");
return;
}
ElMessageBox.confirm('是否确认删除选中的记录?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
return delYogurtTest(deleteIds);
}).then(() => {
getList();
ElMessage.success("删除成功");
}).catch(error => {
console.error("删除失败:", error);
if (error !== 'cancel') {
ElMessage.error("删除失败");
}
});
}
/** 导出按钮操作 */
function handleExport() {
const params = new URLSearchParams();
for (const key in queryParams) {
if (queryParams[key] !== null && queryParams[key] !== undefined) {
params.append(key, queryParams[key]);
}
}
const url = `/yogurtTest/yogurtTest/export?${params.toString()}`;
window.location.href = url;
}
//
onMounted(() => {
getList();
});
</script>
<style scoped>
.app-container {
padding: 20px;
}
.el-form-item {
margin-bottom: 15px;
}
.el-dialog__body {
padding: 15px 20px;
}
</style>

View File

@ -0,0 +1,330 @@
<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"
/>
</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>
<el-form-item label="技术员" prop="tecahnician">
<el-input
v-model="queryParams.tecahnician"
placeholder="请输入技术员"
clearable
@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>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['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-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-col>
<el-col :span="1.5">
<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="manageTags" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="事件类型" align="center" prop="eventType" />
<el-table-column label="干奶日期" align="center" prop="datetime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="是否使用乳头封闭剂" align="center" prop="status">
<template #default="scope">
<span>{{ scope.row.status === 1 ? '是' : '否' }}</span>
</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" 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>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['drymilk:drymilk:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改干奶记录对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="drymilkRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="耳号" prop="manageTags">
<el-input v-model="form.manageTags" placeholder="请输入耳号" />
</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-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>
<el-form-item label="技术员" prop="tecahnician">
<el-input v-model="form.tecahnician" placeholder="请输入技术员" />
</el-form-item>
<el-form-item label="备注" prop="comment">
<el-input v-model="form.comment" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="Drymilk">
import { listDrymilk, getDrymilk, delDrymilk, addDrymilk, updateDrymilk } from "@/api/drymilk/drymilk"
const { proxy } = getCurrentInstance()
const drymilkList = ref([])
const open = ref(false)
const loading = ref(true)
const showSearch = ref(true)
const ids = ref([])
const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
manageTags: null,
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" }
]
}
})
const { queryParams, form, rules } = toRefs(data)
/** 查询干奶记录列表 */
function getList() {
loading.value = true
listDrymilk(queryParams.value).then(response => {
drymilkList.value = response.rows
total.value = response.total
loading.value = false
})
}
//
function cancel() {
open.value = false
reset()
}
//
function reset() {
form.value = {
id: null,
manageTags: null,
datetime: null,
status: null,
sheepfold: null,
tecahnician: null,
comment: null
}
proxy.resetForm("drymilkRef")
}
/** 搜索按钮操作 */
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()
open.value = true
title.value = "添加干奶记录"
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
const _id = row.id || ids.value
getDrymilk(_id).then(response => {
form.value = response.data
open.value = true
title.value = "修改干奶记录"
})
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["drymilkRef"].validate(valid => {
if (valid) {
if (form.value.id != null) {
updateDrymilk(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
getList()
})
} else {
addDrymilk(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功")
open.value = false
getList()
})
}
}
})
}
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除干奶记录编号为"' + _ids + '"的数据项?').then(function() {
return delDrymilk(_ids)
}).then(() => {
getList()
proxy.$modal.msgSuccess("删除成功")
}).catch(() => {})
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('drymilk/drymilk/export', {
...queryParams.value
}, `drymilk_${new Date().getTime()}.xlsx`)
}
getList()
</script>

View File

@ -318,6 +318,9 @@
<template #header>
<span style="font-weight: bold; color: #333;">羊只状态</span>
</template>
<template #default="scope">
<dict-tag :options="sheep_status" :value="scope.row.statusId"/>
</template>
</el-table-column>
<el-table-column
v-if="columns['weaningWeight'].visible"
@ -561,6 +564,9 @@
<template #header>
<span style="font-weight: bold; color: #333;">配种类型</span>
</template>
<template #default="scope">
<dict-tag :options="breed_type" :value="scope.row.matingTypeId"/>
</template>
</el-table-column>
<el-table-column
v-if="columns['pregDate'].visible"
@ -745,6 +751,9 @@
<template #header>
<span style="font-weight: bold; color: #333;">是否性控</span>
</template>
<template #default="scope">
<dict-tag :options="controlled" :value="scope.row.controlled"/>
</template>
</el-table-column>
<el-table-column
v-if="columns['body'].visible"
@ -781,6 +790,9 @@
<template #header>
<span style="font-weight: bold; color: #333;">入群来源</span>
</template>
<template #default="scope">
<dict-tag :options="source" :value="scope.row.source"/>
</template>
</el-table-column>
<el-table-column
v-if="columns['sourceDate'].visible"
@ -987,6 +999,10 @@ import { listSheep_file, getSheep_file } from "@/api/fileManagement/sheep_file"
const { proxy } = getCurrentInstance()
const { sheep_gender } = proxy.useDict('sheep_gender')
const { breed_type } = proxy.useDict('breed_type')
const { controlled } = proxy.useDict('controlled')
const { source } = proxy.useDict('source')
const { sheep_status } = proxy.useDict('sheep_status')
const sheep_fileList = ref([])
const open = ref(false)
const loading = ref(true)

View File

@ -9,6 +9,14 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="耳号" prop="bsManageTags">
<el-input
v-model="queryParams.bsManageTags"
placeholder="请输入耳号"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="分组" prop="groupId">
<el-select
v-model="queryParams.groupId"
@ -73,15 +81,33 @@
</el-row>
<el-table v-loading="loading" :data="sheep_groupingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键ID" align="center" prop="id" />
<el-table-column label="羊只ID" align="center" prop="sheepId" />
<el-table-column label="分组ID" align="center" prop="groupId" />
<el-table-column label="分组名称" align="center" prop="groupName">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="主键ID" align="center" prop="id" sortable/>
<el-table-column label="羊只ID" align="center" prop="sheep_id" sortable/>
<el-table-column label="分组ID" align="center" prop="group_id" sortable/>
<el-table-column label="分组名称" align="center" prop="groupName" sortable>
<template #default="scope">
{{ getGroupName(scope.row.groupId) }}
{{ getGroupName(scope.row.group_id) }}
</template>
</el-table-column>
</el-table-column>
<el-table-column label="耳号" align="center" prop="bs_manage_tags" sortable/>
<el-table-column label="品种" align="center" prop="variety" sortable/>
<el-table-column label="性别" align="center" prop="gender" sortable>
<template #default="scope">
<dict-tag :options="sheep_gender" :value="scope.row.gender"/>
</template>
</el-table-column>
<el-table-column label="羊只类型" align="center" prop="name" sortable/>
<el-table-column label="出生日期" align="center" prop="birthday" sortable/>
<el-table-column label="胎次" align="center" prop="parity" sortable/>
<el-table-column label="月龄" align="center" prop="month_age" sortable/>
<el-table-column label="繁殖状态" align="center" prop="breed" sortable/>
<el-table-column label="出生体重" align="center" prop="birth_weight" sortable/>
<el-table-column label="断奶体重" align="center" prop="weaning_weight" sortable/>
<el-table-column label="当前体重" align="center" prop="current_weight" sortable/>
<el-table-column label="父号" align="center" prop="father_manage_tags" sortable/>
<el-table-column label="母号" align="center" prop="mother_manage_tags" sortable/>
<el-table-column label="家系" align="center" prop="family" sortable/>
<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="['sheep_grouping:sheep_grouping:edit']">修改</el-button>
@ -128,6 +154,8 @@
<script setup name="Sheep_grouping">
import { listSheep_grouping, getSheep_grouping, delSheep_grouping, addSheep_grouping, updateSheep_grouping } from "@/api/fileManagement/sheep_grouping"
import {listLeafGroup} from "@/api/fileManagement/group_management"
import {listSheep_grouping_join} from "@/api/fileManagement/sheep_grouping"
const { proxy } = getCurrentInstance()
@ -141,6 +169,7 @@ const multiple = ref(true)
const total = ref(0)
const title = ref("")
const leafGroupOptions = ref([])
const { sheep_gender } = proxy.useDict('sheep_gender')
const data = reactive({
form: {},
@ -148,7 +177,8 @@ const data = reactive({
pageNum: 1,
pageSize: 10,
sheepId: null,
groupId: null
groupId: null,
bsManageTags: ''
},
leafGroupOptions: [],
rules: {
@ -164,13 +194,38 @@ const data = reactive({
const { queryParams, form, rules } = toRefs(data)
/** 查询羊只分组关联列表 */
function getList() {
// function getList() {
// loading.value = true
// listSheep_grouping(queryParams.value).then(response => {
// sheep_groupingList.value = response.rows
// total.value = response.total
// loading.value = false
// })
// }
import { getSheep_file } from '@/api/fileManagement/sheep_file'
async function getList() {
loading.value = true
listSheep_grouping(queryParams.value).then(response => {
sheep_groupingList.value = response.rows
total.value = response.total
try {
// 1.
const params = {
...queryParams.value,
bsManageTags: queryParams.value.bsManageTags
? String(queryParams.value.bsManageTags)
.split(/[,\s]+/)
.map(s => s.trim())
.filter(Boolean)
: undefined
}
console.log(params)
const { rows, total: t } = await listSheep_grouping_join(params)
console.log(rows)
sheep_groupingList.value = rows
total.value = t
} finally {
loading.value = false
})
}
}
//

View File

@ -0,0 +1,428 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="计划名称" prop="planName">
<el-input
v-model="queryParams.planName"
placeholder="请输入计划名称"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option label="待审批" value="0"></el-option>
<el-option label="已审批" value="1"></el-option>
<el-option label="已拒绝" value="2"></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
type="primary"
plain
icon="Plus"
@click="handleGenerate"
v-hasPermi="['mating_plan:generate:add']"
>生成配种计划</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mating_plan:generate:remove']"
>删除</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="breedPlanGenerateList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="计划名称" align="center" prop="planName" />
<el-table-column label="计划日期" align="center" prop="planDate" width="180">
<template #default="scope">
<span>{{ scope.row.planDate }}</span>
</template>
</el-table-column>
<el-table-column label="母羊数量" align="center" prop="totalEweCount" />
<el-table-column label="公羊数量" align="center" prop="totalRamCount" />
<el-table-column label="配种比例" align="center" prop="breedRatio" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<el-tag v-if="scope.row.status === 0" type="warning">待审批</el-tag>
<el-tag v-else-if="scope.row.status === 1" type="success">已审批</el-tag>
<el-tag v-else-if="scope.row.status === 2" type="danger">已拒绝</el-tag>
<el-tag v-else type="info">未知状态</el-tag>
</template>
</el-table-column>
<el-table-column label="审批人" align="center" prop="approver" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
link
type="primary"
icon="View"
@click="handleView(scope.row)"
v-hasPermi="['mating_plan:generate:view']"
>查看</el-button>
<el-button
link
type="success"
icon="Check"
@click="handleApprove(scope.row)"
v-hasPermi="['mating_plan:generate:approve']"
v-if="scope.row.status == 0"
>审批</el-button>
<el-button
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mating_plan:generate:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 添加调试信息显示 -->
<div v-if="breedPlanGenerateList.length === 0 && !loading" style="text-align: center; padding: 20px;">
<p>暂无数据</p>
<p>数据数组长度: {{ breedPlanGenerateList.length }}</p>
<p>总数: {{ total }}</p>
<p>加载状态: {{ loading }}</p>
</div>
<pagination
v-show="total>0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 生成配种计划对话框 -->
<el-dialog title="生成配种计划" v-model="generateOpen" width="1200px" append-to-body>
<el-tabs v-model="activeTab" @tab-click="handleTabClick">
<el-tab-pane label="符合条件的母羊" name="ewe">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" @click="selectEligibleEwe">筛选符合条件的母羊</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="info">已选择: {{ selectedEwe.length }} </el-button>
</el-col>
</el-row>
<el-table
v-loading="eweLoading"
:data="eligibleEweList"
@selection-change="handleEweSelectionChange"
max-height="400"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="管理耳号" align="center" prop="bs_manage_tags" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="羊只类型" align="center" prop="sheep_type" />
<el-table-column label="月龄" align="center" prop="month_age" />
<el-table-column label="当前体重(kg)" align="center" prop="current_weight" />
<el-table-column label="产后天数" align="center" prop="post_lambing_day" />
<el-table-column label="繁殖状态" align="center" prop="breed" />
</el-table>
</el-tab-pane>
<el-tab-pane label="符合条件的公羊" name="ram">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" @click="selectEligibleRam">筛选符合条件的公羊</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="info">已选择: {{ selectedRam.length }} </el-button>
</el-col>
</el-row>
<el-table
v-loading="ramLoading"
:data="eligibleRamList"
@selection-change="handleRamSelectionChange"
max-height="400"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="管理耳号" align="center" prop="bs_manage_tags" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="羊只类型" align="center" prop="sheep_type" />
<el-table-column label="月龄" align="center" prop="month_age" />
<el-table-column label="当前体重(kg)" align="center" prop="current_weight" />
<el-table-column label="繁殖状态" align="center" prop="breed" />
</el-table>
</el-tab-pane>
</el-tabs>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="generateBreedPlan" :disabled="selectedEwe.length === 0 || selectedRam.length === 0">
生成配种计划
</el-button>
<el-button @click="generateOpen = false"> </el-button>
</div>
</template>
</el-dialog>
<!-- 查看配种计划详情对话框 -->
<el-dialog title="配种计划详情" v-model="viewOpen" width="1000px" append-to-body>
<el-descriptions :column="3" border>
<el-descriptions-item label="计划名称">{{ planInfo.planName }}</el-descriptions-item>
<el-descriptions-item label="计划日期">{{ planInfo.planDate }}</el-descriptions-item>
<el-descriptions-item label="状态">
<el-tag v-if="planInfo.status === 0" type="warning">待审批</el-tag>
<el-tag v-else-if="planInfo.status === 1" type="success">已审批</el-tag>
<el-tag v-else-if="planInfo.status === 2" type="danger">已拒绝</el-tag>
<el-tag v-else type="info">未知状态</el-tag>
</el-descriptions-item>
<el-descriptions-item label="母羊数量">{{ planInfo.totalEweCount }}</el-descriptions-item>
<el-descriptions-item label="公羊数量">{{ planInfo.totalRamCount }}</el-descriptions-item>
<el-descriptions-item label="配种比例">{{ planInfo.breedRatio }}</el-descriptions-item>
<el-descriptions-item label="创建人">{{ planInfo.createBy }}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ planInfo.createTime }}</el-descriptions-item>
<el-descriptions-item label="审批人">{{ planInfo.approver }}</el-descriptions-item>
</el-descriptions>
<el-divider content-position="left">配种计划详情</el-divider>
<el-table :data="planDetails" max-height="400">
<el-table-column label="公羊耳号" align="center" prop="ram_manage_tags" />
<el-table-column label="公羊品种" align="center" prop="ram_variety" />
<el-table-column label="母羊耳号" align="center" prop="ewe_manage_tags" />
<el-table-column label="母羊品种" align="center" prop="ewe_variety" />
<el-table-column label="母羊体重" align="center" prop="ewe_weight" />
<el-table-column label="配种类型" align="center" prop="breed_type">
<template #default="scope">
<el-tag v-if="scope.row.breed_type === 1" type="primary">自然交配</el-tag>
<el-tag v-else-if="scope.row.breed_type === 2" type="success">人工授精</el-tag>
<el-tag v-else-if="scope.row.breed_type === 3" type="info">胚胎移植</el-tag>
<el-tag v-else type="warning">未知类型</el-tag>
</template>
</el-table-column>
</el-table>
</el-dialog>
</div>
</template>
<script setup name="BreedPlanGenerate">
import {ref, reactive, toRefs, onMounted} from 'vue'
import {getCurrentInstance} from 'vue'
import {
listBreedPlanGenerate,
getBreedPlanGenerate,
delBreedPlanGenerate,
selectEligibleEwe as apiSelectEligibleEwe,
selectEligibleRam as apiSelectEligibleRam,
autoGenerateBreedPlan,
approveBreedPlan,
viewBreedPlan
} from "@/api/mating_plan/generate"
const {proxy} = getCurrentInstance()
// - 使 proxy.useDict
const dict = proxy.useDict ? proxy.useDict('breed_plan_status', 'breed_type') : {
type: {
breed_plan_status: [],
breed_type: []
}
}
const breedPlanGenerateList = ref([])
const eligibleEweList = ref([])
const eligibleRamList = ref([])
const selectedEwe = ref([])
const selectedRam = ref([])
const planInfo = ref({})
const planDetails = ref([])
const generateOpen = ref(false)
const viewOpen = ref(false)
const loading = ref(true)
const eweLoading = ref(false)
const ramLoading = ref(false)
const showSearch = ref(true)
const ids = ref([])
const multiple = ref(true)
const total = ref(0)
const activeTab = ref('ewe')
const data = reactive({
queryParams: {
pageNum: 1,
pageSize: 10,
planName: null,
status: null
}
})
const {queryParams} = toRefs(data)
/** 查询配种计划生成列表 */
function getList() {
loading.value = true
console.log('开始获取配种计划列表...')
console.log('查询参数:', queryParams.value)
listBreedPlanGenerate(queryParams.value).then(response => {
console.log('API完整响应:', response)
// API
breedPlanGenerateList.value = response.rows || []
total.value = response.total || 0
loading.value = false
console.log('处理后的数据列表:', breedPlanGenerateList.value)
console.log('数据列表长度:', breedPlanGenerateList.value.length)
console.log('总数:', total.value)
}).catch(error => {
console.error('获取列表失败:', error)
loading.value = false
breedPlanGenerateList.value = []
total.value = 0
})
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1
getList()
}
/** 重置按钮操作 */
function resetQuery() {
proxy.resetForm("queryRef")
handleQuery()
}
//
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id)
multiple.value = !selection.length
}
//
function handleEweSelectionChange(selection) {
selectedEwe.value = selection.map(item => item.id)
}
//
function handleRamSelectionChange(selection) {
selectedRam.value = selection.map(item => item.id)
}
//
function handleTabClick(tab) {
activeTab.value = tab.name
}
/** 生成配种计划按钮操作 */
function handleGenerate() {
generateOpen.value = true
selectedEwe.value = []
selectedRam.value = []
eligibleEweList.value = []
eligibleRamList.value = []
}
/** 筛选符合条件的母羊 */
function selectEligibleEwe() {
eweLoading.value = true
apiSelectEligibleEwe().then(response => {
eligibleEweList.value = response.data
eweLoading.value = false
})
}
/** 筛选符合条件的公羊 */
function selectEligibleRam() {
ramLoading.value = true
apiSelectEligibleRam().then(response => {
eligibleRamList.value = response.data
ramLoading.value = false
})
}
/** 生成配种计划 */
function generateBreedPlan() {
if (selectedEwe.value.length === 0) {
proxy.$modal.msgError("请选择母羊")
return
}
if (selectedRam.value.length === 0) {
proxy.$modal.msgError("请选择公羊")
return
}
const params = {
eweIds: selectedEwe.value,
ramIds: selectedRam.value
}
autoGenerateBreedPlan(params).then(response => {
proxy.$modal.msgSuccess("配种计划生成成功")
generateOpen.value = false
//
getList()
//
selectedEwe.value = []
selectedRam.value = []
eligibleEweList.value = []
eligibleRamList.value = []
}).catch(error => {
console.error('生成配种计划失败:', error)
proxy.$modal.msgError("生成配种计划失败")
})
}
/** 查看配种计划详情 */
function handleView(row) {
viewBreedPlan(row.id).then(response => {
planInfo.value = response.data.planInfo
planDetails.value = response.data.planDetails
viewOpen.value = true
})
}
/** 审批配种计划 */
function handleApprove(row) {
proxy.$modal.confirm('是否确认审批通过配种计划"' + row.planName + '"').then(function () {
return approveBreedPlan(row.id)
}).then(() => {
proxy.$modal.msgSuccess("审批成功")
//
getList()
}).catch(() => {
})
}
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除配种计划编号为"' + _ids + '"的数据项?').then(function () {
return delBreedPlanGenerate(_ids)
}).then(() => {
proxy.$modal.msgSuccess("删除成功")
//
getList()
}).catch(() => {
})
}
//
onMounted(() => {
console.log('配种计划生成页面已挂载')
getList()
})
//
getList()
</script>

View File

@ -0,0 +1,244 @@
<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="ramId">
<el-input
v-model="queryParams.ramId"
placeholder="请输入公羊id"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="母羊id" prop="eweId">
<el-input
v-model="queryParams.eweId"
placeholder="请输入母羊id"
clearable
@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>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['mating_plan:mating_plan:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mating_plan:mating_plan:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mating_plan:mating_plan:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['mating_plan:mating_plan:export']"
>导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="mating_planList" @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="ramId" />
<el-table-column label="母羊id" align="center" prop="eweId" />
<el-table-column label="配种类型" align="center" prop="breedType" />
<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="['mating_plan:mating_plan:edit']">修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mating_plan:mating_plan:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改配种计划对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="mating_planRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="公羊id" prop="ramId">
<el-input v-model="form.ramId" placeholder="请输入公羊id" />
</el-form-item>
<el-form-item label="母羊id" prop="eweId">
<el-input v-model="form.eweId" placeholder="请输入母羊id" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="Mating_plan">
import { listMating_plan, getMating_plan, delMating_plan, addMating_plan, updateMating_plan } from "@/api/mating_plan/mating_plan"
const { proxy } = getCurrentInstance()
const mating_planList = ref([])
const open = ref(false)
const loading = ref(true)
const showSearch = ref(true)
const ids = ref([])
const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
ramId: null,
eweId: null,
breedType: null
},
rules: {
}
})
const { queryParams, form, rules } = toRefs(data)
/** 查询配种计划列表 */
function getList() {
loading.value = true
listMating_plan(queryParams.value).then(response => {
mating_planList.value = response.rows
total.value = response.total
loading.value = false
})
}
//
function cancel() {
open.value = false
reset()
}
//
function reset() {
form.value = {
id: null,
ramId: null,
eweId: null,
breedType: null
}
proxy.resetForm("mating_planRef")
}
/** 搜索按钮操作 */
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()
open.value = true
title.value = "添加配种计划"
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
const _id = row.id || ids.value
getMating_plan(_id).then(response => {
form.value = response.data
open.value = true
title.value = "修改配种计划"
})
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["mating_planRef"].validate(valid => {
if (valid) {
if (form.value.id != null) {
updateMating_plan(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
getList()
})
} else {
addMating_plan(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功")
open.value = false
getList()
})
}
}
})
}
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除配种计划编号为"' + _ids + '"的数据项?').then(function() {
return delMating_plan(_ids)
}).then(() => {
getList()
proxy.$modal.msgSuccess("删除成功")
}).catch(() => {})
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('mating_plan/mating_plan/export', {
...queryParams.value
}, `mating_plan_${new Date().getTime()}.xlsx`)
}
getList()
</script>

View File

@ -70,12 +70,7 @@
<el-col :span="10">
<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-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="Number(item.id)" />
</el-select>
</el-form-item>
</el-col>
@ -111,17 +106,8 @@
<!-- 导入弹窗 -->
<el-dialog title="导入羊只信息" v-model="importOpen" width="400px" append-to-body>
<el-upload
ref="uploadRef"
:limit="1"
accept=".xlsx,.xls"
:action="importUrl"
:headers="headers"
:auto-upload="false"
:on-success="handleImportSuccess"
:on-error="handleImportError"
drag
>
<el-upload ref="uploadRef" :limit="1" accept=".xlsx,.xls" :action="importUrl" :headers="headers"
:auto-upload="false" :on-success="handleImportSuccess" :on-error="handleImportError" drag>
<i class="el-icon-upload" />
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
</el-upload>
@ -133,12 +119,12 @@
</template>
<script setup>
import { ref, onMounted } from 'vue'
import { ref, onMounted, getCurrentInstance } from 'vue'
import request from '@/utils/request'
import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep'
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { getToken } from '@/utils/auth'
import { getCurrentInstance } from 'vue'
const { proxy } = getCurrentInstance()
/* -------------------- 表单 -------------------- */
@ -169,7 +155,7 @@ const rules = {
/* -------------------- 下拉数据 -------------------- */
const sheepfoldOptions = ref([])
const varietyOptions = ref([])
const varietyOptions = ref([])
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {

View File

@ -169,13 +169,7 @@
</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 } from '@/api/produce/manage_sheep/trans_group/trans_group'
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import request from '@/utils/request'

View File

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

View File

@ -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">
@ -19,12 +19,8 @@
</el-form-item>
<el-form-item label="创建时间" style="width: 308px">
<el-date-picker v-model="daterangeCreateTime"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期" />
<el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item>
@ -37,19 +33,19 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['fixHoof:fixHoof:add']">新增</el-button>
v-hasPermi="['fixHoof:fixHoof:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button>
v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['fixHoof:fixHoof:export']">导出</el-button>
v-hasPermi="['fixHoof:fixHoof:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
</el-row>
@ -57,7 +53,7 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="fixHoofList" @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="耳号" 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" />
@ -71,24 +67,21 @@
<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>
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>
v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
<!-- 弹窗 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="fixHoofRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="羊只id" prop="sheepId">
<el-input v-model="form.sheepId" placeholder="请输入羊只id" />
<el-form-item label="耳号" prop="manageTags">
<el-input v-model="form.manageTags" placeholder="请输入耳号" @blur="validateSheep" />
</el-form-item>
<el-form-item label="羊舍" prop="sheepfold">
<el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
@ -118,9 +111,9 @@
</template>
<script setup name="FixHoof">
import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof } from '@/api/produce/other/fixHoof'
import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof, checkSheepByManageTags, getVarietyOptions } from '@/api/produce/other/fixHoof/fixHoof'
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import request from '@/utils/request'
// import request from '@/utils/request'
const { proxy } = getCurrentInstance()
@ -134,6 +127,7 @@ const multiple = ref(true)
const total = ref(0)
const title = ref('')
const daterangeCreateTime = ref([])
const varietyOptions = ref([])
const data = reactive({
form: {},
@ -147,8 +141,11 @@ const data = reactive({
createTime: null
},
rules: {
sheepId: [
{ required: true, message: '羊只id不能为空', trigger: 'blur' }
// sheepId: [
// { required: true, message: '', trigger: 'blur' }
// ],
manageTags: [
{ required: true, message: '耳号不能为空', trigger: 'blur' }
],
sheepfold: [
{ required: true, message: '羊舍id不能为空', trigger: 'change' }
@ -165,7 +162,7 @@ const data = reactive({
const { queryParams, form, rules } = toRefs(data)
/* 列表 */
function getList () {
function getList() {
loading.value = true
const q = { ...queryParams.value }
if (q.sheepId === '') q.sheepId = null
@ -180,14 +177,17 @@ function getList () {
total.value = res.total
loading.value = false
})
getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
varietyOptions.value = res.rows || []
})
}
function cancel () {
function cancel() {
open.value = false
reset()
}
function reset () {
function reset() {
form.value = {
id: null,
sheepId: null,
@ -201,30 +201,30 @@ function reset () {
proxy.resetForm('fixHoofRef')
}
function handleQuery () {
function handleQuery() {
queryParams.value.pageNum = 1
getList()
}
function resetQuery () {
function resetQuery() {
daterangeCreateTime.value = []
proxy.resetForm('queryRef')
handleQuery()
}
function handleSelectionChange (selection) {
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id)
single.value = selection.length !== 1
multiple.value = !selection.length
}
function handleAdd () {
function handleAdd() {
reset()
open.value = true
title.value = '添加修蹄'
}
function handleUpdate (row) {
function handleUpdate(row) {
reset()
const _id = row.id || ids.value
getFixHoof(_id).then(res => {
@ -234,7 +234,7 @@ function handleUpdate (row) {
})
}
function submitForm () {
function submitForm() {
proxy.$refs.fixHoofRef.validate(valid => {
if (!valid) return
if (form.value.id) {
@ -253,7 +253,7 @@ function submitForm () {
})
}
function handleDelete (row) {
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm(`是否确认删除修蹄编号为"${_ids}"的数据项?`).then(() => {
return delFixHoof(_ids)
@ -263,27 +263,40 @@ function handleDelete (row) {
})
}
function handleExport () {
function handleExport() {
proxy.download('/produce/other/fixHoof/export', { ...queryParams.value }, `fixHoof_${new Date().getTime()}.xlsx`)
}
/* 下拉数据 */
/* 羊舍 */
const sheepfoldOptions = ref([])
function getSheepfoldOptions () {
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows
})
}
const varietyOptions = ref([])
function getVarietyOptions () {
request({
url: '/base/variety/list',
method: 'get',
params: { pageNum: 1, pageSize: 9999 }
}).then(res => {
varietyOptions.value = res.rows || []
})
//
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 */