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

Merge branch 'main' of http://e19510c831.iok.la/admin/zhyc-sheep-ui

Browse Source
This commit is contained in:
ll 2025-08-25 16:32:55 +08:00
commit 53eae096e6
45 changed files with 4750 additions and 1482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/api/Breeding_records/Breeding_records.js
View File

@ -57,4 +57,29 @@ export function getBreedPlanByEweTags(manageTags) {
url: '/Breeding_records/Breeding_records/getBreedPlan/' + manageTags,
method: 'get'
})
}
// 根据母羊耳号获取最新配种计划信息（优先从配种计划生成表获取）
export function getLatestBreedPlanByEweTags(manageTags) {
return request({
url: '/Breeding_records/Breeding_records/getLatestBreedPlan/' + manageTags,
method: 'get'
})
}
// 同步孕检结果到配种记录
export function syncPregnancyResult(data) {
return request({
url: '/Breeding_records/Breeding_records/syncPregnancyResult',
method: 'post',
data: data
})
}
// 根据羊只ID和时间范围查询配种记录
export function getBreedRecordsByTimeRange(sheepId, startDate, endDate) {
return request({
url: `/Breeding_records/Breeding_records/getByTimeRange/${sheepId}/${startDate}/${endDate}`,
method: 'get'
})
}

11
src/api/Pregnancy_Test/Pregnancy_Test.js
View File

@ -52,4 +52,15 @@ export function getSheepByManageTags(manageTags) {
manageTags: manageTags
}
})
}
// 根据耳号获取配种信息
export function getBreedInfoByManageTags(manageTags) {
return request({
url: '/Pregnancy_Test/Pregnancy_Test/getBreedInfoByManageTags',
method: 'get',
params: {
manageTags: manageTags
}
})
}

8
src/api/breed/lambing_records.js
View File

@ -17,6 +17,14 @@ export function getLambing_records(id) {
})
}
// 根据母羊耳号查询最新配种记录
export function getBreedingInfo(earNumber) {
return request({
url: '/breed/lambing_records/breeding_info/' + earNumber,
method: 'get'
})
}
// 新增产羔记录（包含羔羊信息）
export function addLambing_records(data) {
return request({

44
src/api/feed/FeedList.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询配料清单列表
export function listFeedList(query) {
return request({
url: '/feed/FeedList/list',
method: 'get',
params: query
})
}
// 查询配料清单详细
export function getFeedList(id) {
return request({
url: '/feed/FeedList/' + id,
method: 'get'
})
}
// 新增配料清单
export function addFeedList(data) {
return request({
url: '/feed/FeedList',
method: 'post',
data: data
})
}
// 修改配料清单
export function updateFeedList(data) {
return request({
url: '/feed/FeedList',
method: 'put',
data: data
})
}
// 删除配料清单
export function delFeedList(id) {
return request({
url: '/feed/FeedList/' + id,
method: 'delete'
})
}

53
src/api/feed/FeedStatistic.js Normal file
View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询饲喂量统计列表
export function listFeedStatistic(query) {
return request({
url: '/feed/FeedStatistic/list',
method: 'get',
params: query
})
}
// 查询饲喂量统计详细
export function getFeedStatistic(id) {
return request({
url: '/feed/FeedStatistic/' + id,
method: 'get'
})
}
// 新增饲喂量统计
export function addFeedStatistic(data) {
return request({
url: '/feed/FeedStatistic',
method: 'post',
data: data
})
}
// 修改饲喂量统计
export function updateFeedStatistic(data) {
return request({
url: '/feed/FeedStatistic',
method: 'put',
data: data
})
}
// 删除饲喂量统计
export function delFeedStatistic(id) {
return request({
url: '/feed/FeedStatistic/' + id,
method: 'delete'
})
}
// 查询饲喂量统计列表
export function initFeedStatistic(query) {
return request({
url: '/feed/FeedStatistic/init',
method: 'get',
params: query
})
}

33
src/api/mating_plan/generate.js
View File

@ -60,11 +60,20 @@ export function updateBreedPlanGenerate(data) {
})
}
// 审批配种计划
export function approveBreedPlan(id) {
// 获取审批配种计划详情
export function getApproveBreedPlan(id) {
return request({
url: '/mating_plan/generate/approve/' + id,
method: 'put'
method: 'get'
})
}
// 确认审批配种计划
export function confirmApproveBreedPlan(data) {
return request({
url: '/mating_plan/generate/approve/confirm',
method: 'put',
data: data
})
}
@ -76,6 +85,24 @@ export function viewBreedPlan(id) {
})
}
// 导出配种计划详情
export function exportBreedPlanDetails(id) {
return request({
url: '/mating_plan/generate/export/' + id,
method: 'get',
responseType: 'blob'
})
}
// 修改配种计划详情
export function updateBreedPlan(data) {
return request({
url: '/mating_plan/generate/update',
method: 'put',
data: data
})
}
// 删除配种计划生成
export function delBreedPlanGenerate(id) {
return request({

2
src/api/mating_plan/mating_plan.js
View File

@ -41,4 +41,4 @@ export function delMating_plan(id) {
url: '/mating_plan/mating_plan/' + id,
method: 'delete'
})
}
}

60
src/api/miscarriage/miscarriage.js Normal file
View File

@ -0,0 +1,60 @@
import request from '@/utils/request'
// 查询流产记录列表
export function listMiscarriage(query) {
return request({
url: '/miscarriage/miscarriage/list',
method: 'get',
params: query
})
}
// 查询流产记录详细
export function getMiscarriage(id) {
return request({
url: '/miscarriage/miscarriage/' + id,
method: 'get'
})
}
// 根据耳号查询羊只信息
export function getSheepInfo(manageTags) {
return request({
url: '/miscarriage/miscarriage/sheep/' + manageTags,
method: 'get'
})
}
// 获取流产原因选项
export function getReasonOptions() {
return request({
url: '/miscarriage/miscarriage/reasonOptions',
method: 'get'
})
}
// 新增流产记录
export function addMiscarriage(data) {
return request({
url: '/miscarriage/miscarriage',
method: 'post',
data: data
})
}
// 修改流产记录
export function updateMiscarriage(data) {
return request({
url: '/miscarriage/miscarriage',
method: 'put',
data: data
})
}
// 删除流产记录
export function delMiscarriage(id) {
return request({
url: '/miscarriage/miscarriage/' + id,
method: 'delete'
})
}

7
src/api/produce/bodyManage/body_measure.js
View File

@ -42,3 +42,10 @@ export function delBody_measure(id) {
method: 'delete'
})
}
//获取羊只类别列表
export function getSheepTypeList() {
return request({
url: '/base/base/list',
method: 'get'
})
}

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

@ -17,14 +17,6 @@ export function getDeath(id) {
})
}
// 根据管理耳号查询羊只信息
export function getSheepInfo(manageTags) {
return request({
url: '/sheep_death/death/sheepInfo/' + manageTags,
method: 'get'
})
}
// 新增羊只死淘记录
export function addDeath(data) {
return request({
@ -49,4 +41,12 @@ export function delDeath(id) {
url: '/sheep_death/death/' + id,
method: 'delete'
})
}
// 根据管理耳号查询羊只信息
export function getSheepInfo(manageTags) {
return request({
url: '/sheep_death/death/sheepInfo/' + manageTags,
method: 'get'
})
}

251
src/views/Breeding_records/Breeding_records/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="母羊耳号" prop="eweManageTags">
<el-input
v-model="queryParams.eweManageTags"
@ -33,6 +33,12 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="配种方式" prop="breedType">
<el-select v-model="queryParams.breedType" placeholder="请选择配种方式" clearable>
<el-option label="同期发情" value="1"></el-option>
<el-option label="本交" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input
v-model="queryParams.technician"
@ -41,6 +47,19 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="孕检结果" prop="pregnancyResult">
<el-select v-model="queryParams.pregnancyResult" placeholder="请选择孕检结果" clearable>
<el-option label="怀孕" value="怀孕"></el-option>
<el-option label="空怀" value="空怀"></el-option>
<el-option label="疑似怀孕" value="疑似怀孕"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否孕检" prop="isPregnancyChecked">
<el-select v-model="queryParams.isPregnancyChecked" placeholder="请选择是否已孕检" clearable>
<el-option label="已孕检" value="1"></el-option>
<el-option label="未孕检" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建人" prop="createBy">
<el-input
v-model="queryParams.createBy"
@ -107,11 +126,11 @@
<el-table v-loading="loading" :data="Breeding_recordsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="耳号" align="center" prop="eweManageTags" width="120" />
<el-table-column label="耳号" align="center" prop="eweManageTags" width="120" fixed="left" />
<el-table-column label="品种" align="center" prop="eweVariety" width="100" />
<el-table-column label="事件类型" align="center" width="100">
<template #default="scope">
<span>配种</span>
<el-tag type="success">配种</el-tag>
</template>
</el-table-column>
<el-table-column label="配种公羊" align="center" prop="ramManageTags" width="120" />
@ -138,6 +157,45 @@
</template>
</el-table-column>
<el-table-column label="耗精量" align="center" prop="breedDrugs" width="100" />
<!-- 孕检相关字段 -->
<el-table-column label="孕检状态" align="center" width="100">
<template #default="scope">
<el-tag :type="scope.row.isPregnancyChecked === 1 ? 'success' : 'warning'">
{{ scope.row.isPregnancyChecked === 1 ? '已孕检' : '未孕检' }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="孕检日期" align="center" prop="pregnancyCheckDate" width="120">
<template #default="scope">
<span>{{ scope.row.pregnancyCheckDate ? parseTime(scope.row.pregnancyCheckDate, '{y}-{m}-{d}') : '-' }}</span>
</template>
</el-table-column>
<el-table-column label="孕检结果" align="center" prop="pregnancyResult" width="100">
<template #default="scope">
<el-tag v-if="scope.row.pregnancyResult"
:type="getPregnancyResultType(scope.row.pregnancyResult)">
{{ scope.row.pregnancyResult }}
</el-tag>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="胎数" align="center" prop="fetusCount" width="80">
<template #default="scope">
<span>{{ scope.row.fetusCount || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="孕检方式" align="center" prop="pregnancyWay" width="100">
<template #default="scope">
<span>{{ scope.row.pregnancyWay || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="配种到孕检间隔(天)" align="center" prop="daysToPregnancyCheck" width="140">
<template #default="scope">
<span>{{ scope.row.daysToPregnancyCheck || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" width="100" />
<el-table-column label="创建日期" align="center" prop="createTime" width="180">
<template #default="scope">
@ -162,12 +220,12 @@
/>
<!-- 添加或修改配种记录对话框 -->
<el-dialog :title="title" v-model="open" width="600px" append-to-body>
<el-form ref="Breeding_recordsRef" :model="form" :rules="rules" label-width="100px">
<el-dialog :title="title" v-model="open" width="800px" append-to-body>
<el-form ref="Breeding_recordsRef" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="母羊耳号" prop="eweManageTags">
<el-input v-model="form.eweManageTags" placeholder="请输入母羊耳号" @blur="getEweInfoByTags" />
<el-input v-model="form.eweManageTags" placeholder="请输入母羊耳号" @blur="getEweInfoAndPlan" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -177,11 +235,21 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="配种方式" prop="breedType">
<el-select v-model="form.breedType" placeholder="请选择配种方式">
<el-option label="同期发情" :value="1"></el-option>
<el-option label="本交" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="耗精量" prop="breedDrugs">
<el-input v-model="form.breedDrugs" placeholder="请输入耗精量" />
@ -195,6 +263,97 @@
</el-form-item>
</el-col>
</el-row>
<!-- 显示母羊信息区域 -->
<el-row v-if="eweInfo">
<el-col :span="24">
<el-divider content-position="left">母羊信息</el-divider>
</el-col>
<el-col :span="8">
<el-form-item label="品种">
<el-input v-model="eweInfo.variety" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="月龄">
<el-input v-model="eweInfo.month_age" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="胎次">
<el-input v-model="eweInfo.parity" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="繁育状态">
<el-input v-model="eweInfo.breed_status" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="当前羊舍">
<el-input v-model="eweInfo.sheepfold_name" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否性控">
<el-input :value="eweInfo.controlled === 1 ? '是' : '否'" readonly />
</el-form-item>
</el-col>
</el-row>
<!-- 显示配种计划信息区域 -->
<el-row v-if="breedPlan">
<el-col :span="24">
<el-divider content-position="left">配种计划信息</el-divider>
</el-col>
<el-col :span="12">
<el-form-item label="计划公羊">
<el-input v-model="breedPlan.ram_manage_tags" readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="计划配种方式">
<el-input v-model="breedPlan.breed_type_name" readonly />
</el-form-item>
</el-col>
</el-row>
<!-- 显示孕检信息区域（如果已有孕检记录） -->
<el-row v-if="form.pregnancyResult">
<el-col :span="24">
<el-divider content-position="left">孕检信息</el-divider>
</el-col>
<el-col :span="8">
<el-form-item label="孕检日期">
<el-input :value="form.pregnancyCheckDate ? parseTime(form.pregnancyCheckDate, '{y}-{m}-{d}') : ''" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="孕检结果">
<el-input v-model="form.pregnancyResult" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="胎数">
<el-input v-model="form.fetusCount" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="孕检方式">
<el-input v-model="form.pregnancyWay" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="孕检技术员">
<el-input v-model="form.pregnancyTechnician" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="配种到孕检间隔">
<el-input :value="form.daysToPregnancyCheck + '天'" readonly />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
@ -207,7 +366,7 @@
</template>
<script setup name="Breeding_records">
import { listBreeding_records, getBreeding_records, delBreeding_records, addBreeding_records, updateBreeding_records, getSheepInfoByTags } from "@/api/Breeding_records/Breeding_records"
import { listBreeding_records, getBreeding_records, delBreeding_records, addBreeding_records, updateBreeding_records, getSheepInfoByTags, getLatestBreedPlanByEweTags } from "@/api/Breeding_records/Breeding_records"
const { proxy } = getCurrentInstance()
@ -221,6 +380,10 @@ const multiple = ref(true)
const total = ref(0)
const title = ref("")
// 新增母羊信息和配种计划信息
const eweInfo = ref(null)
const breedPlan = ref(null)
const data = reactive({
form: {},
queryParams: {
@ -230,9 +393,12 @@ const data = reactive({
ramManageTags: null,
eweVariety: null,
ramVariety: null,
breedType: null,
technician: null,
createBy: null,
createTime: null
createTime: null,
pregnancyResult: null,
isPregnancyChecked: null
},
rules: {
eweManageTags: [
@ -243,6 +409,9 @@ const data = reactive({
],
technician: [
{ required: true, message: "技术员不能为空", trigger: "blur" }
],
breedType: [
{ required: true, message: "配种方式不能为空", trigger: "change" }
]
}
})
@ -276,10 +445,20 @@ function reset() {
ramManageTags: null,
technician: null,
breedDrugs: null,
breedType: null,
comment: null,
createBy: null,
createTime: null
createTime: null,
pregnancyCheckDate: null,
pregnancyResult: null,
pregnancyWay: null,
fetusCount: null,
pregnancyTechnician: null,
pregnancyRemark: null,
daysToPregnancyCheck: null
}
eweInfo.value = null
breedPlan.value = null
proxy.resetForm("Breeding_recordsRef")
}
@ -317,20 +496,51 @@ function handleUpdate(row) {
form.value = response.data
open.value = true
title.value = "修改配种记录"
// 如果有母羊耳号，加载母羊信息
if (form.value.eweManageTags) {
getEweInfoAndPlan()
}
})
}
/** 根据母羊耳号获取羊只信息 */
function getEweInfoByTags() {
/** 根据母羊耳号获取羊只信息和配种计划信息 */
function getEweInfoAndPlan() {
if (form.value.eweManageTags) {
// 获取母羊信息
getSheepInfoByTags(form.value.eweManageTags).then(response => {
if (response.data) {
eweInfo.value = response.data
form.value.eweId = response.data.id
} else {
proxy.$modal.msgError("未找到该母羊耳号对应的羊只信息")
eweInfo.value = null
}
}).catch(() => {
proxy.$modal.msgError("查询母羊信息失败")
eweInfo.value = null
})
// 获取配种计划信息（使用最新的获取方法）
getLatestBreedPlanByEweTags(form.value.eweManageTags).then(response => {
if (response.data) {
breedPlan.value = response.data
// 自动填充公羊耳号和配种方式（但允许用户修改）
if (!form.value.ramManageTags) {
form.value.ramManageTags = response.data.ram_manage_tags
}
if (!form.value.breedType) {
form.value.breedType = response.data.breed_type
}
proxy.$modal.msgSuccess("已自动匹配配种计划信息，可手动调整")
} else {
breedPlan.value = null
proxy.$modal.msgWarning("未找到该母羊的配种计划，请手动输入配种信息")
}
}).catch(() => {
proxy.$modal.msgWarning("查询配种计划失败，请手动输入配种信息")
breedPlan.value = null
})
}
}
@ -389,6 +599,19 @@ function handleExport() {
}, `配种记录_${new Date().getTime()}.xlsx`)
}
/** 获取孕检结果类型 */
function getPregnancyResultType(result) {
if (result === '怀孕') {
return 'success'
} else if (result === '空怀') {
return 'danger'
} else if (result === '疑似怀孕') {
return 'warning'
} else {
return 'info'
}
}
getList()
</script>
@ -399,4 +622,10 @@ getList()
.el-table .cell {
white-space: nowrap;
}
.el-divider {
margin: 16px 0;
}
.el-divider--horizontal {
margin: 16px 0;
}
</style>

193
src/views/Pregnancy_Test/Pregnancy_Test/index.vue
View File

@ -101,7 +101,13 @@
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="孕检结果" align="center" prop="result" width="80" />
<el-table-column label="孕检结果" align="center" prop="result" width="80">
<template #default="scope">
<el-tag :type="getResultTagType(scope.row.result)">
{{ scope.row.result }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="配种公羊" align="center" prop="fatherManageTags" width="100" />
<el-table-column label="配种公羊品种" align="center" prop="fatherVariety" width="120" />
<el-table-column label="配种类型" align="center" prop="matingTypeName" width="80" />
@ -110,6 +116,13 @@
<span>{{ parseTime(scope.row.matingDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<!-- 新增配后天数字段 -->
<el-table-column label="配后天数" align="center" prop="daysAfterMating" width="80">
<template #default="scope">
<span v-if="scope.row.daysAfterMating !== null">{{ scope.row.daysAfterMating }}天</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="胎儿数量" align="center" prop="fetusCount" width="80" />
<el-table-column label="月龄" align="center" prop="monthAge" width="60" />
<el-table-column label="孕检时羊只类别" align="center" prop="breedStatus" width="120" />
@ -154,12 +167,13 @@
/>
<!-- 添加或修改孕检记录对话框 -->
<el-dialog :title="title" v-model="open" width="800px" append-to-body>
<el-dialog :title="title" v-model="open" width="900px" append-to-body>
<el-form ref="Pregnancy_TestRef" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="20">
<!-- 基本信息 -->
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="耳号" prop="manageTags">
<el-input v-model="form.manageTags" placeholder="请输入耳号" @blur="getSheepInfo" />
<el-input v-model="form.manageTags" placeholder="请输入耳号" @blur="getSheepAndBreedInfo" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -168,15 +182,17 @@
v-model="form.datetime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择孕检日期">
placeholder="请选择孕检日期"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="孕检结果" prop="result">
<el-select v-model="form.result" placeholder="请选择孕检结果">
<el-select v-model="form.result" placeholder="请选择孕检结果" @change="onResultChange" style="width: 100%">
<el-option label="怀孕" value="怀孕" />
<el-option label="未孕" value="未孕" />
<el-option label="流产" value="流产" />
@ -185,11 +201,18 @@
</el-col>
<el-col :span="12">
<el-form-item label="胎儿数量" prop="fetusCount">
<el-input-number v-model="form.fetusCount" :min="0" :max="10" placeholder="请输入胎儿数量" />
<el-input-number
v-model="form.fetusCount"
:min="0"
:max="10"
placeholder="请输入胎儿数量"
:disabled="form.result !== '怀孕'"
style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" />
@ -197,7 +220,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="孕检方式" prop="way">
<el-select v-model="form.way" placeholder="请选择孕检方式">
<el-select v-model="form.way" placeholder="请选择孕检方式" style="width: 100%">
<el-option label="B超" value="B超" />
<el-option label="试纸" value="试纸" />
<el-option label="血检" value="血检" />
@ -205,48 +228,42 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-row :gutter="30">
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :rows="3" />
</el-form-item>
</el-col>
</el-row>
<!-- 羊只信息显示 -->
<el-divider content-position="left">羊只信息</el-divider>
<el-row :gutter="20" v-if="sheepInfo.id">
<!-- 配种信息显示 -->
<el-divider content-position="left">配种信息</el-divider>
<el-row :gutter="30" v-if="breedInfo.manageTags">
<el-col :span="8">
<el-form-item label="品种">
<el-input v-model="sheepInfo.variety" disabled />
<el-form-item label="配种类型">
<el-input v-model="breedInfo.matingTypeName" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="月龄">
<el-input v-model="sheepInfo.monthAge" disabled />
<el-form-item label="配种公羊">
<el-input v-model="breedInfo.fatherManageTags" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="胎次">
<el-input v-model="sheepInfo.parity" disabled />
<el-form-item label="配种日期">
<el-input :value="parseTime(breedInfo.matingDate, '{y}-{m}-{d}')" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" v-if="sheepInfo.id">
<el-col :span="8">
<el-form-item label="配次">
<el-input v-model="sheepInfo.matingCounts" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="当前羊舍">
<el-input v-model="sheepInfo.sheepfoldName" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="繁育状态">
<el-input v-model="sheepInfo.breedStatus" disabled />
</el-form-item>
<el-row v-if="!breedInfo.manageTags && form.manageTags">
<el-col :span="24">
<el-alert
title="未找到该羊只的配种信息"
type="warning"
show-icon
:closable="false">
</el-alert>
</el-col>
</el-row>
</el-form>
@ -261,7 +278,7 @@
</template>
<script setup name="Pregnancy_Test">
import { listPregnancy_Test, getPregnancy_Test, delPregnancy_Test, addPregnancy_Test, updatePregnancy_Test, getSheepByManageTags } from "@/api/Pregnancy_Test/Pregnancy_Test"
import { listPregnancy_Test, getPregnancy_Test, delPregnancy_Test, addPregnancy_Test, updatePregnancy_Test, getSheepByManageTags, getBreedInfoByManageTags } from "@/api/Pregnancy_Test/Pregnancy_Test"
const { proxy } = getCurrentInstance()
@ -274,7 +291,7 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const sheepInfo = ref({})
const breedInfo = ref({})
const data = reactive({
form: {},
@ -302,12 +319,55 @@ const data = reactive({
],
way: [
{ required: true, message: "孕检方式不能为空", trigger: "change" }
],
fetusCount: [
{
validator: (rule, value, callback) => {
if (form.value.result === '怀孕') {
if (!value || value <= 0) {
callback(new Error('孕检结果为怀孕时，胎儿数量必须填写且大于0'))
} else if (value > 10) {
callback(new Error('胎儿数量不能超过10个'))
} else {
callback()
}
} else {
callback()
}
},
trigger: 'blur'
}
]
}
})
const { queryParams, form, rules } = toRefs(data)
/** 孕检结果标签类型 */
function getResultTagType(result) {
switch (result) {
case '怀孕':
return 'success'
case '未孕':
return 'info'
case '流产':
return 'danger'
default:
return 'info'
}
}
/** 孕检结果变化处理 */
function onResultChange(value) {
if (value === '未孕' || value === '流产') {
form.value.fetusCount = 0
} else if (value === '怀孕') {
if (!form.value.fetusCount || form.value.fetusCount <= 0) {
form.value.fetusCount = 1
}
}
}
/** 查询孕检记录列表 */
function getList() {
loading.value = true
@ -318,18 +378,31 @@ function getList() {
})
}
/** 根据耳号获取羊只信息 */
function getSheepInfo() {
/** 根据耳号获取羊只信息和配种信息 */
function getSheepAndBreedInfo() {
if (form.value.manageTags) {
// 获取羊只基本信息
getSheepByManageTags(form.value.manageTags).then(response => {
if (response.data) {
sheepInfo.value = response.data
form.value.sheepId = response.data.id
} else {
proxy.$modal.msgError("未找到该耳号的羊只信息")
sheepInfo.value = {}
form.value.sheepId = null
}
}).catch(() => {
proxy.$modal.msgError("查询羊只信息失败")
form.value.sheepId = null
})
// 获取配种信息
getBreedInfoByManageTags(form.value.manageTags).then(response => {
if (response.data) {
breedInfo.value = response.data
} else {
breedInfo.value = {}
}
}).catch(() => {
breedInfo.value = {}
})
}
}
@ -350,12 +423,12 @@ function reset() {
result: null,
fetusCount: null,
technician: null,
way: null,
way: 'B超', // 默认孕检方式为B超
remark: null,
createBy: null,
createTime: null
}
sheepInfo.value = {}
breedInfo.value = {}
proxy.resetForm("Pregnancy_TestRef")
}
@ -392,9 +465,9 @@ function handleUpdate(row) {
getPregnancy_Test(_id).then(response => {
form.value = response.data
form.value.manageTags = response.data.manageTags
// 获取羊只信息用于显示
// 获取配种信息用于显示
if (response.data.manageTags) {
getSheepInfo()
getSheepAndBreedInfo()
}
open.value = true
title.value = "修改孕检记录"
@ -407,15 +480,34 @@ function submitForm() {
if (valid) {
if (form.value.id != null) {
updatePregnancy_Test(form.value).then(response => {
console.log("修改成功响应", response)
proxy.$modal.msgSuccess("修改成功")
open.value = false
getList()
// 强制刷新页面数据
setTimeout(() => {
getList()
}, 500)
}).catch((error) => {
console.error("修改失败", error)
proxy.$modal.msgError("修改失败")
})
} else {
addPregnancy_Test(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功")
open.value = false
getList()
console.log("新增成功响应", response) // 查看这个日志
if (response && response.code === 200) {
proxy.$modal.msgSuccess("新增成功")
open.value = false
// 强制刷新页面数据，延迟执行确保对话框关闭
setTimeout(() => {
getList()
}, 500)
} else {
console.error("新增返回异常", response)
proxy.$modal.msgError("新增失败")
}
}).catch((error) => {
console.error("新增失败", error)
proxy.$modal.msgError("新增失败")
})
}
}
@ -447,6 +539,7 @@ getList()
.el-table {
font-size: 12px;
}
.el-table .cell {
padding: 0 5px;
}

16
src/views/biosafety/deworm/index.vue
View File

@ -2,13 +2,13 @@
<div class="app-container">
<!-- 1. 搜索 -->
<el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
<el-form-item label="羊只耳号" prop="sheepNo">
<el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
</el-form-item>
<el-form-item label="驱虫日期">
<el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="羊只耳号" prop="sheepNo">
<el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
</el-form-item>
<el-form-item label="技术员" prop="technical">
<el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
</el-form-item>
@ -29,6 +29,9 @@
<!-- 3. 列表 -->
<el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="驱虫日期" align="center" prop="datetime" width="180">
<template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
</el-table-column>
<el-table-column label="羊只耳号" align="center" prop="sheepNo" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="羊只类别" align="center" prop="sheepType" />
@ -40,9 +43,6 @@
<el-table-column label="月龄" align="center" prop="monthAge" />
<el-table-column label="胎次" align="center" prop="parity" />
<el-table-column label="繁殖状态" align="center" prop="breed" />
<el-table-column label="驱虫日期" align="center" prop="datetime" width="180">
<template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
</el-table-column>
<el-table-column label="技术员" align="center" prop="technical" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="操作" align="center" width="200">
@ -191,7 +191,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="性别">
<span> <dict-tag :options="sheep_gender" :value="editForm.gender" /></span>
<span> <dict-tag :options="sheep_gender" :value="editForm.gender" /></span>
</el-form-item>
</el-col>
<el-col :span="12">
@ -225,7 +225,7 @@
</el-table-column>
<el-table-column label="用量" width="160">
<template #default="scope">
<el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;"/>
<el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;" />
</template>
</el-table-column>
<el-table-column label="单位" width="120">

10
src/views/biosafety/diagnosis/add.vue
View File

@ -3,7 +3,7 @@
<el-container style="height: 100vh; display: flex; flex-direction: column;">
<el-main style="padding: 0; flex: 1; display: flex; flex-direction: column;">
<div class="content-wrapper">
<h2 class="page-title">添加治疗记录</h2>
<h2 class="page-title">羊只诊疗</h2>
<div class="treatment-container">
<!-- 羊只信息只读展示 -->
@ -95,14 +95,14 @@
<el-col :span="12">
<el-form-item label="治疗结果" prop="result">
<el-select v-model="form.result" placeholder="请选择治疗结果" style="width: 100%;">
<el-option v-for="item in diag_status" :key="item.value" :label="item.label"
<el-option v-for="item in diag_result" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="转入羊舍" prop="sheepfoldId">
<el-select v-model="form.sheepfoldId" placeholder="请选择转入羊舍"
<el-form-item label="转入羊舍" >
<el-select v-model="form.sheepfoldId" placeholder="请选择转入羊舍" filterable
style="width: 100%;">
<el-option v-for="item in sheepfolds" :key="item.id" :label="item.name"
:value="item.id" />
@ -139,7 +139,7 @@ import { listSheepfold_management } from "@/api/fileManagement/sheepfold_managem
import { addDiagnosis } from "@/api/biosafety/diagnosis"
const { proxy } = getCurrentInstance()
const { diag_status } = proxy.useDict( "diag_status")
const { diag_result } = proxy.useDict( "diag_result")

22
src/views/biosafety/diagnosis/index.vue
View File

@ -2,14 +2,13 @@
<div class="app-container">
<!-- 查询区域 -->
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="羊只" prop="sheepId">
<el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
</el-form-item>
<el-form-item label="时间日期" style="width: 308px">
<el-form-item label="事件日期" style="width: 308px">
<el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="羊只" prop="sheepId">
<el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
</el-form-item>
<el-form-item label="疾病类型" prop="diseasePid">
<el-select v-model="queryParams.diseasePid" clearable placeholder="请选择疾病类型" style="width: 120px;" filterable
@ -68,7 +67,7 @@
<el-table v-loading="loading" :data="diagnosisList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="耳号" align="center" prop="sheepNo" />
<el-table-column label="时间日期" align="center" prop="datetime" width="180">
<el-table-column label="事件日期" align="center" prop="datetime" width="150">
<template #default="scope">
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
</template>
@ -83,19 +82,19 @@
<el-table-column label="诊疗结果" align="center" prop="result">
<template #default="scope"><dict-tag :options="diag_result" :value="scope.row.result" /></template>
</el-table-column>
<el-table-column label="开始时间" align="center" prop="begindate">
<el-table-column label="开始时间" align="center" prop="begindate" width="150">
<template #default="scope">
<span>{{ parseTime(scope.row.begindate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="结束时间" align="center" prop="enddate">
<el-table-column label="结束时间" align="center" prop="enddate" width="150">
<template #default="scope">
<span>{{ parseTime(scope.row.enddate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="治疗天数" align="center" prop="treatDay" />
<el-table-column label="羊舍" align="center" prop="sheepfold" width="100px" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100px">
<el-table-column label="羊舍" align="center" prop="sheepfold" width="150px" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140px">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['diagnosis:diagnosis:edit']">修改</el-button>
@ -127,8 +126,7 @@
<el-col :span="8">
<el-form-item label="性别">
<span class="readonly-text"> <dict-tag :options="sheep_gender"
:value="form.gender" /></span>
<span class="readonly-text"> <dict-tag :options="sheep_gender" :value="form.gender" /></span>
</el-form-item>
</el-col>
<el-col :span="8">

7
src/views/biosafety/disease/index.vue
View File

@ -82,6 +82,7 @@ const title = ref("")
const isExpandAll = ref(true)
const refreshTable = ref(true)
const data = reactive({
form: {},
queryParams: {
@ -99,6 +100,7 @@ const { queryParams, form, rules } = toRefs(data)
function getList() {
loading.value = true
listDisease(queryParams.value).then(response => {
diseaseList.value = proxy.handleTree(response.data, "id", "pid")
loading.value = false
})
@ -107,10 +109,7 @@ function getList() {
/** 查询疾病下拉树结构 */
function getTreeselect() {
listDisease().then(response => {
diseaseOptions.value = []
const data = { id: 0, name: '疾病', children: [] }
data.children = proxy.handleTree(response.data, "id", "pid")
diseaseOptions.value.push(data)
diseaseOptions.value = response.data.filter(item => item.pid === 0)
})
}

100
src/views/biosafety/disinfect/index.vue
View File

@ -2,17 +2,26 @@
<div class="app-container">
<!-- 搜索栏 -->
<el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="80px">
<el-form-item label="消毒日期">
<!-- 1️⃣ 改为 datetimerange -->
<el-date-picker v-model="daterangeDatetime" type="daterange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" value-format="YYYY-MM-DD HH:mm" />
</el-form-item>
<el-form-item label="消毒方式" prop="way">
<el-select v-model="queryParams.way" clearable placeholder="请选择消毒方式" filterable style="width: 200px">
<el-option v-for="item in disinfect_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="药品名称" prop="mediName">
<el-input v-model="queryParams.mediName" placeholder="请输入药品" clearable />
</el-form-item>
<el-form-item label="羊舍" prop="sheepfoldId">
<el-select v-model="queryParams.sheepfoldId" clearable placeholder="请选择羊舍" filterable style="width: 200px">
<el-option v-for="b in barns" :key="b.id" :label="b.sheepfoldName" :value="b.id" />
</el-select>
</el-form-item>
<el-form-item label="消毒日期">
<el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input v-model="queryParams.technician" placeholder="请输入技术员" clearable />
</el-form-item>
@ -34,13 +43,21 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="disinfectList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName"/>
<el-table-column label="消毒日期" align="center" prop="datetime" width="180">
<template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
<!-- 2️⃣ 显示格式含时分 -->
<template #default="scope">
{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}
</template>
</el-table-column>
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="消毒方式" align="center" prop="way" />
<el-table-column label="消毒方式" align="center" prop="way">
<template #default="scope">
<dict-tag :options="disinfect_type" :value="scope.row.way" />
</template>
</el-table-column>
<el-table-column label="比例" align="center" prop="ratio" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="操作" align="center" width="200">
<template #default="scope">
@ -66,8 +83,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 3️⃣ type=datetime -->
<el-form-item label="消毒日期" prop="datetime">
<el-date-picker v-model="form.datetime" type="date" value-format="YYYY-MM-DD" style="width: 100%" />
<el-date-picker v-model="form.datetime" type="date" value-format="YYYY-MM-DD"
style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
@ -82,7 +101,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="技术员">
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员姓名" />
</el-form-item>
</el-col>
@ -90,8 +109,10 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="消毒方式">
<el-input v-model="form.way" placeholder="请输入消毒方式" />
<el-form-item label="消毒方式" prop="way">
<el-select v-model="form.way" clearable placeholder="请选择消毒方式" filterable>
<el-option v-for="item in disinfect_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@ -164,13 +185,15 @@
<el-form ref="editFormRef" :model="editForm" :rules="rules" label-width="100px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="羊舍" >
<el-form-item label="羊舍">
<span>{{ editForm.sheepfoldName }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="消毒日期" prop="datetime">
<el-date-picker v-model="editForm.datetime" type="date" value-format="YYYY-MM-DD" style="width: 100%" />
<el-date-picker v-model="editForm.datetime" type="date" value-format="YYYY-MM-DD"
style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
@ -186,7 +209,9 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="消毒方式">
<el-input v-model="editForm.way" placeholder="请输入消毒方式" />
<el-select v-model="editForm.way" clearable placeholder="请选择消毒方式" filterable>
<el-option v-for="item in disinfect_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@ -208,20 +233,20 @@
</el-table-column>
<el-table-column label="用量" width="160">
<template #default="scope">
<el-input-number v-model="scope.row.dosage" :min="0" :precision="1" />
<el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;" />
</template>
</el-table-column>
<el-table-column label="单位" width="120">
<template #default="scope">
<el-select v-model="scope.row.unit" placeholder="单位">
<el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value" />
<el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value+''" />
</el-select>
</template>
</el-table-column>
<el-table-column label="用法" width="120">
<template #default="scope">
<el-select v-model="scope.row.usageId" placeholder="用法">
<el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value" />
<el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value+''" />
</el-select>
</template>
</el-table-column>
@ -267,8 +292,9 @@ import request from '@/utils/request'
import { parseTime } from '@/utils/ruoyi'
const { proxy } = getCurrentInstance()
const { disinfect_type } = proxy.useDict('disinfect_type')
/* ------------------ 列表 ------------------ */
/* ---------- 列表 ---------- */
const loading = ref(true)
const showSearch = ref(true)
const total = ref(0)
@ -318,13 +344,15 @@ function resetQuery() {
handleQuery()
}
/* ------------------ 新增弹窗 ------------------ */
/* ---------- 新增弹窗 ---------- */
const openAdd = ref(false)
const titleAdd = ref('新增消毒记录')
const form = reactive({
id: null,
technician: '',
datetime: new Date().toISOString().split('T')[0],
datetime: new Date().toISOString().slice(0, 10),
way: '',
ratio: '',
comment: '',
@ -337,7 +365,7 @@ function resetAdd() {
Object.assign(form, {
id: null,
technician: '',
datetime: new Date().toISOString().split('T')[0],
datetime: new Date().toISOString().slice(0, 10),
way: '',
ratio: '',
comment: '',
@ -372,13 +400,13 @@ function submitAdd() {
})
}
/* ------------------ 修改弹窗 ------------------ */
/* ---------- 修改弹窗 ---------- */
const openEdit = ref(false)
const titleEdit = ref('修改消毒记录')
const editForm = reactive({
id: null,
technician: '',
datetime: new Date().toISOString().split('T')[0],
datetime: new Date().toISOString().slice(0, 10),
way: '',
ratio: '',
comment: '',
@ -391,7 +419,7 @@ function resetEdit() {
Object.assign(editForm, {
id: null,
technician: '',
datetime: new Date().toISOString().split('T')[0],
datetime: new Date().toISOString().slice(0, 10),
way: '',
ratio: '',
comment: '',
@ -405,6 +433,8 @@ function handleUpdate(row) {
resetEdit()
const id = row.id || ids.value[0]
getDisinfect(id).then(res => {
// 后端返回的是时间戳，转成 YYYY-MM-DD HH:mm 字符串方便 el-date-picker 回显
editForm.datetime = parseTime(res.data.datetime, '{y}-{m}-{d} {h}:{i}')
Object.assign(editForm, res.data)
editDetails.value = res.data.usageDetails || []
openEdit.value = true
@ -431,7 +461,7 @@ function submitEdit() {
})
}
/* ------------------ 功能 ------------------ */
/* ---------- 功能 ---------- */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除选中的数据？').then(() => delDisinfect(_ids)).then(() => {
@ -444,7 +474,7 @@ function handleExport() {
proxy.download('biosafety/disinfect/export', { ...queryParams }, `disinfect_${Date.now()}.xlsx`)
}
/* ------------------ 下拉数据 ------------------ */
/* ---------- 下拉数据 ---------- */
const barns = ref([])
const presOptions = ref([])
const units = ref([])
@ -454,10 +484,12 @@ const medicines = ref([])
/* 校验规则 */
const rules = {
sheepfoldIds: [{ required: true, message: '请选择羊舍', trigger: 'change' }],
technician: [{ required: true, message: '请输入技术员', trigger: 'blur' }],
way: [{ required: true, message: '请选择消毒方式', trigger: 'change' }],
datetime: [{ required: true, message: '请选择日期', trigger: 'change' }]
}
/* 处方选择事件 - 新增 */
/* 处方选择事件 */
function handleSelectPrescription(id) {
if (!id) return
getPrescription(id).then(res => {
@ -469,8 +501,6 @@ function handleSelectPrescription(id) {
})) || []
})
}
/* 处方选择事件 - 修改 */
function handleSelectPrescriptionEdit(id) {
if (!id) return
getPrescription(id).then(res => {
@ -483,24 +513,22 @@ function handleSelectPrescriptionEdit(id) {
})
}
/* 明细添加行 - 新增 */
/* 明细添加行 */
function handleAddDetail() {
usageDetails.value.push({ mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: null, batchNumber: null })
}
/* 明细添加行 - 修改 */
function handleAddDetailEdit() {
editDetails.value.push({ mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: null, batchNumber: null })
}
/* ------------------ 初始加载 ------------------ */
/* ---------- 初始加载 ---------- */
onMounted(() => {
getList()
/* 加载本地羊舍 */
/* 本地羊舍下拉 */
request({ url: '/sheepfold_management/sheepfold_management/list', method: 'get' }).then(res => {
barns.value = res.rows
})
listPrescription({ status: 1, persType: 1 }).then(res => {
listPrescription({ status: 1, persType: 3 }).then(res => {
presOptions.value = res.rows.map(item => ({ id: item.id, label: item.name }))
})
listUnit().then(res => {

15
src/views/biosafety/health/index.vue
View File

@ -2,13 +2,13 @@
<div class="app-container">
<!-- 1. 搜索 -->
<el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
<el-form-item label="羊只耳号" prop="sheepNo">
<el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
</el-form-item>
<el-form-item label="保健日期">
<el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="羊只耳号" prop="sheepNo">
<el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
</el-form-item>
<el-form-item label="技术员" prop="technical">
<el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
</el-form-item>
@ -29,6 +29,9 @@
<!-- 3. 列表 -->
<el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="保健日期" align="center" prop="datetime" width="180">
<template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
</el-table-column>
<el-table-column label="羊只耳号" align="center" prop="sheepNo" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="羊只类别" align="center" prop="sheepType" />
@ -40,9 +43,7 @@
<el-table-column label="月龄" align="center" prop="monthAge" />
<el-table-column label="胎次" align="center" prop="parity" />
<el-table-column label="繁殖状态" align="center" prop="breed" />
<el-table-column label="保健日期" align="center" prop="datetime" width="180">
<template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
</el-table-column>
<el-table-column label="技术员" align="center" prop="technical" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="操作" align="center" width="200">
@ -122,7 +123,7 @@
</el-table-column>
<el-table-column label="用量" width="160">
<template #default="scope">
<el-input-number v-model="scope.row.dosage" :min="0" :precision="1" />
<el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;" />
</template>
</el-table-column>
<el-table-column label="单位" width="120">

12
src/views/biosafety/immunity/index.vue
View File

@ -2,13 +2,13 @@
<div class="app-container">
<!-- 1. 搜索 -->
<el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
<el-form-item label="羊只耳号" prop="sheepNo">
<el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
</el-form-item>
<el-form-item label="免疫日期">
<el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="羊只耳号" prop="sheepNo">
<el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
</el-form-item>
<el-form-item label="技术员" prop="technical">
<el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
</el-form-item>
@ -29,6 +29,9 @@
<!-- 3. 列表 -->
<el-table v-loading="loading" :data="dewormList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="免疫日期" align="center" prop="datetime" width="180">
<template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
</el-table-column>
<el-table-column label="羊只耳号" align="center" prop="sheepNo" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="羊只类别" align="center" prop="sheepType" />
@ -40,9 +43,6 @@
<el-table-column label="月龄" align="center" prop="monthAge" />
<el-table-column label="胎次" align="center" prop="parity" />
<el-table-column label="繁殖状态" align="center" prop="breed" />
<el-table-column label="免疫日期" align="center" prop="datetime" width="180">
<template #default="scope">{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</template>
</el-table-column>
<el-table-column label="技术员" align="center" prop="technical" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="操作" align="center" width="200">

113
src/views/biosafety/medicine/index.vue
View File

@ -12,7 +12,7 @@
<el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="使用方法" prop="medicType">
<el-form-item label="使用方法" prop="usageId">
<el-select v-model="queryParams.usageId" placeholder="请选择药品使用方法" clearable style="width: 180px">
<el-option v-for="item in usageOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
@ -25,8 +25,7 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['system:medicine:add']">新增</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:medicine:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
@ -36,16 +35,15 @@
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:medicine:remove']">删除</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="medicineList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="" align="center" prop="id" />
<el-table-column label="药品编号" align="center" prop="medica" />
<el-table-column label="药品名称" align="center" prop="name" />
<el-table-column label="药品类型" align="center" prop="medicType" :formatter="formatType"></el-table-column>
<el-table-column label="使用方法" align="center" prop="usage" :formatter="formatUsage"></el-table-column>
<el-table-column label="药品类型" align="center" prop="medicType" :formatter="formatType" />
<el-table-column label="使用方法" align="center" prop="usageId" :formatter="formatUsage" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
@ -58,7 +56,7 @@
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
v-model:limit="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改药品对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
@ -74,13 +72,11 @@
<el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="使用方法" prop="medicType">
<el-form-item label="使用方法" prop="usageId">
<el-select v-model="form.usageId" placeholder="请选择药品使用方法">
<el-option v-for="item in usageOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="comment">
<el-input v-model="form.comment" placeholder="请输入备注" :rows="3" type="textarea" />
</el-form-item>
@ -97,8 +93,9 @@
<script setup name="Medicine">
import { listMedicine, getMedicine, delMedicine, addMedicine, updateMedicine } from "@/api/biosafety/medicine"
import {listType} from "@/api/biosafety/type"
import {listUsage} from "@/api/biosafety/usage"
import { listType } from "@/api/biosafety/type"
import { listUsage } from "@/api/biosafety/usage"
import { ref, reactive, toRefs, getCurrentInstance } from 'vue'
const { proxy } = getCurrentInstance()
@ -122,59 +119,41 @@ const data = reactive({
medicType: null,
usageId: null,
},
rules: {
}
rules: {}
})
const { queryParams, form, rules } = toRefs(data)
// 定义药品类型
const typeOptions = ref()
// 定义药品使用方法
const usageOptions = ref()
// ✅ 默认为空数组，避免 undefined
const typeOptions = ref([])
const usageOptions = ref([])
/* 查询药品类型 */
function getTypeOptions() {
listType().then(response => {
typeOptions.value = response.rows.map(item => ({
typeOptions.value = response.rows?.map(item => ({
value: item.id,
label: item.name
}))
})) || []
})
}
/* 查询药品使用方法 */
function getUsageOptions() {
listUsage().then(response => {
usageOptions.value = response.rows.map(item => ({
usageOptions.value = response.rows?.map(item => ({
value: item.id,
label: item.name
}))
})) || []
})
}
const formatType = (row) => {
let result = ''
for (const item of typeOptions.value) {
if (item.value === row.medicType) {
result = item.label
break
}
}
return result
}
const formatUsage = (row) => {
let result = ''
for (const item of usageOptions.value) {
if (item.value === row.usageId) {
result = item.label
break
}
}
return result
}
/* ✅ 安全的 formatter */
const formatType = (row) =>
(typeOptions.value || []).find(item => item.value === row.medicType)?.label ?? row.medicType
const formatUsage = (row) =>
(usageOptions.value || []).find(item => item.value === row.usageId)?.label ?? row.usageId
/** 查询药品列表 */
function getList() {
@ -185,52 +164,39 @@ function getList() {
loading.value = false
})
}
// 取消按钮
function cancel() {
open.value = false
reset()
}
// 表单重置
function reset() {
form.value = {
id: null,
medica: null,
name: null,
medicType: null,
usage: null,
comment: null
}
form.value = { id: null, medica: null, name: null, medicType: null, usageId: null, comment: null }
proxy.resetForm("medicineRef")
}
/** 搜索按钮操作 */
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
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
@ -241,18 +207,17 @@ function handleUpdate(row) {
})
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["medicineRef"].validate(valid => {
if (valid) {
if (form.value.id != null) {
updateMedicine(form.value).then(response => {
updateMedicine(form.value).then(() => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
getList()
})
} else {
addMedicine(form.value).then(response => {
addMedicine(form.value).then(() => {
proxy.$modal.msgSuccess("新增成功")
open.value = false
getList()
@ -262,25 +227,21 @@ function submitForm() {
})
}
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除药品编号为"' + _ids + '"的数据项？').then(function () {
return delMedicine(_ids)
}).then(() => {
getList()
proxy.$modal.msgSuccess("删除成功")
}).catch(() => { })
proxy.$modal.confirm('是否确认删除药品编号为"' + _ids + '"的数据项？')
.then(() => delMedicine(_ids))
.then(() => {
getList()
proxy.$modal.msgSuccess("删除成功")
})
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('system/medicine/export', {
...queryParams.value
}, `medicine_${new Date().getTime()}.xlsx`)
proxy.download('system/medicine/export', { ...queryParams.value }, `medicine_${new Date().getTime()}.xlsx`)
}
getList()
getTypeOptions()
getUsageOptions()
</script>
</script>

6
src/views/biosafety/prescription/index.vue
View File

@ -51,17 +51,19 @@
<dict-tag :options="pres_type" :value="scope.row.persType" />
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="pres_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300px">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300px">
<template #default="scope">
<el-button link type="primary" icon="View" @click="handleView(scope.row)">详情</el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
<el-button link :type="scope.row.status ? 'warning' : 'primary'" @click="handleStatus(scope.row)">{{ scope.row.status?"禁用":"启用" }}</el-button>
<el-button link :type="scope.row.status ? 'warning' : 'primary'" @click="handleStatus(scope.row)">{{
scope.row.status?"禁用":"启用" }}</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>

216
src/views/biosafety/quarantine/index.vue
View File

@ -2,13 +2,37 @@
<div class="app-container">
<!-- 查询表单 -->
<el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
<el-form-item label="羊只" prop="sheepId">
<el-input v-model="queryParams.sheepId" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
</el-form-item>
<el-form-item label="检疫日期">
<el-date-picker v-model="daterangeDatetime" type="daterange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" value-format="YYYY-MM-DD" />
</el-form-item>
<el-form-item label="检疫项目" prop="quarItem">
<el-select v-model="queryParams.quarItem" placeholder="请选择" filterable clearable style="width: 150px">
<el-option v-for="i in quarantineItems" :key="i.value" :label="i.label" :value="i.value" />
</el-select>
</el-form-item>
<el-form-item label="采样员" prop="sampler">
<el-input v-model="queryParams.sampler" placeholder="请输入采样员名字" clearable @keyup.enter="getList" />
</el-form-item>
<el-form-item label="检疫员" prop="quarOfficer">
<el-input v-model="queryParams.quarOfficer" placeholder="请输入检疫员名字" clearable @keyup.enter="getList" />
</el-form-item>
<el-form-item label="羊只类型" prop="sheepType">
<el-select v-model="queryParams.sheepType" placeholder="请选择" filterable clearable style="width: 150px">
<el-option v-for="i in sheepTypes" :key="i.value" :label="i.makeLabelFormatter" :value="i.label" />
</el-select>
</el-form-item>
<el-form-item label="样品类型" prop="sampleType">
<el-select v-model="queryParams.sampleType" placeholder="请选择" filterable clearable style="width: 150px">
<el-option v-for="i in sampleTypes" :key="i.value" :label="i.label" :value="i.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="getList">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -31,11 +55,13 @@
<!-- 表格 -->
<el-table v-loading="loading" :data="quarantineList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="羊只耳号" align="center" prop="sheepNo" />
<el-table-column label="检疫日期" align="center" prop="datetime" width="180"
:formatter="(_, __, v) => parseTime(v, '{y}-{m}-{d}')" />
<el-table-column label="羊只性别" align="center" prop="gender" >
<template #default="scope"><dict-tag :options="sheep_gender" :value="scope.row.gender" /></template>
<el-table-column label="羊只耳号" align="center" prop="sheepNo" />
<el-table-column label="羊只性别" align="center" prop="gender">
<template #default="scope">
<dict-tag :options="sheep_gender" :value="scope.row.gender" />
</template>
</el-table-column>
<el-table-column label="羊只类别" align="center" prop="sheepType" />
<el-table-column label="月龄" align="center" prop="monthAge" />
@ -45,19 +71,22 @@
<el-table-column label="采样员" align="center" prop="sampler" />
<el-table-column label="检疫员" align="center" prop="quarOfficer" />
<el-table-column label="检疫结果" align="center" prop="result">
<template #default="scope"><dict-tag :options="quar_result" :value="scope.row.result" /></template>
<template #default="scope">
<dict-tag :options="quar_result" :value="scope.row.result" />
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template #default="scope"><dict-tag :options="quar_status" :value="scope.row.status" /></template>
<template #default="scope">
<dict-tag :options="quar_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="操作" align="center" width="200" fixed="right">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['bisosafety:quarantine:edit']">检疫</el-button>
<el-button v-if="String(scope.row.result) === '1'" link type="success" @click="gotoTreatment(scope.row)">
治疗
</el-button>
<el-button v-if="String(scope.row.result) === '1'" link type="success"
@click="gotoTreatment(scope.row)">治疗</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['bisosafety:quarantine:remove']">删除</el-button>
</template>
@ -70,20 +99,25 @@
<!-- 新增弹窗 -->
<el-dialog title="新增检疫记录" v-model="addOpen" width="700px" append-to-body>
<el-form ref="addQuarantineRef" :model="addForm" :rules="addRules" label-width="100px">
<el-form-item label="羊只耳号" prop="sheepIds" required>
<el-form-item label="羊只耳号" prop="sheepList" required>
<el-input v-model="addForm.sheepIdInput" placeholder="输入耳号后回车验证" @keyup.enter="validateSheepId">
<template #suffix>
<div style="display: flex; align-items: center; height: 100%; margin-left: 8px;">
<span v-if="invalidSheepId" style="color: red; font-size: 12px;">耳号不存在</span>
<span v-else-if="validSheepId" style="color: green; font-size: 12px;">已添加</span>
<span v-else-if="alreadySelected" style="color: orange; font-size: 12px;">该羊只已选择</span>
<div style="
display: flex;
align-items: center;
height: 100%;
margin-left: 8px;
">
<span v-if="invalidSheepId" style="color: red; font-size: 12px">耳号不存在</span>
<span v-else-if="validSheepId" style="color: green; font-size: 12px">已添加</span>
<span v-else-if="alreadySelected" style="color: orange; font-size: 12px">该羊只已选择</span>
</div>
</template>
</el-input>
<el-tag v-for="(id, i) in addForm.sheepIds" :key="i" closable @close="addForm.sheepIds.splice(i, 1)"
<el-tag v-for="(item, i) in addForm.sheepList" :key="item.id" closable @close="addForm.sheepList.splice(i, 1)"
style="margin: 5px 5px 0 0">
{{ id }}
{{ item.ear }}
</el-tag>
</el-form-item>
@ -121,22 +155,27 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="采样员" prop="sampler"><el-input v-model="addForm.sampler" /></el-form-item>
<el-form-item label="采样员" prop="sampler">
<el-input v-model="addForm.sampler" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检疫员" prop="quarOfficer"><el-input v-model="addForm.quarOfficer" /></el-form-item>
<el-form-item label="检疫员" prop="quarOfficer">
<el-input v-model="addForm.quarOfficer" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="检疫结果" prop="result">
<el-select v-model="editForm.result" placeholder="检疫结果">
<el-select v-model="addForm.result" placeholder="检疫结果">
<el-option v-for="i in quar_result" :key="i.value" :label="i.label" :value="i.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="22">
<el-form-item label="备注" prop="comment">
@ -153,11 +192,10 @@
</template>
</el-dialog>
<!-- 修改弹窗 -->
<el-dialog title="修改检疫记录" v-model="editOpen" width="560px" append-to-body :lock-scroll="false">
<!-- 2. 表单主体 -->
<el-form ref="editQuarantineRef" :model="editForm" :rules="editRules" label-width="72px" size="default">
<!-- 1. 羊只基本信息（只读） -->
<!-- 羊只基本信息（只读） -->
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="羊只耳号">
@ -176,7 +214,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="月龄">
<span>{{ editForm.monthAge }} </span>
<span>{{ editForm.monthAge }}</span>
</el-form-item>
</el-col>
<el-col :span="24">
@ -243,7 +281,13 @@
</template>
<script setup name="Quarantine">
import { listQuarantine, getQuarantine, delQuarantine, addQuarantine, updateQuarantine } from '@/api/biosafety/quarantine'
import {
listQuarantine,
getQuarantine,
delQuarantine,
addQuarantine,
updateQuarantine
} from '@/api/biosafety/quarantine'
import { listItems } from '@/api/biosafety/items'
import { listSample } from '@/api/biosafety/sample'
import request from '@/utils/request'
@ -251,7 +295,11 @@ import { parseTime } from '@/utils/ruoyi'
import { useRouter } from 'vue-router'
const { proxy } = getCurrentInstance()
const { quar_result, quar_status,sheep_gender} = proxy.useDict('quar_result', 'quar_status',"sheep_gender")
const { quar_result, quar_status, sheep_gender } = proxy.useDict(
'quar_result',
'quar_status',
'sheep_gender'
)
const router = useRouter()
/* 基础数据 */
@ -281,19 +329,31 @@ function handleSelectionChange(sel) {
/* 下拉数据 */
const quarantineItems = ref([])
const sampleTypes = ref([])
const sheepTypes = ref([])
const barns = ref([])
/* 获取基础下拉 */
function getItems() {
listItems().then(res => quarantineItems.value = res.rows.map(i => ({ label: i.name, value: i.id })))
listItems().then(res =>
(quarantineItems.value = res.rows.map(i => ({ label: i.name, value: i.id })))
)
}
function getSample() {
listSample().then(res => sampleTypes.value = res.rows.map(i => ({ label: i.name, value: i.id })))
listSample().then(res =>
(sampleTypes.value = res.rows.map(i => ({ label: i.name, value: i.id })))
)
}
function getBarns() {
request.get('/sheepfold_management/sheepfold_management/list').then(res =>
barns.value = res.rows.map(b => ({ label: b.sheepfoldName, value: b.id }))
)
request
.get('/sheepfold_management/sheepfold_management/list')
.then(res =>
(barns.value = res.rows.map(b => ({ label: b.sheepfoldName, value: b.id })))
)
}
function getSheepType() {
request.get('/base/base/list').then(res => {
sheepTypes.value = res.rows.map(i => ({ label: i.name, value: i.id }))
})
}
/* 列表查询 */
@ -320,7 +380,7 @@ function resetQuery() {
const addOpen = ref(false)
const addForm = ref({})
const addRules = {
sheepIds: [{ required: true, message: '请至少添加一个耳号', trigger: 'blur' }],
sheepList: [{ required: true, message: '请至少添加一个耳号', trigger: 'blur' }],
datetime: [{ required: true, message: '请选择日期', trigger: 'change' }],
quarItem: [{ required: true, message: '请选择项目', trigger: 'change' }],
sampleType: [{ required: true, message: '请选择样品类型', trigger: 'change' }]
@ -329,7 +389,6 @@ const addRules = {
const invalidSheepId = ref(false)
const validSheepId = ref(false)
const alreadySelected = ref(false)
const barnSheepMap = reactive({})
function handleBarnChange(selectedBarnIds) {
@ -341,12 +400,8 @@ function handleBarnChange(selectedBarnIds) {
if (!newBarnIds.includes(barnId)) {
const { tags = [], ids = [] } = barnSheepMap[barnId] || {}
tags.forEach(tag => {
const index = addForm.value.sheepIds.indexOf(tag)
if (index !== -1) addForm.value.sheepIds.splice(index, 1)
})
ids.forEach(id => {
const index = addForm.value.ids.indexOf(id)
if (index !== -1) addForm.value.ids.splice(index, 1)
const index = addForm.value.sheepList.findIndex(s => s.ear === tag)
if (index !== -1) addForm.value.sheepList.splice(index, 1)
})
delete barnSheepMap[barnId]
}
@ -355,23 +410,23 @@ function handleBarnChange(selectedBarnIds) {
// 添加新羊舍的耳号和ID
newBarnIds.forEach(barnId => {
if (!barnSheepMap[barnId]) {
request.get('/sheepfold_management/sheepfold_management/getSheepById', { params: { id: barnId } })
request
.get('/sheepfold_management/sheepfold_management/getSheepById', {
params: { id: barnId }
})
.then(res => {
const sheepList = res.data || []
const tags = sheepList.map(s => s.manageTags)
const ids = sheepList.map(s => s.id)
barnSheepMap[barnId] = {
tags: sheepList.map(s => s.manageTags),
ids: sheepList.map(s => s.id)
}
barnSheepMap[barnId] = { tags, ids }
tags.forEach(tag => {
if (tag && !addForm.value.sheepIds.includes(tag)) {
addForm.value.sheepIds.push(tag)
}
})
ids.forEach(id => {
if (id && !addForm.value.ids.includes(id)) {
addForm.value.ids.push(id)
sheepList.forEach(s => {
if (
s.manageTags &&
!addForm.value.sheepList.some(item => item.id === s.id)
) {
addForm.value.sheepList.push({ id: s.id, ear: s.manageTags })
}
})
})
@ -380,22 +435,22 @@ function handleBarnChange(selectedBarnIds) {
}
function validateSheepId() {
const id = addForm.value.sheepIdInput.trim()
if (!id) return
const ear = addForm.value.sheepIdInput.trim()
if (!ear) return
invalidSheepId.value = false
validSheepId.value = false
alreadySelected.value = false
if (addForm.value.sheepIds.includes(id)) {
if (addForm.value.sheepList.some(s => s.ear === ear)) {
alreadySelected.value = true
addForm.value.sheepIdInput = ''
return
}
request.get(`/sheep/sheep/byManageTags/${id}`).then(res => {
request.get(`/sheep/sheep/byManageTags/${ear}`).then(res => {
if (res.data) {
addForm.value.sheepIds.push(id)
addForm.value.sheepList.push({ id: res.data.id, ear })
validSheepId.value = true
} else {
invalidSheepId.value = true
@ -405,27 +460,26 @@ function validateSheepId() {
}
function submitAddForm() {
addQuarantine(addForm.value).then(() => {
proxy.$modal.msgSuccess('新增成功')
addOpen.value = false
getList()
})
addForm.value.ids = addForm.value.sheepList.map(s => s.id)
addQuarantine(addForm.value).then(() => {
proxy.$modal.msgSuccess('新增成功')
addOpen.value = false
getList()
})
}
function handleAdd() {
Object.assign(addForm.value, {
sheepIds: [],
ids:[],
sheepList: [],
sheepIdInput: '',
datetime: new Date().toISOString().slice(0, 10),
quarItems: '',
quarItem: '',
sampleType: '',
sampler: '',
quarOfficer: '',
result: '',}
)
result: '',
barnIds: []
})
Object.keys(barnSheepMap).forEach(k => delete barnSheepMap[k])
invalidSheepId.value = false
validSheepId.value = false
@ -441,8 +495,9 @@ const editRules = {
quarantineType: [{ required: true, message: '请选择类型', trigger: 'change' }]
}
const editQuarantineRef = ref(null)
function handleUpdate(row) {
Object.assign(editForm.value, row)
Object.assign(editForm.value, row)
editOpen.value = true
}
@ -460,7 +515,8 @@ function submitEditForm() {
/* 删除 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm(`是否确认删除记录编号为"${_ids}"的数据？`)
proxy
.$modal.confirm(`是否确认删除记录编号为"${_ids}"的数据？`)
.then(() => delQuarantine(_ids))
.then(() => {
getList()
@ -470,12 +526,19 @@ function handleDelete(row) {
/* 导出 */
function handleExport() {
proxy.download('bisosafety/quarantine/export', queryParams, `quarantine_${Date.now()}.xlsx`)
proxy.download(
'bisosafety/quarantine/export',
queryParams,
`quarantine_${Date.now()}.xlsx`
)
}
/* 跳转治疗 */
function gotoTreatment(row) {
router.push({ path: '/biosafety/treatment/add', query: { qId: row.id, sId: row.sheepId } })
router.push({
path: '/biosafety/treatment/add',
query: { qId: row.id, sId: row.sheepId }
})
}
/* 初始化 */
@ -483,4 +546,5 @@ getList()
getItems()
getSample()
getBarns()
getSheepType()
</script>

26
src/views/biosafety/treatment/add.vue
View File

@ -147,7 +147,17 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="使用时间" >
<template #default="scope">
<el-date-picker
v-model="scope.row.usetime"
type="date"
placeholder="选择日期"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
style="width: 100%;"/>
</template>
</el-table-column>
<el-table-column label="生产厂家" prop="manufacturer">
<template #default="scope">
<el-input v-model="scope.row.manufacturer" placeholder="请输入生产厂家" style="width:100%" />
@ -175,6 +185,13 @@
<el-input v-model="form.veterinarian" placeholder="请输入兽医姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="治疗状态">
<el-select v-model="form.status" placeholder="请选择治疗状态">
<el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注">
@ -209,6 +226,7 @@ import { ElMessage } from 'element-plus'
import { useRoute, useRouter } from 'vue-router'
const { proxy } = getCurrentInstance()
const { treat_status } = proxy.useDict("treat_status")
const route = useRoute()
const router = useRouter()
@ -346,11 +364,11 @@ const rules = {
}
const swPresDetailList = ref([
{ mediId: null, dosage: 0, unitId: null, usageId: null, manufacturer: '', batchNumber: '' }
{ mediId: null, dosage: 0, unitId: null, usageId: null, usetime: new Date(),manufacturer: '', batchNumber: '' }
])
const handleAddSwPresDetail = () => {
swPresDetailList.value.push({ mediId: null, dosage: 0, unitId: null, usageId: null, manufacturer: '', batchNumber: '' })
swPresDetailList.value.push({ mediId: null, dosage: 0, unitId: null, usageId: null,usetime: new Date(), manufacturer: '', batchNumber: '' })
}
const deletePresDetail = (row) => {
@ -380,6 +398,8 @@ function submitForm() {
dosage: item.dosage,
unit: item.unitId,
usageId: item.usageId,
usetime: item.usetime ? new Date(item.usetime).getTime() : null,
manufacturer: item.manufacturer,
batchNumber: item.batchNumber
}))

171
src/views/biosafety/treatment/index.vue
View File

@ -2,13 +2,18 @@
<div class="app-container">
<!-- 搜索栏 -->
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="羊只耳号" prop="sheepNo">
<el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
</el-form-item>
<el-form-item label="治疗日期" style="width: 308px">
<el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="羊只耳号" prop="sheepNo">
<el-input v-model="queryParams.sheepNo" placeholder="请输入羊只耳号" clearable />
</el-form-item>
<el-form-item label="治疗状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择治疗状态" style="width: 120px;">
<el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value" />
</el-select>
</el-form-item>
<el-form-item label="兽医" prop="veterinary">
<el-input v-model="queryParams.veterinary" placeholder="请输入兽医" clearable />
</el-form-item>
@ -26,6 +31,10 @@
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate">修改</el-button>
</el-col>
<!-- 按钮区域新增“诊疗” -->
<el-col :span="1.5">
<el-button type="info" plain icon="DocumentAdd" @click="handleAddDiagnosis" :disabled="multiple">诊疗</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
</el-col>
@ -38,6 +47,11 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="treatmentList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<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="sheepNo" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="羊只类别" align="center" prop="sheepType" />
@ -49,18 +63,17 @@
<el-table-column label="繁殖状态" align="center" prop="breed" />
<el-table-column label="泌乳天数" align="center" prop="lactDay" />
<el-table-column label="怀孕天数" align="center" prop="gestDay" />
<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="diseaseName" />
<el-table-column label="治疗状态" align="center" prop="treatmentPlan">
<template #default="scope"><dict-tag :options="treat_status" :value="scope.row.status" /></template>
</el-table-column>
<el-table-column label="兽医" align="center" prop="veterinary" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="操作" align="center" width="200" fixed="right">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
<el-button link type="primary" @click="gotDiag(scope.row)">诊断</el-button>
<el-button link type="primary" @click="gotDiag(scope.row)"
v-if="scope.row.status == 0 || scope.row.status == 1">诊断</el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
@ -70,8 +83,8 @@
v-model:limit="queryParams.pageSize" @pagination="getList" />
<!-- 新增弹窗 -->
<el-dialog title="添加治疗记录" v-model="addDialog" width="65%" top="5vh" append-to-body destroy-on-close>
<el-form ref="addFormRef" :model="addForm" :rules="rules" label-width="140px" size="large">
<el-dialog title="添加治疗记录" v-model="addDialog" width="70%" top="5vh" append-to-body destroy-on-close>
<el-form ref="addFormRef" :model="addForm" :rules="rules" label-width="80px" size="large">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="羊只耳号" required>
@ -133,16 +146,16 @@
<el-table-column label="序号" width="60">
<template #default="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column label="药品">
<el-table-column label="药品" width="160px">
<template #default="scope">
<el-select v-model="scope.row.mediId" filterable placeholder="请选择药品">
<el-option v-for="m in medicines" :key="m.value" :label="m.label" :value="m.value" />
</el-select>
</template>
</el-table-column>
<el-table-column label="用量">
<el-table-column label="用量" width="160px">
<template #default="scope">
<el-input-number v-model="scope.row.dosage" :min="0" :precision="1" />
<el-input-number v-model="scope.row.dosage" :min="0" :precision="1" style="width: 120px;"/>
</template>
</el-table-column>
<el-table-column label="单位">
@ -159,12 +172,18 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="生产厂家">
<el-table-column label="使用时间" width="160px">
<template #default="scope">
<el-date-picker v-model="scope.row.usetime" type="date" placeholder="选择日期" format="YYYY-MM-DD"
value-format="YYYY-MM-DD" style="width:100%;" />
</template>
</el-table-column>
<el-table-column label="生产厂家" width="160px">
<template #default="scope">
<el-input v-model="scope.row.manufacturer" placeholder="生产厂家" />
</template>
</el-table-column>
<el-table-column label="生产批号">
<el-table-column label="生产批号" width="160px">
<template #default="scope">
<el-input v-model="scope.row.batchNumber" placeholder="批号" />
</template>
@ -182,6 +201,13 @@
<el-input v-model="addForm.veterinarian" placeholder="请输入兽医姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="治疗状态">
<el-select v-model="addForm.status" placeholder="请选择治疗状态">
<el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注">
@ -199,7 +225,7 @@
<!-- 修改弹窗 -->
<el-dialog title="修改治疗记录" v-model="editDialog" width="70%" top="5vh" append-to-body destroy-on-close>
<el-form ref="editFormRef" :model="editForm" :rules="rules" label-width="140px" size="large">
<el-form ref="editFormRef" :model="editForm" :rules="rules" label-width="80px" size="large">
<!-- 羊只基本信息展示（只读） -->
<el-row :gutter="20">
<el-col :span="6">
@ -261,14 +287,14 @@
<el-date-picker v-model="editForm.datetime" type="date" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="处方">
<el-select v-model="selectedPresId" filterable clearable placeholder="请选择处方" style="width: 100%"
@change="handleSelectPrescription">
<el-option v-for="item in presOptions" :key="item.id" :label="item.label" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row :gutter="20">
@ -313,23 +339,29 @@
<el-table-column label="单位">
<template #default="scope">
<el-select v-model="scope.row.unit" placeholder="单位">
<el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value" />
<el-option v-for="u in units" :key="u.value" :label="u.label" :value="u.value + ''" />
</el-select>
</template>
</el-table-column>
<el-table-column label="使用方法">
<template #default="scope">
<el-select v-model="scope.row.usageId" placeholder="用法">
<el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value" />
<el-option v-for="u in usages" :key="u.value" :label="u.label" :value="u.value + ''" />
</el-select>
</template>
</el-table-column>
<el-table-column label="生产厂家">
<el-table-column label="使用时间" width="160px">
<template #default="scope">
<el-date-picker v-model="scope.row.usetime" type="date" placeholder="选择日期" format="YYYY-MM-DD"
value-format="YYYY-MM-DD" style="width: 100%;" />
</template>
</el-table-column>
<el-table-column label="生产厂家" width="160px">
<template #default="scope">
<el-input v-model="scope.row.manufacturer" placeholder="生产厂家" />
</template>
</el-table-column>
<el-table-column label="生产批号">
<el-table-column label="生产批号" width="160px">
<template #default="scope">
<el-input v-model="scope.row.batchNumber" placeholder="批号" />
</template>
@ -347,6 +379,13 @@
<el-input v-model="editForm.veterinarian" placeholder="请输入兽医姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="治疗状态">
<el-select v-model="editForm.status" placeholder="请选择治疗状态">
<el-option v-for="u in treat_status" :key="u.value" :label="u.label" :value="u.value + ''" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注">
@ -354,6 +393,7 @@
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="editDialog = false">取 消</el-button>
@ -361,6 +401,32 @@
</div>
</template>
</el-dialog>
<!-- 新增诊疗弹窗 -->
<el-dialog title="新增诊疗记录" v-model="diagnosisDialog" width="50%" append-to-body destroy-on-close>
<el-form label-width="120px">
<el-form-item label="选中羊只">
<el-tag v-for="no in selectedSheepNos" :key="no" style="margin-right: 5px">{{ no }}</el-tag>
</el-form-item>
<el-form-item label="治疗日期" prop="datetime">
<el-date-picker v-model="addDia.datetime" type="date" style="width: 100%" />
</el-form-item>
<el-form-item label="诊疗结果" prop="result">
<el-select v-model="addDia.result" placeholder="请选择治疗结果" style="width: 100%;">
<el-option v-for="item in diag_result" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="转入羊舍" prop="sheepfoldId">
<el-select v-model="addDia.sheepfoldId" filterable placeholder="请选择转入羊舍" style="width: 100%;">
<el-option v-for="item in sheepfolds" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="diagnosisDialog = false">取消</el-button>
<el-button type="primary" @click="submitDiagnosis">确认</el-button>
</template>
</el-dialog>
</div>
</template>
@ -369,6 +435,7 @@
import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
import { listTreatment, getTreatment, delTreatment, addTreatment, updateTreatment } from '@/api/biosafety/treatment'
import { listDisease } from '@/api/biosafety/disease'
import { listSheepfold_management } from "@/api/fileManagement/sheepfold_management"
import { listPrescription, getPrescription } from '@/api/biosafety/prescription'
import { listUnit } from '@/api/biosafety/unit'
import { listUsage } from '@/api/biosafety/usage'
@ -379,7 +446,8 @@ import { useRouter } from 'vue-router'
const router = useRouter()
const { proxy } = getCurrentInstance()
const { sheep_gender } = proxy.useDict("sheep_gender")
const { sheep_gender, diag_result, treat_status } = proxy.useDict("sheep_gender", "diag_result", "treat_status")
/* ---------- 列表区域 ---------- */
const treatmentList = ref([])
@ -390,6 +458,7 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const daterangeDatetime = ref([])
const sheepfolds = ref([])
const queryParams = reactive({
pageNum: 1,
@ -421,6 +490,7 @@ const addForm = reactive({
diseasePid: null,
diseaseId: null,
veterinarian: '',
stats: '',
comment: ''
})
@ -438,6 +508,7 @@ const editForm = reactive({
sheepType: '',
monthAge: '',
gender: '',
status: '',
parity: '',
breed: '',
lactDay: '',
@ -451,9 +522,44 @@ const rules = {
}
const swPresDetailList = ref([
{ mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: '', batchNumber: '' }
{ mediId: null, dosage: 0, unit: null, usageId: null, usetime: new Date().toISOString().slice(0, 10), manufacturer: '', batchNumber: '' }
])
/* ---------- 新增诊疗 ---------- */
const diagnosisDialog = ref(false)
const selectedSheepNos = ref([])
const addDia = reactive({
sheepfoldId: null,
result: null,
datetime: new Date().toISOString().slice(0, 10)
})
function handleAddDiagnosis() {
if (!ids.value.length) {
proxy.$modal.msgWarning('请至少选择一条治疗记录')
return
}
selectedSheepNos.value = treatmentList.value
.filter(item => ids.value.includes(item.id))
.map(item => item.sheepNo)
diagnosisDialog.value = true
}
function submitDiagnosis() {
const data = {
treatIds: ids.value,
result: addDia.result,
datetime: addDia.datetime,
sheepfoldId: addDia.sheepfoldId
}
request.post('/diagnosis/diagnosis/adds', data).then(() => {
proxy.$modal.msgSuccess('诊疗成功')
diagnosisDialog.value = false
getList()
})
}
/* ---------- 列表查询 ---------- */
function getList() {
loading.value = true
@ -498,7 +604,15 @@ function handleSelectPrescription(id) {
/* ---------- 药品明细 ---------- */
function handleAddSwPresDetail() {
swPresDetailList.value.push({ mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: '', batchNumber: '' })
swPresDetailList.value.push({
mediId: null,
dosage: 0,
unit: null,
usageId: null,
usetime: new Date().toISOString().slice(0, 10),
manufacturer: '',
batchNumber: ''
})
}
function deletePresDetail(row) {
swPresDetailList.value.splice(swPresDetailList.value.indexOf(row), 1)
@ -572,6 +686,7 @@ function handleUpdate(row) {
gender: res.data.gender,
parity: res.data.parity,
breed: res.data.breed,
status: res.data.status,
lactDay: res.data.lactDay,
gestDay: res.data.gestDay
})
@ -668,6 +783,8 @@ onMounted(() => {
listMedicine().then(res => {
medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
})
listSheepfold_management().then(res => {
sheepfolds.value = res.rows.map(item => ({ id: item.id, name: item.sheepfoldName }))
})
})
</script>

294
src/views/biosafety/usageInfo/index.vue
View File

@ -1,117 +1,217 @@
<template>
<div class="app-container">
<!-- 搜索表单 -->
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form
ref="queryRef"
:model="queryParams"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<!-- 使用日期（新增） -->
<el-form-item label="使用日期" style="width: 308px">
<el-date-picker
v-model="daterangeUseTime"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
/>
</el-form-item>
<!-- 创建日期（原有） -->
<el-form-item label="创建时间" style="width: 308px">
<el-date-picker
v-model="daterangeCreateTime"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
/>
</el-form-item>
<el-form-item label="羊只耳号" prop="sheepNo">
<el-input
v-model="queryParams.sheepNo"
placeholder="羊只耳号"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="使用名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入使用名称" clearable @keyup.enter="handleQuery" />
<el-input
v-model="queryParams.name"
placeholder="请输入使用名称"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="使用类型" prop="useType">
<el-select v-model="queryParams.useType" placeholder="请选择使用类型" clearable style="width: 180px">
<el-option v-for="dict in pres_type" :key="dict.value" :label="dict.label" :value="dict.value" />
<el-select
v-model="queryParams.useType"
placeholder="请选择使用类型"
clearable
style="width: 180px"
>
<el-option
v-for="dict in pres_type"
: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="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['biosafety:usage:export']">导出</el-button>
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['biosafety:usage:export']"
>
导出
</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
</el-row>
<!-- 数据表格 -->
<el-table v-loading="loading" :data="usageList" @selection-change="handleSelectionChange">
<el-table
v-loading="loading"
:data="usageList"
@selection-change="handleSelectionChange"
>
<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="name" />
<el-table-column label="羊只耳号" align="center" prop="sheepNo" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="使用类型" align="center" prop="useType">
<template #default="scope">
<dict-tag :options="pres_type" :value="scope.row.useType" />
</template>
</el-table-column>
<el-table-column label="使用时间" align="center" prop="createTime" width="180">
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180"
>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template #default="scope">
<el-button link type="primary" icon="View" @click="handleDetail(scope.row)"
v-hasPermi="['biosafety:usage:query']">详情</el-button>
<!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['biosafety:usage:remove']">删除</el-button> -->
<el-button
link
type="primary"
icon="View"
@click="handleDetail(scope.row)"
v-hasPermi="['biosafety:usage:query']"
>
详情
</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="680px" top="8vh" append-to-body :close-on-click-modal="false"
class="usage-detail-dialog">
<!-- 详情弹窗（保持不变） -->
<el-dialog
:title="title"
v-model="open"
width="680px"
top="8vh"
append-to-body
:close-on-click-modal="false"
class="usage-detail-dialog"
>
<!-- 基础信息 -->
<el-card shadow="never" class="detail-card">
<template #header>
<div class="card-header">
<el-icon>
<Document />
</el-icon> 基本信息
<el-icon><Document /></el-icon> 基本信息
</div>
</template>
<el-descriptions :column="2" border>
<el-descriptions-item label="使用名称">
{{ form.name }}
</el-descriptions-item>
<el-descriptions-item label="使用名称">{{ form.name }}</el-descriptions-item>
<el-descriptions-item label="使用类型">
<el-tag size="small" :type="form.useType === 1 ? 'primary' : 'success'">
{{pres_type.find(it => it.value === form.useType)?.label || ''}}
<el-tag
size="small"
:type="form.useType === 1 ? 'primary' : 'success'"
>
{{ pres_type.find(it => it.value === form.useType)?.label || '' }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="使用时间" :span="2">
{{ parseTime(form.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
{{ parseTime(form.createTime, '{y}-{m}-{d} {h}:{i}') }}
</el-descriptions-item>
</el-descriptions>
</el-card>
<!-- 药品明细 -->
<el-card shadow="never" class="detail-card" style="margin-top: 16px;">
<el-card shadow="never" class="detail-card" style="margin-top: 16px">
<template #header>
<div class="card-header">
<el-icon>
<List />
</el-icon> 药品使用明细
<el-icon><List /></el-icon> 药品使用明细
</div>
</template>
<el-table :data="swMedicineUsageDetailsList" stripe size="small"
:row-class-name="rowSwMedicineUsageDetailsIndex" style="width: 100%">
<el-table
:data="swMedicineUsageDetailsList"
stripe
size="small"
:row-class-name="rowSwMedicineUsageDetailsIndex"
style="width: 100%"
>
<el-table-column label="药品" prop="mediName" show-overflow-tooltip />
<el-table-column label="用量" prop="dosage" width="80" />
<el-table-column label="单位" prop="unit" align="center" :formatter="formatUnit" />
<el-table-column label="使用方法" align="center" prop="usageId" :formatter="formatUsage" />
<el-table-column v-if="form.useType==4" label="使用时间" align="center" prop="useTime" width="120">
<template #default="scope">
<span>{{ parseTime(scope.row.usetime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="生产厂家" prop="manufacturer" show-overflow-tooltip />
<el-table-column label="生产批号" prop="batchNumber" width="120" />
</el-table>
</el-card>
<!-- 底部按钮 -->
<template #footer>
<el-button @click="cancel">关 闭</el-button>
</template>
@ -120,10 +220,10 @@
</template>
<script setup name="Usage">
import { listUsageInfo, getUsageInfo, delUsageInfo } from '@/api/biosafety/usageInfo'
import { listUsageInfo, getUsageInfo } from '@/api/biosafety/usageInfo'
import { listUnit } from '@/api/biosafety/unit'
import { listUsage } from '@/api/biosafety/usage'
import { getCurrentInstance, reactive, ref, toRefs } from 'vue'
import { listUnit } from "@/api/biosafety/unit"
import { listUsage } from "@/api/biosafety/usage"
const { proxy } = getCurrentInstance()
const { pres_type } = proxy.useDict('pres_type')
@ -133,10 +233,10 @@ const swMedicineUsageDetailsList = ref([])
const open = ref(false)
const loading = ref(true)
const showSearch = ref(true)
const ids = ref([])
const total = ref(0)
const title = ref('')
const daterangeCreateTime = ref([])
const daterangeUseTime = ref([]) // 新增
const data = reactive({
form: {},
@ -151,63 +251,46 @@ const data = reactive({
})
const { queryParams, form, rules } = toRefs(data)
const units = ref([])
const usages = ref([])
const units = ref([]) // 单位下拉选项
const usages = ref([]) // 使用方法下拉选项
/**
* 获取单位下拉数据源（单位字典）
* 将返回数据转换成 { value, label } 结构，供 el-option 使用
*/
/* 获取单位 */
function getUnit() {
listUnit().then(response => {
units.value = response.rows.map(item => ({
value: item.id,
label: item.name
}))
listUnit().then(res => {
units.value = res.rows.map(item => ({ value: item.id, label: item.name }))
})
}
/**
* 获取处方使用方法下拉数据源
* 将返回数据转换成 { value, label } 结构，供 el-option 使用
*/
/* 获取使用方法 */
function getUsageOptions() {
listUsage().then(response => {
usages.value = response.rows.map(item => ({
value: item.id,
label: item.name
}))
listUsage().then(res => {
usages.value = res.rows.map(item => ({ value: item.id, label: item.name }))
})
}
/**
* 格式化使用方法
* 根据 usageId 查找对应的使用方法名称
*/
/* 格式化单位 */
function formatUnit(row) {
const unit = units.value.find(u => String(u.value) === String(row.unit))
return unit?.label ?? ''
}
/* 格式化使用方法 */
function formatUsage(row) {
const usage = usages.value.find(item => String(item.value) === String(row.usageId))
const usage = usages.value.find(u => String(u.value) === String(row.usageId))
return usage?.label ?? ''
}
/**
* 格式化单位
* 根据 unit 查找对应的单位名称
*/
function formatUnit(row) {
const unit = units.value.find(item => String(item.value) === String(row.unit))
return unit?.label ?? ''
}
/* 查询列表 */
function getList() {
loading.value = true
queryParams.value.params = {}
if (daterangeCreateTime.value && daterangeCreateTime.value.length === 2) {
queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
}
if (daterangeUseTime.value && daterangeUseTime.value.length === 2) {
queryParams.value.params.beginUseTime = daterangeUseTime.value[0]
queryParams.value.params.endUseTime = daterangeUseTime.value[1]
}
listUsageInfo(queryParams.value).then(res => {
usageList.value = res.rows
total.value = res.total
@ -225,19 +308,17 @@ function reset() {
}
swMedicineUsageDetailsList.value = []
}
function cancel() {
open.value = false
reset()
}
function handleQuery() {
queryParams.value.pageNum = 1
getList()
}
function resetQuery() {
daterangeCreateTime.value = []
daterangeUseTime.value = [] // 新增
proxy.resetForm('queryRef')
handleQuery()
}
@ -251,33 +332,24 @@ function handleDetail(row) {
title.value = '药品使用记录详情'
})
}
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm(`是否确认删除药品使用记录编号为"${_ids}"的数据项？`).then(() => {
return delUsageInfo(_ids)
}).then(() => {
getList()
proxy.$modal.msgSuccess('删除成功')
})
}
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id)
}
function rowSwMedicineUsageDetailsIndex({ row, rowIndex }) {
row.index = rowIndex + 1
function rowSwMedicineUsageDetailsIndex({ rowIndex }) {
return `row-${rowIndex}`
}
function handleExport() {
proxy.download('biosafety/usageInfo/export', { ...queryParams.value }, `usage_${new Date().getTime()}.xlsx`)
proxy.download(
'biosafety/usageInfo/export',
{ ...queryParams.value },
`usage_${new Date().getTime()}.xlsx`
)
}
/* 初始化 */
getList()
getUnit() // 获取单位下拉数据源
getUsageOptions() // 获取使用方法下拉数据源
getUnit()
getUsageOptions()
</script>
<style scoped>
@ -285,14 +357,12 @@ getUsageOptions() // 获取使用方法下拉数据源
border-radius: 6px;
margin: 0;
}
.usage-detail-dialog .card-header {
display: flex;
align-items: center;
font-weight: 600;
color: #303133;
}
.usage-detail-dialog .card-header .el-icon {
margin-right: 6px;
}

145
src/views/breed/lambing_records/index.vue
View File

@ -155,17 +155,46 @@
/>
<!-- 添加或修改产羔记录对话框 -->
<el-dialog :title="title" v-model="open" width="800px" append-to-body>
<el-dialog :title="title" v-model="open" width="900px" append-to-body>
<el-form ref="lambing_recordsRef" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="羊只id" prop="sheepId">
<el-input v-model="form.sheepId" placeholder="请输入羊只id" />
<el-form-item label="母羊耳号" prop="femaleEarNumber">
<el-input
v-model="form.femaleEarNumber"
placeholder="请输入母羊耳号"
@blur="handleEarNumberBlur"
@input="handleEarNumberInput"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="胎次" prop="parity">
<el-input v-model="form.parity" placeholder="请输入胎次" />
<el-input v-model="form.parity" placeholder="请输入胎次" readonly />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="公羊耳号" prop="maleEarNumber">
<el-input v-model="form.maleEarNumber" placeholder="公羊耳号" readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="配种日期" prop="breedingDate">
<el-input v-model="form.breedingDate" placeholder="配种日期" readonly />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="怀孕天数" prop="pregnancyDays">
<el-input v-model="form.pregnancyDays" placeholder="怀孕天数" readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" />
</el-form-item>
</el-col>
</el-row>
@ -187,32 +216,27 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产羔评分" prop="score">
<el-input v-model.number="form.score" placeholder="请输入产羔评分" type="number" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="创建日期" prop="createTime">
<el-form-item label="产羔日期" prop="createTime">
<el-date-picker
clearable
v-model="form.createTime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择创建日期">
placeholder="请选择产羔日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注" prop="comment">
<el-input v-model="form.comment" placeholder="请输入备注" />
<el-input v-model="form.comment" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
@ -351,7 +375,7 @@
</template>
<script setup name="Lambing_records">
import { listLambing_records, getLambing_records, delLambing_records, addLambing_records, updateLambing_records, getLambDetail, getVarietyList } from "@/api/breed/lambing_records"
import { listLambing_records, getLambing_records, delLambing_records, addLambing_records, updateLambing_records, getLambDetail, getVarietyList, getBreedingInfo } from "@/api/breed/lambing_records"
const { proxy } = getCurrentInstance()
@ -391,8 +415,8 @@ const data = reactive({
breedingDate: []
},
rules: {
sheepId: [
{ required: true, message: "羊只id不能为空", trigger: "blur" }
femaleEarNumber: [
{ required: true, message: "母羊耳号不能为空", trigger: "blur" }
],
lambsBorn: [
{ required: true, message: "产羔数量不能为空", trigger: "blur" }
@ -405,10 +429,9 @@ const { queryParams, form, rules } = toRefs(data)
/** 获取品种列表 */
function getVarietyData() {
return getVarietyList().then(response => {
console.log('品种列表数据:', response) // 调试日志
console.log('品种列表数据:', response)
varietyList.value = response.rows || []
console.log('处理后的品种列表:', varietyList.value) // 调试日志
console.log('第一个品种数据结构:', varietyList.value[0]) // 查看字段结构
console.log('处理后的品种列表:', varietyList.value)
}).catch(error => {
console.error('获取品种列表失败:', error)
varietyList.value = []
@ -418,24 +441,21 @@ function getVarietyData() {
/** 根据品种ID获取品种名称 */
function getVarietyName(varietyId) {
if (!varietyId) return '-'
// 确保varietyId是数字类型
const id = typeof varietyId === 'string' ? parseInt(varietyId) : varietyId
const variety = varietyList.value.find(item => item.id === id)
return variety ? variety.variety : `未知品种(${varietyId})` // 使用 variety 字段
return variety ? variety.variety : `未知品种(${varietyId})`
}
/** 性别转换函数 - 前端显示转后端数值 */
function genderToNumber(gender) {
if (gender === 'male') return 0
if (gender === 'female') return 1
if (gender === 'male') return 1
if (gender === 'female') return 0
return gender
}
/** 性别显示函数 - 后端数值转前端显示 */
function getGenderDisplay(gender) {
if (gender === 0 || gender === 'male') {
if (gender === 2 || gender === 'male') {
return { label: '公', type: 'primary' }
} else if (gender === 1 || gender === 'female') {
return { label: '母', type: 'success' }
@ -443,6 +463,53 @@ function getGenderDisplay(gender) {
return { label: '未知', type: 'info' }
}
/** 母羊耳号输入处理 */
function handleEarNumberInput() {
// 清空相关联动字段
form.value.sheepId = null
form.value.parity = null
form.value.maleEarNumber = null
form.value.breedingDate = null
form.value.pregnancyDays = null
form.value.technician = null
}
/** 母羊耳号失焦处理 - 自动查询配种信息 */
function handleEarNumberBlur() {
const earNumber = form.value.femaleEarNumber
if (!earNumber || earNumber.trim() === '') {
return
}
// 调用API查询配种信息
getBreedingInfo(earNumber.trim()).then(response => {
if (response.code === 200 && response.data) {
const breedingData = response.data
// 填充表单数据
form.value.sheepId = breedingData.sheep_id
form.value.parity = breedingData.parity
form.value.maleEarNumber = breedingData.male_ear_number || '未找到公羊'
form.value.breedingDate = breedingData.breeding_date
form.value.pregnancyDays = breedingData.pregnancy_days
form.value.technician = breedingData.technician || ''
proxy.$modal.msgSuccess("已自动填充配种信息")
} else {
proxy.$modal.msgWarning(response.msg || "未找到该母羊的配种记录")
// 清空相关字段
form.value.sheepId = null
form.value.parity = null
form.value.maleEarNumber = null
form.value.breedingDate = null
form.value.pregnancyDays = null
}
}).catch(error => {
console.error('查询配种信息失败:', error)
proxy.$modal.msgError("查询配种信息失败")
})
}
/** 查询产羔记录列表 */
function getList() {
loading.value = true
@ -463,8 +530,12 @@ function cancel() {
function reset() {
form.value = {
id: null,
femaleEarNumber: null,
sheepId: null,
parity: null,
maleEarNumber: null,
breedingDate: null,
pregnancyDays: null,
lambsBorn: null,
survival: null,
technician: null,
@ -523,13 +594,13 @@ function handleLambsBornChange() {
if (count > 0 && count <= 10) { // 限制最大数量
showLambForms.value = true
lambForms.value = Array.from({ length: count }, (_, index) => ({
lambEarNumber: '', // 对应ScLambDetail.lambEarNumber
gender: '', // 对应ScLambDetail.gender
isRetained: false, // 对应ScLambDetail.isRetained
birthWeight: null, // 对应ScLambDetail.birthWeight
lambBreed: null, // 对应ScLambDetail.lambBreed（品种ID，设置为null显示placeholder）
lineage: '', // 对应ScLambDetail.lineage
birthday: '' // 对应ScLambDetail.birthday
lambEarNumber: '',
gender: '',
isRetained: false,
birthWeight: null,
lambBreed: null,
lineage: '',
birthday: ''
}))
} else {
showLambForms.value = false
@ -542,7 +613,6 @@ function handleLambDetail(row) {
detailData.value = row
// 调用API获取羔羊详情列表
getLambDetail(row.id).then(response => {
// 后端返回的是ScLambDetail对象列表，字段名称已经匹配
lambDetailList.value = response.data || []
detailOpen.value = true
})
@ -577,7 +647,7 @@ function submitForm() {
if (lamb.birthWeight && typeof lamb.birthWeight === 'string') {
lamb.birthWeight = parseFloat(lamb.birthWeight)
}
// 性别转换：'male' -> 0, 'female' -> 1
// 性别转换：'male' -> 1, 'female' -> 0
lamb.gender = genderToNumber(lamb.gender)
// 品种ID已经是数字，无需转换
})
@ -602,7 +672,6 @@ function submitForm() {
})
}
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value

298
src/views/feed/FeedList/index.vue Normal file
View File

@ -0,0 +1,298 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="配方编号" prop="formulaId">
<el-input v-model="queryParams.formulaId" placeholder="请输入配方编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="饲草班人员" prop="zookeeper">
<el-input v-model="queryParams.zookeeper" placeholder="请输入饲草班人员" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="配料日期" prop="deployDate">
<el-date-picker clearable v-model="queryParams.deployDate" 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="['feed:FeedList:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['feed:FeedList:edit']">修改</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['feed:FeedList:remove']">删除</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['feed:FeedList:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="FeedListList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="序号" type="index" width="60" align="center" prop="id" /> -->
<el-table-column label="配方编号" align="center" prop="formulaId" />
<el-table-column label="配方批号" align="center" prop="formulaBatchId" />
<el-table-column label="饲草班人员" align="center" prop="zookeeper" />
<el-table-column label="计划日期" align="center" prop="rootPlan.planDate" width="180">
<template #default="scope">
<!-- <span>{{ parseTime(scope.row.rootPlan.planDate, '{y}-{m}-{d}') }}</span> -->
<span>{{ scope.row.rootPlan ? parseTime(scope.row.rootPlan.planDate, '{y}-{m}-{d}') : '' }}</span>
</template>
</el-table-column>
<el-table-column label="配料日期" align="center" prop="deployDate" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.deployDate, '{y}-{m}-{d}') }}</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="View" @click="handleView(scope.row)">详情</el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['feed:FeedList:edit']">修改</el-button>
<!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['feed:FeedList: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
v-if="openModel === 'add' || openModel === 'edit'">
<el-form ref="FeedListRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="饲草班人员" prop="zookeeper">
<el-input v-model="form.zookeeper" placeholder="请输入饲草班人员名称" />
</el-form-item>
<el-form-item label="配料日期" prop="deployDate">
<el-date-picker clearable v-model="form.deployDate" type="date" value-format="YYYY-MM-DD"
placeholder="请选择配料日期">
</el-date-picker>
</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>
<!-- 弹框：详情/修改 -->
<el-dialog :title="title" v-model="open" width="60%" append-to-body v-if="openModel === 'view'">
<!-- 详情页：只读展示 -->
<div style="padding-bottom:20px ;">
<el-descriptions :column="2" border>
<el-descriptions-item label="配方编号">{{ showFeedList.formulaId }}</el-descriptions-item>
<el-descriptions-item label="配方批号">{{ showFeedList.formulaBatchId }}</el-descriptions-item>
<el-descriptions-item label="饲养阶段">{{ showFeedList.rootFormula.feedStage }}</el-descriptions-item>
</el-descriptions>
<el-divider content-position="left">配料列表</el-divider>
<el-table :data="showFeedList.formulaList" stripe border style="width: 100%" max-height="300">
<el-table-column label="序号" type="index" width="60" align="center" />
<!-- <el-table-column label="原料编号" prop="materialId" align="center" /> -->
<el-table-column label="原料" align="center">
<el-table-column label="名称" prop="materialName" align="center" />
<el-table-column label="类型" align="center" prop="isGranular">
<template #default="scope">
<dict-tag :options="material_type" :value="scope.row.isGranular" />
</template>
</el-table-column>
</el-table-column>
<el-table-column label="配量" align="center" prop="ratio">
<el-table-column label="上午" align="center" prop="ratio">
<template #default="scope">
{{ (scope.row.ratio / 100 * showFeedList.rootPlan.planMorningSize).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="中午" align="center" prop="ratio">
<template #default="scope">
{{ (scope.row.ratio / 100 * showFeedList.rootPlan.planNoonSize).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="下午" align="center" prop="ratio">
<template #default="scope">
{{ (scope.row.ratio / 100 * showFeedList.rootPlan.planAfternoonSize).toFixed(2) }}
</template>
</el-table-column>
</el-table-column>
<el-table-column label="类型" prop="isSupplement" align="center">
<template #default="scope">
<dict-tag :options="materialType" :value="scope.row.isSupplement" />
</template>
</el-table-column>
</el-table>
</div>
</el-dialog>
</template>
<script setup name="FeedList">
import { listFeedList, getFeedList, delFeedList, addFeedList, updateFeedList } from "@/api/feed/FeedList"
const { proxy } = getCurrentInstance()
const FeedListList = 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,
formulaId: null,
zookeeper: null,
deployDate: null
},
rules: {
}
})
const { queryParams, form, rules } = toRefs(data)
const showFeedList = ref({})
const openModel = ref("")
// 原料类型字典
const { material_type } = proxy.useDict('material_type')
// 原料类型
const materialType = [
{ value: '1', label: '补饲原料' },
{ value: '0', label: '原料' }
]
function handleView(row) {
showFeedList.value = row
open.value = true
openModel.value = "view"
title.value = "配料清单详情"
console.log("查看配料清单", row)
}
/** 查询配料清单列表 */
function getList() {
loading.value = true
listFeedList(queryParams.value).then(response => {
FeedListList.value = response.rows
total.value = response.total
loading.value = false
})
}
// 取消按钮
function cancel() {
open.value = false
reset()
}
// 表单重置
function reset() {
form.value = {
id: null,
formulaId: null,
formulaBatchId: null,
zookeeper: null,
deployDate: null
}
proxy.resetForm("FeedListRef")
}
/** 搜索按钮操作 */
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
console.log("HandleUpdate => 配料清单ID =>", _id)
getFeedList(_id).then(response => {
form.value = response.data
open.value = true
openModel.value = "edit"
title.value = "修改配料清单"
})
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["FeedListRef"].validate(valid => {
if (valid) {
if (form.value.id != null) {
updateFeedList(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
getList()
})
} else {
addFeedList(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 delFeedList(_ids)
}).then(() => {
getList()
proxy.$modal.msgSuccess("删除成功")
}).catch(() => { })
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('feed/FeedList/export', {
...queryParams.value
}, `FeedList_${new Date().getTime()}.xlsx`)
}
getList()
</script>

598
src/views/feed/FeedPlan/index.vue
View File

@ -2,36 +2,10 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="配方编码" prop="formulaId">
<el-input
v-model="queryParams.formulaId"
placeholder="请输入配方编码"
clearable
@keyup.enter="handleQuery"
/>
<el-input v-model="queryParams.formulaId" placeholder="请输入配方编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="羊舍" prop="sheepHouseId">
<el-input
v-model="queryParams.sheepHouseId"
placeholder="请输入羊舍"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="饲草班人员" prop="zookeeper">
<el-input
v-model="queryParams.zookeeper"
placeholder="请输入饲草班人员"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="饲喂计划日期" prop="planDate">
<el-date-picker clearable
v-model="queryParams.planDate"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择饲喂计划日期">
</el-date-picker>
<el-input v-model="queryParams.sheepHouseId" placeholder="请输入羊舍" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -41,42 +15,19 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['feed:FeedPlan:add']"
>新增</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['feed:FeedPlan:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['feed:FeedPlan:edit']"
>修改</el-button>
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['feed:FeedPlan:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['feed:FeedPlan:remove']"
>删除</el-button>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['feed:FeedPlan:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['feed:FeedPlan:export']"
>导出</el-button>
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['feed:FeedPlan:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -85,93 +36,120 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="创建日期" align="center" prop="createDate" />
<el-table-column label="配方编码" align="center" prop="formulaId" />
<el-table-column label="批号" align="center" prop="batchId" />
<el-table-column label="羊舍" align="center" prop="sheepHouseId">
<template #default="scope">
<dict-tag :options="sheep_house_list" :value="scope.row.sheepHouseId"/>
{{ getSheepHouseName(scope.row.sheepHouseId) }}
</template>
</el-table-column>
<el-table-column label="羊只数量" align="center" prop="sheepCount" />
<el-table-column label="日均计划量" align="center" prop="planDailySize" />
<el-table-column label="计划量(早)" align="center" prop="planMorningSize" />
<el-table-column label="计划总量(早)" align="center" prop="planMorningTotal" />
<el-table-column label="饲喂比例(早)" align="center" prop="ratioMorning" />
<el-table-column label="实际量(早)" align="center" prop="actualMorningSize" />
<el-table-column label="计划量(中)" align="center" prop="planNoonSize" />
<el-table-column label="计划总量(中)" align="center" prop="planNoonTotal" />
<el-table-column label="实际量(中)" align="center" prop="actualNoonSize" />
<el-table-column label="饲喂比例(中)" align="center" prop="ratioNoon" />
<el-table-column label="计划量(下)" align="center" prop="planAfternoonSize" />
<el-table-column label="计划总量(下)" align="center" prop="planAfternoonTotal" />
<el-table-column label="实际量(下)" align="center" prop="actualAfternoonSize" />
<el-table-column label="饲喂比例(下)" align="center" prop="ratioAfternoon" />
<el-table-column label="上午" prop="materialId" align="center">
<el-table-column label="计划量" align="center" prop="planMorningSize">
<template #default="{ row }">
{{ row.planMorningSize ? row.planMorningSize.toFixed(2) : '0.00' }}
</template>
</el-table-column>
<!-- <el-table-column label="计划总量" align="center" prop="planMorningTotal" /> -->
<el-table-column label="实际量" align="center" prop="actualMorningSize" />
</el-table-column>
<el-table-column label="中午" prop="materialId" align="center">
<el-table-column label="计划量" align="center" prop="planNoonSize">
<template #default="{ row }">
{{ row.planNoonSize ? row.planNoonSize.toFixed(2) : '0.00' }}
</template>
</el-table-column>
<!-- <el-table-column label="计划总量" align="center" prop="planNoonTotal" /> -->
<el-table-column label="实际量" align="center" prop="actualNoonSize" />
</el-table-column>
<el-table-column label="下午" prop="materialId" align="center">
<el-table-column label="计划量" align="center" prop="planAfternoonSize">
<template #default="{ row }">
{{ row.planAfternoonSize ? row.planAfternoonSize.toFixed(2) : '0.00' }}
</template>
</el-table-column>
<!-- <el-table-column label="计划总量" align="center" prop="planAfternoonTotal" /> -->
<el-table-column label="实际量" align="center" prop="actualAfternoonSize" />
</el-table-column>
<el-table-column label="饲喂比例(%)" align="center" prop="ratioTotal">
<el-table-column label="上午" align="center" prop="ratioMorning" />
<el-table-column label="中午" align="center" prop="ratioNoon" />
<el-table-column label="下午" align="center" prop="ratioAfternoon" />
</el-table-column>
<el-table-column label="计划饲喂总量" align="center" prop="planFeedTotal" />
<el-table-column label="饲草班人员" align="center" prop="zookeeper" />
<el-table-column label="饲喂计划日期" align="center" prop="planDate" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
<!-- <span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span> -->
<span>{{ scope.row.planDate ? parseTime(scope.row.planDate, '{y}-{m}-{d}') : '' }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<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="['feed:FeedPlan:edit']">修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['feed:FeedPlan:remove']">删除</el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['feed:FeedPlan:edit']">修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['feed:FeedPlan: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="FeedPlanRef" :model="form" :rules="rules" label-width="80px">
<el-form ref="FeedPlanRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="配方编码" prop="formulaId">
<el-input v-model="form.formulaId" placeholder="请输入配方编码" />
<!-- <el-input v-model="form.formulaId" placeholder="请输入配方编码" /> -->
<el-select v-model="form.formulaId" filterable placeholder="请选择配方编码" style="width: 100%"
@change="handleFormulaIdChange(form, $event)">
<el-option v-for="item in formulaIdDict" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="批号" prop="batchId">
<!-- <el-input v-model="form.batchId" placeholder="请输入批号" /> -->
<el-select v-model="form.batchId" filterable placeholder="请选择配方批号" style="width: 100%">
<el-option v-for="item in formulaBatchDict" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="羊舍" prop="sheepHouseId">
<el-input v-model="form.sheepHouseId" placeholder="请输入羊舍" />
<!-- <el-input v-model="form.sheepHouseId" placeholder="请输入羊舍" /> -->
<el-select v-model="form.sheepHouseId" filterable placeholder="请选择羊舍" style="width: 100%">
<el-option v-for="item in sheepFolderDict" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="日均计划量" prop="planDailySize">
<el-input v-model="form.planDailySize" placeholder="请输入日均计划量" />
</el-form-item>
<el-form-item label="饲喂比例(早)" prop="ratioMorning">
<el-input v-model="form.ratioMorning" placeholder="请输入饲喂比例(早)" />
<el-form-item label="比例 (%)">
<div style="display: flex; gap: 10px;">
<el-input v-model="form.ratioMorning" placeholder="早上比例" style="width: 100px;" />
<el-input v-model="form.ratioNoon" placeholder="中午比例" style="width: 100px;" />
<el-input v-model="form.ratioAfternoon" placeholder="下午比例" style="width: 100px;" />
</div>
</el-form-item>
<el-form-item label="实际量(早)" prop="actualMorningSize">
<el-input v-model="form.actualMorningSize" placeholder="请输入实际量(早)" />
</el-form-item>
<el-form-item label="实际量(中)" prop="actualNoonSize">
<el-input v-model="form.actualNoonSize" placeholder="请输入实际量(中)" />
</el-form-item>
<el-form-item label="饲喂比例(中)" prop="ratioNoon">
<el-input v-model="form.ratioNoon" placeholder="请输入饲喂比例(中)" />
</el-form-item>
<el-form-item label="实际量(下)" prop="actualAfternoonSize">
<el-input v-model="form.actualAfternoonSize" placeholder="请输入实际量(下)" />
</el-form-item>
<el-form-item label="饲喂比例(下)" prop="ratioAfternoon">
<el-input v-model="form.ratioAfternoon" placeholder="请输入饲喂比例(下)" />
</el-form-item>
<el-form-item label="饲草班人员" prop="zookeeper">
<el-form-item label="饲草班人员" prop="Zookeeper">
<el-input v-model="form.zookeeper" placeholder="请输入饲草班人员" />
</el-form-item>
<el-form-item label="饲喂计划日期" prop="planDate">
<el-date-picker clearable
v-model="form.planDate"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择饲喂计划日期">
<el-form-item label="计划日期" prop="planDate">
<el-date-picker clearable v-model="form.planDate" type="date" value-format="YYYY-MM-DD"
placeholder="请选择计划饲喂时间">
</el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<div v-if="title === '修改饲喂计划'">
<el-divider content-position="left">配方详情</el-divider>
<el-form-item label="实际饲喂量">
<div style="display: flex; gap: 10px;">
<el-input v-model="form.actualMorningSize" placeholder="早上" style="width: 100px;" />
<el-input v-model="form.actualNoonSize" placeholder="中午" style="width: 100px;" />
<el-input v-model="form.actualAfternoonSize" placeholder="下午" style="width: 100px;" />
</div>
</el-form-item>
</div>
</el-form>
<template #footer>
<div class="dialog-footer">
@ -184,164 +162,258 @@
</template>
<script setup name="FeedPlan">
import { listFeedPlan, getFeedPlan, delFeedPlan, addFeedPlan, updateFeedPlan } from "@/api/feed/FeedPlan"
import { listFeedPlan, getFeedPlan, delFeedPlan, addFeedPlan, updateFeedPlan } from "@/api/feed/FeedPlan"
import { listFormulaManagement } from "@/api/feed/FormulaManagement";
import { listSheepfold } from "@/api/produce/manage_sheep/trans_group.js";
import { get } from "@vueuse/core";
const { proxy } = getCurrentInstance()
const { proxy } = getCurrentInstance()
const FeedPlanList = 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 FeedPlanList = 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,
formulaId: null,
sheepHouseId: null,
zookeeper: null,
planDate: null,
},
rules: {
formulaId: [
{ required: true, message: "配方编码不能为空", trigger: "blur" }
],
sheepHouseId: [
{ required: true, message: "羊舍不能为空", trigger: "blur" }
],
planDailySize: [
{ required: true, message: "日均计划量不能为空", trigger: "blur" }
],
}
})
const { queryParams, form, rules } = toRefs(data)
/** 查询饲喂计划列表 */
function getList() {
loading.value = true
listFeedPlan(queryParams.value).then(response => {
FeedPlanList.value = response.rows
total.value = response.total
loading.value = false
})
}
// 取消按钮
function cancel() {
open.value = false
reset()
}
// 表单重置
function reset() {
form.value = {
createDate: null,
formulaId: null,
sheepHouseId: null,
sheepCount: null,
planDailySize: null,
planMorningSize: null,
planMorningTotal: null,
ratioMorning: null,
actualMorningSize: null,
planNoonSize: null,
planNoonTotal: null,
actualNoonSize: null,
ratioNoon: null,
planAfternoonSize: null,
planAfternoonTotal: null,
actualAfternoonSize: null,
ratioAfternoon: null,
planFeedTotal: null,
zookeeper: null,
planDate: null,
remark: null
}
proxy.resetForm("FeedPlanRef")
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1
getList()
}
/** 重置按钮操作 */
function resetQuery() {
proxy.resetForm("queryRef")
handleQuery()
}
// 多选框选中数据
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.createDate)
single.value = selection.length != 1
multiple.value = !selection.length
}
/** 新增按钮操作 */
function handleAdd() {
reset()
open.value = true
title.value = "添加饲喂计划"
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
const _createDate = row.createDate || ids.value
getFeedPlan(_createDate).then(response => {
form.value = response.data
open.value = true
title.value = "修改饲喂计划"
})
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["FeedPlanRef"].validate(valid => {
if (valid) {
if (form.value.createDate != null) {
updateFeedPlan(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
getList()
})
} else {
addFeedPlan(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功")
open.value = false
getList()
})
}
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
formulaId: null,
sheepHouseId: null,
},
rules: {
formulaId: [
{ required: true, message: "配方编码不能为空", trigger: "blur" }
],
batchId: [
{ required: true, message: "批号不能为空", trigger: "blur" }
],
sheepHouseId: [
{ required: true, message: "羊舍不能为空", trigger: "blur" }
],
planDailySize: [
{ required: true, message: "日均计划量不能为空", trigger: "blur" }
],
}
})
const { queryParams, form, rules } = toRefs(data)
const formulaIdDict = ref([]) // 配方编码字典
// 用于存储配方批号列表
const formulaBatchMap = ref([])
const formulaBatchDict = ref([]) // 配方批号字典(过滤后)
const sheepFolderDict = ref([]) // 羊舍字典
// 用于存储羊舍名称的字典
const sheepNameDict = ref({})
// 获取配方编码 & 配方批号 字典
function getFormulaDict() {
listFormulaManagement().then(response => {
formulaIdDict.value = response.rows.map(item => ({
label: item.formulaId,
value: item.formulaId
}))
// 清空配方批号字典
formulaBatchMap.value = []
// 遍历每个配方列表，提取子配方中的批号
response.rows.forEach(item => {
if (item.subFormulaList) {
item.subFormulaList.forEach(subItem => {
formulaBatchMap.value.push({
label: subItem.batchId,
value: subItem.batchId,
formulaId: item.formulaId // 关联配方ID
})
})
}
})
})
}
// 处理配方编码变化
function handleFormulaIdChange(row, value) {
// 清空配方批号字典
if (!value) {
formulaBatchDict.value = []
} else {
// 根据选择的formulaId筛选batchId
formulaBatchDict.value = formulaBatchMap.value;
formulaBatchDict.value = formulaBatchDict.value.filter(item => item.formulaId === value)
}
// 重新设置批号为第一个
if (formulaBatchDict.value.length > 0) {
row.batchId = formulaBatchDict.value[0].value;
}
}
function getSheepfoldDict() {
listSheepfold().then(response => {
sheepFolderDict.value = response.rows.map(item => ({
label: item.sheepfoldName,
value: item.id
}))
sheepNameDict.value = response.rows.map(item => ({
label: item.id,
value: item.sheepfoldName
}))
})
}
// 根据id获取羊舍名称
function getSheepHouseName(id) {
const dictItem = sheepFolderDict.value.find(item => item.value === id)
return dictItem ? dictItem.label : id
}
// 羊舍ID与名称转换函数：输入可以是 ID 或 羊舍名称
function getSheepHouseId(inputValue, sheepNameDict) {
if (!inputValue) return '';
// 输入是纯数字，直接返回
if (/^\d+$/.test(inputValue)) {
return inputValue;
}
// 输入是名称，返回对应的 id
const match = sheepNameDict.find(item => item.value === inputValue);
return match ? match.label : '';
}
/** 删除按钮操作 */
function handleDelete(row) {
const _createDates = row.createDate || ids.value
proxy.$modal.confirm('是否确认删除饲喂计划编号为"' + _createDates + '"的数据项？').then(function() {
return delFeedPlan(_createDates)
}).then(() => {
/** 查询饲喂计划列表 */
function getList() {
loading.value = true
listFeedPlan(queryParams.value).then(response => {
FeedPlanList.value = response.rows
total.value = response.total
loading.value = false
})
}
// 取消按钮
function cancel() {
open.value = false
reset()
}
// 表单重置
function reset() {
form.value = {
createDate: null,
formulaId: null,
batchId: null,
sheepHouseId: null,
sheepCount: null,
planDailySize: null,
ratioMorning: null,
ratioNoon: null,
ratioAfternoon: null,
planMorningSize: null,
planMorningTotal: null,
actualMorningSize: null,
planNoonSize: null,
planNoonTotal: null,
actualNoonSize: null,
planAfternoonSize: null,
planAfternoonTotal: null,
actualAfternoonSize: null,
planFeedTotal: null,
zookeeper: null,
planDate: null,
remark: null
}
proxy.resetForm("FeedPlanRef")
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1
// 如果羊舍ID是名称，则转换为ID
queryParams.value.sheepHouseId = getSheepHouseId(queryParams.value.sheepHouseId, sheepNameDict.value);
getList()
proxy.$modal.msgSuccess("删除成功")
}).catch(() => {})
}
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('feed/FeedPlan/export', {
...queryParams.value
}, `FeedPlan_${new Date().getTime()}.xlsx`)
}
/** 重置按钮操作 */
function resetQuery() {
proxy.resetForm("queryRef")
handleQuery()
}
getList()
// 多选框选中数据
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.createDate)
single.value = selection.length != 1
multiple.value = !selection.length
}
/** 新增按钮操作 */
function handleAdd() {
reset()
open.value = true
title.value = "添加饲喂计划"
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
const _createDate = row.createDate || ids.value
getFeedPlan(_createDate).then(response => {
form.value = response.data
open.value = true
title.value = "修改饲喂计划"
})
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["FeedPlanRef"].validate(valid => {
if (valid) {
if (form.value.createDate != null) {
updateFeedPlan(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
getList()
})
} else {
addFeedPlan(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功")
open.value = false
getList()
})
}
}
})
}
/** 删除按钮操作 */
function handleDelete(row) {
const _createDates = row.createDate || ids.value
proxy.$modal.confirm('是否确认删除饲喂计划编号为"' + _createDates + '"的数据项？').then(function () {
return delFeedPlan(_createDates)
}).then(() => {
getList()
proxy.$modal.msgSuccess("删除成功")
}).catch(() => { })
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('feed/FeedPlan/export', {
...queryParams.value
}, `FeedPlan_${new Date().getTime()}.xlsx`)
}
getList()
// 获取配方编码字典
getFormulaDict()
// 获取羊舍字典
getSheepfoldDict()
</script>

619
src/views/feed/FeedStatistic/index.vue Normal file
View File

@ -0,0 +1,619 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="配方编号" prop="formulaId">
<el-input v-model="queryParams.formulaId" placeholder="请输入配方编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="配方批号" prop="formulaBatchId">
<el-input v-model="queryParams.formulaBatchId" placeholder="请输入配方批号" 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="['feed:FeedStatistic:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['feed:FeedStatistic:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['feed:FeedStatistic:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['feed:FeedStatistic:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="FeedStatisticList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="UUID" align="center" prop="id" />
<el-table-column label="配方编号" align="center" prop="formulaId" />
<el-table-column label="配方批号" align="center" prop="formulaBatchId" />
<el-table-column label="羊只数量" align="center" prop="sheepFoldCount" />
<!-- <el-table-column label="青贮损耗比例" align="center" prop="silageLossRate" /> -->
<el-table-column label="总饲喂量" align="center" prop="feedTotalSize" />
<el-table-column label="日均饲喂量" align="center" prop="feedDailySize" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleMaterialView(scope.row)"
v-hasPermi="['feed:FeedStatistic:edit']">查看</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['feed:FeedStatistic: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="60%" append-to-body
v-if="openModel === 'viewMaterial' || openModel === 'add'">
<div>
<el-form ref="FeedStatisticRef" :model="showFeedStatistic" :rules="rules" label-width="100px">
<el-row :gutter="20">
<el-col :span="12" v-if="true">
<el-form-item label="UUID" prop="id">
<el-input v-model="showFeedStatistic.id" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="true">
<el-form-item label="配方编码" prop="formulaId">
<!-- <el-input v-model="form.formulaId" placeholder="请输入配方编码" /> -->
<el-select v-model="showFeedStatistic.formulaId" filterable placeholder="请选择配方编码" style="width: 100%"
@change="handleFormulaIdChange(showFeedStatistic, $event)" :disabled="isEdit">
<el-option v-for="item in formulaIdDict" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="批号" prop="batchId">
<!-- <el-input v-model="form.batchId" placeholder="请输入批号" /> -->
<el-select v-model="showFeedStatistic.formulaBatchId" filterable placeholder="请选择配方批号"
style="width: 100%" :disabled="isEdit"
@change="handleFormulaBatchIdChange(showFeedStatistic, $event)">
<el-option v-for="item in formulaBatchDict" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="羊只数量" prop="feedStage">
<el-input v-model="showFeedStatistic.sheepFoldCount" placeholder="请输入饲养阶段" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="日期" prop="planDate">
<el-date-picker clearable v-model="showFeedStatistic.feedDate" type="date" value-format="YYYY-MM-DD"
placeholder="请选择时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="left">配方列表</el-divider>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" icon="Plus" @click="handleAddMaterial()">添加</el-button>
</el-col>
</el-row>
<el-table :data="showFeedStatistic.materialList" :rules="rules" :row-class-name="rowSgFormulaListDetailIndex"
@selection-change="handleSgFormulaListDetailSelectionChange" ref="swPresDetail" border stripe>
<el-table-column label="序号" align="center" prop="index" width="60" />
<el-table-column label="原料" prop="materialId" align="center">
<el-table-column label="名称" align="center">
<template #default="scope">
<el-select v-model="scope.row.materialId" filterable placeholder="请选择原料" style="width: 100%"
@change="handleMaterialChange(scope.row, $event)">
<el-option-group v-for="group in groupedMaterials" :key="group.label" :label="group.label">
<el-option v-for="item in group.options" :key="item.value" :label="item.label"
:value="item.value" />
</el-option-group>
</el-select>
</template>
</el-table-column>
<el-table-column label="类型" align="center" prop="isGranular">
<template #default="scope">
<dict-tag :options="material_type" :value="scope.row.isGranular" />
</template>
</el-table-column>
</el-table-column>
<el-table-column label="总量" prop="feedSize" align="center">
<template #default="scope">
<el-input-number v-model="scope.row.feedSize" placeholder="请输入饲喂总量" :min="0" :precision="1"
controls-position="right" />
</template>
</el-table-column>
<el-table-column label="类型" prop="isSupplement" align="center">
<template #default="scope">
<el-select v-model="scope.row.isSupplement" placeholder="请选择类型">
<el-option v-for="item in materialType" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</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="Delete" @click="deleteFormulaListDetail(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<el-divider content-position="left">羊舍列表</el-divider>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" icon="Plus" @click="handleAddSheep()">添加</el-button>
</el-col>
<el-table :data="showFeedStatistic.sheepFoldList" :rules="rules"
:row-class-name="rowSgFormulaListDetailIndex" @selection-change="handleSgFormulaListDetailSelectionChange"
ref="swPresDetail" border stripe>
<el-table-column label="ID" prop="id" align="center" />
<!-- <el-input v-model="form.sheepHouseId" placeholder="请输入羊舍" /> -->
<el-table-column label="名称" align="center" prop="sheepfoldName">
<template #default="scope">
<el-select v-model="scope.row.id" filterable placeholder="请选择羊舍" style="width: 100%">
<el-option v-for="item in sheepFolderDict" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</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="Delete" @click="deleteSheepItem(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
</el-form>
</div>
<!-- 底部按钮：仅修改页显示 -->
<template #footer>
<div class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitFormDetil">确 定</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="FeedStatistic">
import { listFeedStatistic, getFeedStatistic, delFeedStatistic, addFeedStatistic, updateFeedStatistic, initFeedStatistic } from "@/api/feed/FeedStatistic"
import { listFormulaManagement } from "@/api/feed/FormulaManagement"
import { listSheepfold } from "@/api/produce/manage_sheep/trans_group.js";
import { listMaterial } from "@/api/feed/Material"
import { ref } from "vue";
const { proxy } = getCurrentInstance()
const FeedStatisticList = 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,
formulaId: null,
formulaBatchId: null,
silageLossRate: null,
},
rules: {
formulaId: [
{ required: true, message: "配方编号不能为空", trigger: "blur" }
],
formulaBatchId: [
{ required: true, message: "配方批号不能为空", trigger: "blur" }
],
}
})
const { queryParams, form, rules } = toRefs(data)
// 打开类型
const openModel = ref('')
// 编辑状态
const isEdit = ref(true)
const showFeedStatistic = ref({})
// 用于存储羊舍名称的字典
const sheepNameDict = ref({})
const sheepFolderDict = ref([]) // 羊舍字典
const formulaIdDict = ref([]) // 配方编码字典
const formulaBatchMap = ref([]) // 配方批号映射（包含配方ID）
const formulaBatchDict = ref([]) // 配方批号字典(过滤后)
// 原料类型字典
const { material_type } = proxy.useDict('material_type')
// 原料类型
const materialType = [
{ value: '1', label: '补饲原料' },
{ value: '0', label: '原料' }
]
// 原料下拉列表
const materials = ref([])
// 原料列表查询参数
const materialQueryParams = ref({
materialId: null,
materialName: null,
isGranular: null
})
function getMaterials() {
listMaterial(materialQueryParams).then(response => {
console.log("获取原料列表：", response)
materials.value = response.rows.map(item => ({
value: item.materialId,
label: item.materialName,
isGranular: item.isGranular,
isSupplement: "0" // 默认补饲原料为 0
}))
// console.log("原料列表：", materials.value)
})
}
/** ================== 分组下拉列表部分 ======================== */
const groupedMaterials = ref([]) // 存储分组后的原料数据
// 从后端获取数据并按isGranular分组
function getGroupMaterials() {
listMaterial(materialQueryParams).then(response => {
console.log("获取原料列表：", response)
// 根据material_type分组数据
const groups = material_type.value.map(type => ({
label: type.label,
options: []
}))
// 遍历原料数据，根据isGranular字段分组
response.rows.forEach(item => {
const group = groups.find(group => group.label === material_type.value.find(type => type.value === item.isGranular).label)
group.options.push({
value: item.materialId,
label: item.materialName
})
})
// 将分组后的数据赋值给groupedMaterials
groupedMaterials.value = groups
console.log("分组后的原料列表：", groupedMaterials.value)
})
}
// 根据id获取羊舍名称
function getSheepHouseName(id) {
const dictItem = sheepFolderDict.value.find(item => item.value === id)
return dictItem ? dictItem.label : id
}
// 羊舍ID与名称转换函数：输入可以是 ID 或 羊舍名称
function getSheepHouseId(inputValue, sheepNameDict) {
if (!inputValue) return '';
// 输入是纯数字，直接返回
if (/^\d+$/.test(inputValue)) {
return inputValue;
}
// 输入是名称，返回对应的 id
const match = sheepNameDict.find(item => item.value === inputValue);
return match ? match.label : '';
}
/** ================== 配方字典 & 批号字典 ======================== */
// 获取配方编码 & 配方批号 字典
function getFormulaDict() {
listFormulaManagement().then(response => {
formulaIdDict.value = response.rows.map(item => ({
label: item.formulaId,
value: item.formulaId
}))
// 清空配方批号字典
formulaBatchMap.value = []
// 遍历每个配方列表，提取子配方中的批号
response.rows.forEach(item => {
if (item.subFormulaList) {
item.subFormulaList.forEach(subItem => {
formulaBatchMap.value.push({
label: subItem.batchId,
value: subItem.batchId,
formulaId: item.formulaId // 关联配方ID
})
})
}
})
})
}
// 处理配方编码变化
function handleFormulaIdChange(row, value) {
// 清空配方批号字典
if (!value) {
formulaBatchDict.value = []
} else {
// 根据选择的formulaId筛选batchId
formulaBatchDict.value = formulaBatchMap.value;
formulaBatchDict.value = formulaBatchDict.value.filter(item => item.formulaId === value)
}
// 重新设置批号为第一个
if (formulaBatchDict.value.length > 0) {
row.formulaBatchId = formulaBatchDict.value[0].value;
}
handleFormulaBatchIdChange(row, value);
}
// 处理配方批号变化 & 当确定批号时加载初始数据
function handleFormulaBatchIdChange(row, $event) {
if (row.formulaId && row.formulaBatchId) {
queryParams.value.formulaId = row.formulaId
queryParams.value.formulaBatchId = row.formulaBatchId
queryParams.value.id = null // 清空 ID，防止影响查询
// console.log("加载初始数据，查询参数：", queryParams.value)
initFeedStatistic(queryParams.value).then(response => {
Object.assign(showFeedStatistic.value, response.rows[0] || {})
total.value = response.total
loading.value = false
})
}
}
// 查看详情
function handleMaterialView(row) {
showFeedStatistic.value = row
// 反序列化
// showFeedStatistic.value.materialList = JSON.parse(showFeedStatistic.value.materialList || "[]");
// showFeedStatistic.value.sheepFoldList = JSON.parse(showFeedStatistic.value.sheepFoldList || "[]");
queryParams.value.id = row.id
listFeedStatistic(queryParams.value).then(response => {
FeedStatisticList.value = response.rows
total.value = response.total
loading.value = false
})
open.value = true
title.value = "饲喂量统计详情"
isEdit.value = true
openModel.value = 'viewMaterial'
}
function getSheepfoldDict() {
listSheepfold().then(response => {
sheepFolderDict.value = response.rows.map(item => ({
label: item.sheepfoldName,
value: item.id
}))
sheepNameDict.value = response.rows.map(item => ({
label: item.id,
value: item.sheepfoldName
}))
})
}
// 添加原料列表项
function handleAddMaterial() {
showFeedStatistic.value.materialList.push({
materialId: null,
materialName: null,
ratio: null,
isGranular: "0",
isSupplement: "0"
})
}
// 删除原料列表项
function deleteFormulaListDetail(row) {
const index = showFeedStatistic.value.materialList.findIndex(item => item.materialId === row.materialId)
if (index !== -1) {
showFeedStatistic.value.materialList.splice(index, 1)
}
}
// 添加羊舍列表项
function handleAddSheep() {
showFeedStatistic.value.sheepFoldList.push({
id: null,
sheepfoldName: null
})
}
// 删除羊舍列表项
function deleteSheepItem(row) {
const index = showFeedStatistic.value.sheepFoldList.findIndex(item => item.id === row.id)
if (index !== -1) {
showFeedStatistic.value.sheepFoldList.splice(index, 1)
}
}
// 原料下拉选择变化时，更新对应的原料名称
function handleMaterialChange(row, selectedValue) {
const selectedItem = this.materials.find(item => item.value === selectedValue);
if (selectedItem) {
// materialName 也在 row 中
row.materialName = selectedItem.label;
row.isGranular = selectedItem.isGranular; // 更新 isGranular
row.isSupplement = selectedItem.isSupplement; // 更新 isSupplement
}
}
/** 查询饲喂量统计列表 */
function getList() {
loading.value = true
listFeedStatistic(queryParams.value).then(response => {
FeedStatisticList.value = response.rows
total.value = response.total
loading.value = false
})
}
// 取消按钮
function cancel() {
open.value = false
reset()
}
// 表单重置
function reset() {
isEdit.value = true
showFeedStatistic.value = {
id: null,
formulaId: null,
formulaBatchId: null,
sheepFoldCount: null,
silageLossRate: null,
feedTotalSize: null,
feedDailySize: null,
materialList: null,
sheepFoldList: null
}
queryParams.value = {
pageNum: 1,
pageSize: 10,
formulaId: null,
formulaBatchId: null,
silageLossRate: null,
}
proxy.resetForm("FeedStatisticRef")
}
/** 搜索按钮操作 */
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
openModel.value = 'add'
isEdit.value = false
title.value = "添加饲喂量统计"
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
const _id = row.id || ids.value
getFeedStatistic(_id).then(response => {
form.value = response.data
open.value = true
title.value = "修改饲喂量统计"
})
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["FeedStatisticRef"].validate(valid => {
if (valid) {
if (form.value.id != null) {
updateFeedStatistic(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
getList()
})
} else {
addFeedStatistic(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功")
open.value = false
getList()
})
}
}
})
}
function submitFormDetil() {
proxy.$refs["FeedStatisticRef"].validate(valid => {
if (valid) {
if (showFeedStatistic.value.id != null) {
updateFeedStatistic(showFeedStatistic.value).then(response => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
reset()
getList()
})
} else {
addFeedStatistic(showFeedStatistic.value).then(response => {
proxy.$modal.msgSuccess("新增成功")
open.value = false
reset()
getList()
})
}
}
})
}
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除饲喂量统计编号为"' + _ids + '"的数据项？').then(function () {
return delFeedStatistic(_ids)
}).then(() => {
getList()
proxy.$modal.msgSuccess("删除成功")
}).catch(() => { })
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('feed/FeedStatistic/export', {
...queryParams.value
}, `FeedStatistic_${new Date().getTime()}.xlsx`)
}
/**
* 子表行序号计算
* 通过 el-table 的 row-class-name 钩子给每一行写入 index（从 1 开始）
*/
function rowSgFormulaListDetailIndex({ row, rowIndex }) {
row.index = rowIndex + 1
}
/**
* 子表多选回调
* 记录被选中的行序号数组
*/
function handleSgFormulaListDetailSelectionChange(selection) {
checkedSwPresDetail.value = selection.map(item => item.index)
}
getList()
getSheepfoldDict()
// 加载原料列表
getMaterials()
// 加载分组原料列表
getGroupMaterials()
// 获取羊舍字典
getSheepfoldDict()
// 获取配方字典
getFormulaDict()
</script>

93
src/views/feed/FormulaManagement/index.vue
View File

@ -35,7 +35,7 @@
<el-table v-loading="loading" :data="FormulaManagementList">
<!-- 表中表展示子配方 -->
<el-table-column type="expand" @expand-change="handleExpandChange">
<el-table-column type="expand" @expand-change="handleExpandChange">
<template #default="props">
<el-table :data="props.row.subFormulaList" style="width: 100%">
<el-table-column label="批号" align="center" prop="batchId" />
@ -148,11 +148,18 @@
<el-table :data="showFormulaManagementList.sgFormulaList" stripe border style="width: 100%" max-height="300">
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="原料编号" prop="materialId" align="center" />
<el-table-column label="原料名称" prop="materialName" />
<el-table-column label="原料" align="center">
<el-table-column label="名称" prop="materialName" align="center"/>
<el-table-column label="类型" align="center" prop="isGranular">
<template #default="scope">
<dict-tag :options="material_type" :value="scope.row.isGranular" />
</template>
</el-table-column>
</el-table-column>
<el-table-column label="比例" align="center" prop="ratio" />
<el-table-column label="类型" prop="isGranular" align="center">
<el-table-column label="类型" prop="isSupplement" align="center">
<template #default="scope">
<dict-tag :options="materialType" :value="scope.row.isGranular" />
<dict-tag :options="materialType" :value="scope.row.isSupplement" />
</template>
</el-table-column>
</el-table>
@ -165,7 +172,7 @@
<el-col :span="12" v-if="!isView">
<el-form-item label="配方编号" prop="formulaId">
<el-input v-model="showFormulaManagementList.formulaId" placeholder="请输入配方编号"
:disabled="!FormulaIdEditable"/>
:disabled="!FormulaIdEditable" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -220,24 +227,33 @@
:row-class-name="rowSgFormulaListDetailIndex" @selection-change="handleSgFormulaListDetailSelectionChange"
ref="swPresDetail" border stripe>
<el-table-column label="序号" align="center" prop="index" width="60" />
<el-table-column label="原料" prop="materialId">
<template #default="scope">
<el-select v-model="scope.row.materialId" filterable placeholder="请选择原料" style="width: 100%"
@change="handleMaterialChange(scope.row, $event)">
<el-option v-for="item in materials" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</template>
<el-table-column label="原料" prop="materialId" align="center">
<el-table-column label="名称" align="center">
<template #default="scope">
<el-select v-model="scope.row.materialId" filterable placeholder="请选择原料" style="width: 100%"
@change="handleMaterialChange(scope.row, $event)">
<el-option-group v-for="group in groupedMaterials" :key="group.label" :label="group.label">
<el-option v-for="item in group.options" :key="item.value" :label="item.label"
:value="item.value" />
</el-option-group>
</el-select>
</template>
</el-table-column>
<el-table-column label="类型" align="center" prop="isGranular">
<template #default="scope">
<dict-tag :options="material_type" :value="scope.row.isGranular" />
</template>
</el-table-column>
</el-table-column>
<el-table-column label="比例" prop="dosage">
<el-table-column label="比例" prop="dosage" align="center">
<template #default="scope">
<el-input-number v-model="scope.row.ratio" placeholder="请输入比例" :min="0" :precision="1"
controls-position="right" />
</template>
</el-table-column>
<el-table-column label="类型" prop="isGranular">
<el-table-column label="类型" prop="isSupplement" align="center">
<template #default="scope">
<el-select v-model="scope.row.isGranular" placeholder="请选择类型">
<el-select v-model="scope.row.isSupplement" placeholder="请选择类型">
<el-option v-for="item in materialType" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</template>
@ -297,9 +313,12 @@ const FormulaIdEditable = ref(false)
const materials = ref([])
// 原料类型
const materialType = [
{ value: '1', label: '颗粒料' },
{ value: '0', label: '其他' }
{ value: '1', label: '补饲原料' },
{ value: '0', label: '原料' }
]
// 原料类型字典
const { material_type } = proxy.useDict('material_type')
console.log("material_type: ", material_type);
const useStaus = [
{ value: '1', label: '启用' },
{ value: '0', label: '停用' }
@ -581,6 +600,8 @@ function handleMaterialChange(row, selectedValue) {
if (selectedItem) {
// materialName 也在 row 中
row.materialName = selectedItem.label;
row.isGranular = selectedItem.isGranular; // 更新 isGranular
row.isSupplement = selectedItem.isSupplement; // 更新 isSupplement
}
}
@ -633,7 +654,7 @@ function handleFormulaDetailUpdate(row) {
showFormulaManagementList.value = {}
}
formulaListOpen.value = true
title.value = "修改处方"
title.value = "修改配方"
isView.value = false
})
}
@ -680,12 +701,42 @@ function getMaterials() {
console.log("获取原料列表：", response)
materials.value = response.rows.map(item => ({
value: item.materialId,
label: item.materialName
label: item.materialName,
isGranular: item.isGranular,
isSupplement: "0" // 默认补饲原料为 0
}))
console.log("原料列表：", materials.value)
})
}
/** ================== 分组下拉列表部分 ======================== */
const groupedMaterials = ref([]) // 存储分组后的原料数据
// 从后端获取数据并按isGranular分组
function getGroupMaterials() {
listMaterial(materialQueryParams).then(response => {
console.log("获取原料列表：", response)
// 根据material_type分组数据
const groups = material_type.value.map(type => ({
label: type.label,
options: []
}))
// 遍历原料数据，根据isGranular字段分组
response.rows.forEach(item => {
const group = groups.find(group => group.label === material_type.value.find(type => type.value === item.isGranular).label)
group.options.push({
value: item.materialId,
label: item.materialName
})
})
// 将分组后的数据赋值给groupedMaterials
groupedMaterials.value = groups
console.log("分组后的原料列表：", groupedMaterials.value)
})
}
/**
* 子表多选回调
@ -714,4 +765,6 @@ function handleExport() {
getList()
// 加载原料列表
getMaterials()
// 加载分组原料列表
getGroupMaterials()
</script>

534
src/views/mating_plan/mating_plan/generate/index.vue
View File

@ -9,6 +9,24 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="计划类型" prop="planType">
<el-select v-model="queryParams.planType" placeholder="请选择计划类型" clearable>
<el-option label="同期发情配种计划" value="1"></el-option>
<el-option label="本交配种计划" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="计划日期" prop="planDate">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="handleDateRangeChange"
></el-date-picker>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option label="待审批" value="0"></el-option>
@ -48,6 +66,13 @@
<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="planType">
<template #default="scope">
<el-tag v-if="scope.row.planType === 1" type="primary">同期发情配种计划</el-tag>
<el-tag v-else-if="scope.row.planType === 2" type="success">本交配种计划</el-tag>
<el-tag v-else type="info">未知类型</el-tag>
</template>
</el-table-column>
<el-table-column label="计划日期" align="center" prop="planDate" width="180">
<template #default="scope">
<span>{{ scope.row.planDate }}</span>
@ -82,6 +107,7 @@
v-hasPermi="['mating_plan:generate:approve']"
v-if="scope.row.status == 0"
>审批</el-button>
<el-button
link
type="primary"
@ -93,14 +119,6 @@
</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"
@ -111,6 +129,22 @@
<!-- 生成配种计划对话框 -->
<el-dialog title="生成配种计划" v-model="generateOpen" width="1200px" append-to-body>
<el-form ref="generateFormRef" :model="generateForm" :rules="generateRules" label-width="120px">
<el-row>
<el-col :span="24">
<el-form-item label="计划类型" prop="planType">
<el-radio-group v-model="generateForm.planType">
<el-radio :label="1">同期发情配种计划</el-radio>
<el-radio :label="2">本交配种计划</el-radio>
</el-radio-group>
<div style="margin-top: 10px; color: #666; font-size: 12px;">
计划名称将自动生成为：{{ getCurrentDate() }}{{ getPlanTypeName(generateForm.planType) }}
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs v-model="activeTab" @tab-click="handleTabClick">
<el-tab-pane label="符合条件的母羊" name="ewe">
<el-row :gutter="10" class="mb8">
@ -130,6 +164,7 @@
<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="family" />
<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" />
@ -156,6 +191,7 @@
<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="family" />
<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" />
@ -174,10 +210,106 @@
</template>
</el-dialog>
<!-- 审批配种计划对话框 -->
<el-dialog title="审批配种计划" v-model="approveOpen" width="1400px" append-to-body>
<el-descriptions :column="3" border class="mb8">
<el-descriptions-item label="计划名称">{{ approveData.planInfo.planName }}</el-descriptions-item>
<el-descriptions-item label="计划类型">
<el-tag v-if="approveData.planInfo.planType === 1" type="primary">同期发情配种计划</el-tag>
<el-tag v-else-if="approveData.planInfo.planType === 2" type="success">本交配种计划</el-tag>
</el-descriptions-item>
<el-descriptions-item label="计划日期">{{ approveData.planInfo.planDate }}</el-descriptions-item>
<el-descriptions-item label="母羊数量">{{ approveData.planInfo.totalEweCount }}</el-descriptions-item>
<el-descriptions-item label="公羊数量">{{ approveData.planInfo.totalRamCount }}</el-descriptions-item>
<el-descriptions-item label="配种比例">{{ approveData.planInfo.breedRatio }}</el-descriptions-item>
</el-descriptions>
<el-divider content-position="left">配种计划详情（可编辑）</el-divider>
<el-table
:data="approveData.planDetails"
style="width: 100%"
max-height="500"
border
>
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="母羊耳号" align="center" prop="ewe_manage_tags" width="120" />
<el-table-column label="母羊品种" align="center" prop="ewe_variety" width="100" />
<el-table-column label="核心羊群" align="center" width="100">
<template #default="scope">
<el-tag v-if="scope.row.ewe_is_core" type="success">是</el-tag>
<el-tag v-else type="info">否</el-tag>
</template>
</el-table-column>
<el-table-column label="是否种用" align="center" width="100">
<template #default="scope">
<el-tag v-if="scope.row.ewe_is_breeding" type="success">是</el-tag>
<el-tag v-else type="info">否</el-tag>
</template>
</el-table-column>
<el-table-column label="详情" align="center" width="80">
<template #default="scope">
<el-button link type="primary" icon="View" @click="showEweDetail(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="配种公羊" align="center" width="200">
<template #default="scope">
<el-select
v-model="scope.row.ram_id"
placeholder="选择公羊(可为空)"
@change="handleRamChange(scope.$index, scope.row)"
filterable
clearable
>
<el-option label="不参与配种" :value="null" />
<el-option
v-for="ram in availableRamList"
:key="ram.id"
:label="ram.bs_manage_tags"
:value="ram.id"
/>
</el-select>
<!-- 如果当前选中的公羊不在可选列表中，显示当前公羊耳号 -->
<div v-if="scope.row.ram_id && !availableRamList.find(r => r.id == scope.row.ram_id)"
style="font-size: 12px; color: #666; margin-top: 4px;">
当前: {{ scope.row.ram_manage_tags || scope.row.ram_id }}
</div>
</template>
</el-table-column>
<el-table-column label="公羊品种" align="center" prop="ram_variety" width="100" />
<el-table-column label="详情" align="center" width="80">
<template #default="scope">
<el-button
link
type="primary"
icon="View"
@click="showRamDetail(scope.row)"
:disabled="!scope.row.ram_id"
>查看</el-button>
</template>
</el-table-column>
</el-table>
<template #footer>
<div class="dialog-footer">
<el-button type="success" @click="confirmApprove">确认审批</el-button>
<el-button type="danger" @click="rejectApprove">拒绝审批</el-button>
<el-button @click="approveOpen = false">取 消</el-button>
</div>
</template>
</el-dialog>
<!-- 查看配种计划详情对话框 -->
<el-dialog title="配种计划详情" v-model="viewOpen" width="1000px" append-to-body>
<el-dialog title="配种计划详情" v-model="viewOpen" width="1200px" append-to-body>
<el-descriptions :column="3" border>
<el-descriptions-item label="计划名称">{{ planInfo.planName }}</el-descriptions-item>
<el-descriptions-item label="计划类型">
<el-tag v-if="planInfo.planType === 1" type="primary">同期发情配种计划</el-tag>
<el-tag v-else-if="planInfo.planType === 2" type="success">本交配种计划</el-tag>
</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>
@ -193,29 +325,90 @@
<el-descriptions-item label="审批人">{{ planInfo.approver }}</el-descriptions-item>
</el-descriptions>
<!-- 只有已审批状态才显示导出按钮 -->
<el-row :gutter="10" class="mb8" style="margin-top: 16px;" v-if="planInfo.status === 1">
<el-col :span="1.5">
<el-button type="success" icon="Download" @click="exportBreedPlanDetails">导出配种计划详情</el-button>
</el-col>
</el-row>
<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">
<el-table :data="planDetails" max-height="600" border stripe>
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="母羊耳号" align="center" prop="ewe_manage_tags" width="120" />
<el-table-column label="母羊品种" align="center" prop="ewe_variety" width="100" />
<el-table-column label="核心羊群" align="center" width="100">
<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-if="scope.row.ewe_is_core" type="success">是</el-tag>
<el-tag v-else type="info">否</el-tag>
</template>
</el-table-column>
<el-table-column label="是否种用" align="center" width="100">
<template #default="scope">
<el-tag v-if="scope.row.ewe_is_breeding" type="success">是</el-tag>
<el-tag v-else type="info">否</el-tag>
</template>
</el-table-column>
<el-table-column label="母羊详情" align="center" width="100">
<template #default="scope">
<el-button link type="primary" icon="View" @click="showEweDetail(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="公羊耳号" align="center" prop="ram_manage_tags" width="120" />
<el-table-column label="公羊品种" align="center" prop="ram_variety" width="100" />
<el-table-column label="公羊详情" align="center" width="100">
<template #default="scope">
<el-button
link
type="primary"
icon="View"
@click="showRamDetail(scope.row)"
:disabled="!scope.row.ram_id"
>查看</el-button>
</template>
</el-table-column>
<el-table-column label="配种类型" align="center" prop="breed_type" width="120">
<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 type="warning">未知类型</el-tag>
</template>
</el-table-column>
</el-table>
</el-dialog>
<!-- 羊只详情对话框 -->
<el-dialog :title="sheepDetailTitle" v-model="sheepDetailOpen" width="800px" append-to-body>
<el-descriptions :column="2" border>
<el-descriptions-item label="耳号">{{ sheepDetail.manage_tags }}</el-descriptions-item>
<el-descriptions-item label="品种">{{ sheepDetail.variety }}</el-descriptions-item>
<el-descriptions-item label="家系">{{ sheepDetail.family }}</el-descriptions-item>
<el-descriptions-item label="羊只类别">{{ sheepDetail.sheep_type }}</el-descriptions-item>
<el-descriptions-item label="繁育状态" v-if="sheepDetail.breed_status">{{ sheepDetail.breed_status }}</el-descriptions-item>
<el-descriptions-item label="生日" v-if="sheepDetail.birthday">{{ sheepDetail.birthday }}</el-descriptions-item>
<el-descriptions-item label="月龄">{{ sheepDetail.month_age }}</el-descriptions-item>
<el-descriptions-item label="当前体重">{{ sheepDetail.current_weight }}kg</el-descriptions-item>
<el-descriptions-item label="胎次" v-if="sheepDetail.parity">{{ sheepDetail.parity }}</el-descriptions-item>
<el-descriptions-item label="是否核心羊群" v-if="sheepDetail.is_core !== undefined">
<el-tag v-if="sheepDetail.is_core" type="success">是</el-tag>
<el-tag v-else type="info">否</el-tag>
</el-descriptions-item>
<el-descriptions-item label="是否种用" v-if="sheepDetail.is_breeding !== undefined">
<el-tag v-if="sheepDetail.is_breeding" type="success">是</el-tag>
<el-tag v-else type="info">否</el-tag>
</el-descriptions-item>
<el-descriptions-item label="羊舍" v-if="sheepDetail.sheepfold_name">{{ sheepDetail.sheepfold_name }}</el-descriptions-item>
<el-descriptions-item label="备注" v-if="sheepDetail.comment">{{ sheepDetail.comment }}</el-descriptions-item>
<el-descriptions-item label="繁殖情况" v-if="sheepDetail.reproduction_info">{{ sheepDetail.reproduction_info }}</el-descriptions-item>
</el-descriptions>
</el-dialog>
</div>
</template>
<script setup name="BreedPlanGenerate">
import {ref, reactive, toRefs, onMounted} from 'vue'
import {getCurrentInstance} from 'vue'
import {ref, reactive, toRefs, onMounted, getCurrentInstance} from 'vue'
import {
listBreedPlanGenerate,
getBreedPlanGenerate,
@ -223,28 +416,31 @@ import {
selectEligibleEwe as apiSelectEligibleEwe,
selectEligibleRam as apiSelectEligibleRam,
autoGenerateBreedPlan,
approveBreedPlan,
getApproveBreedPlan,
confirmApproveBreedPlan,
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 availableRamList = ref([])
const selectedEwe = ref([])
const selectedRam = ref([])
const planInfo = ref({})
const planDetails = ref([])
const approveData = ref({
planInfo: {},
planDetails: []
})
const sheepDetail = ref({})
const sheepDetailTitle = ref('')
const generateOpen = ref(false)
const viewOpen = ref(false)
const approveOpen = ref(false)
const sheepDetailOpen = ref(false)
const loading = ref(true)
const eweLoading = ref(false)
const ramLoading = ref(false)
@ -253,36 +449,36 @@ const ids = ref([])
const multiple = ref(true)
const total = ref(0)
const activeTab = ref('ewe')
const dateRange = ref([])
const data = reactive({
queryParams: {
pageNum: 1,
pageSize: 10,
planName: null,
status: null
planType: null,
status: null,
params: {}
},
generateForm: {
planType: 1
},
generateRules: {
planType: [
{ required: true, message: '请选择计划类型', trigger: 'change' }
]
}
})
const {queryParams} = toRefs(data)
const {queryParams, generateForm, generateRules} = 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
@ -299,10 +495,36 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
dateRange.value = []
queryParams.value.params = {}
proxy.resetForm("queryRef")
handleQuery()
}
/** 日期范围变化处理 */
function handleDateRangeChange(dates) {
if (dates && dates.length === 2) {
queryParams.value.params.beginTime = dates[0]
queryParams.value.params.endTime = dates[1]
} else {
queryParams.value.params = {}
}
}
/** 获取当前日期 */
function getCurrentDate() {
const today = new Date()
const year = today.getFullYear()
const month = String(today.getMonth() + 1).padStart(2, '0')
const day = String(today.getDate()).padStart(2, '0')
return `${year}-${month}-${day}`
}
/** 获取计划类型名称 */
function getPlanTypeName(planType) {
return planType === 1 ? '同期发情配种计划' : '本交配种计划'
}
// 多选框选中数据
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id)
@ -327,6 +549,7 @@ function handleTabClick(tab) {
/** 生成配种计划按钮操作 */
function handleGenerate() {
generateOpen.value = true
generateForm.value.planType = 1
selectedEwe.value = []
selectedRam.value = []
eligibleEweList.value = []
@ -353,36 +576,43 @@ function selectEligibleRam() {
/** 生成配种计划 */
function generateBreedPlan() {
if (selectedEwe.value.length === 0) {
proxy.$modal.msgError("请选择母羊")
return
}
if (selectedRam.value.length === 0) {
proxy.$modal.msgError("请选择公羊")
return
}
proxy.$refs.generateFormRef.validate((valid) => {
if (!valid) return
const params = {
eweIds: selectedEwe.value,
ramIds: selectedRam.value
}
if (selectedEwe.value.length === 0) {
proxy.$modal.msgError("请选择母羊")
return
}
if (selectedRam.value.length === 0) {
proxy.$modal.msgError("请选择公羊")
return
}
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("生成配种计划失败")
const params = {
planType: generateForm.value.planType,
eweIds: selectedEwe.value,
ramIds: selectedRam.value
}
autoGenerateBreedPlan(params).then(response => {
proxy.$modal.msgSuccess("配种计划生成成功")
generateOpen.value = false
getList()
// 重置表单和选择
generateForm.value = { planType: 1 }
selectedEwe.value = []
selectedRam.value = []
eligibleEweList.value = []
eligibleRamList.value = []
}).catch(error => {
console.error('生成配种计划失败:', error)
proxy.$modal.msgError("生成配种计划失败")
})
})
}
/** 查看配种计划详情 */
function handleView(row) {
viewBreedPlan(row.id).then(response => {
@ -394,14 +624,143 @@ function handleView(row) {
/** 审批配种计划 */
function handleApprove(row) {
proxy.$modal.confirm('是否确认审批通过配种计划"' + row.planName + '"？').then(function () {
return approveBreedPlan(row.id)
getApproveBreedPlan(row.id).then(response => {
approveData.value = response.data
availableRamList.value = response.data.availableRams || []
// 确保每行数据都有正确的公羊ID映射
if (approveData.value.planDetails) {
approveData.value.planDetails.forEach(detail => {
// 如果ram_id是字符串，转换为数字用于下拉框匹配
if (detail.ram_id && typeof detail.ram_id === 'string') {
detail.ram_id = parseInt(detail.ram_id, 10)
}
// 如果当前公羊不在可选列表中，添加到列表中以显示当前选择
if (detail.ram_id && detail.ram_manage_tags &&
!availableRamList.value.find(ram => ram.id === detail.ram_id)) {
availableRamList.value.push({
id: detail.ram_id,
bs_manage_tags: detail.ram_manage_tags
})
}
})
}
approveOpen.value = true
})
}
/** 公羊选择变化处理 */
function handleRamChange(index, row) {
if (row.ram_id === null) {
// 不参与配种
row.ram_manage_tags = ''
row.ram_variety = ''
row.ram_family = ''
row.ram_sheep_type = ''
row.ram_birthday = ''
row.ram_month_age = ''
row.ram_current_weight = ''
row.breed_type = null
} else {
// 确保ram_id是数字类型进行匹配
const ramId = typeof row.ram_id === 'string' ? parseInt(row.ram_id, 10) : row.ram_id
const selectedRam = availableRamList.value.find(ram => ram.id === ramId)
if (selectedRam) {
row.ram_manage_tags = selectedRam.bs_manage_tags
row.ram_variety = selectedRam.variety
row.ram_family = selectedRam.family
row.ram_sheep_type = selectedRam.sheep_type
row.ram_birthday = selectedRam.birthday
row.ram_month_age = selectedRam.month_age
row.ram_current_weight = selectedRam.current_weight
// 设置默认配种类型
if (!row.breed_type) {
row.breed_type = 1 // 默认同期发情
}
}
}
}
/** 显示母羊详情 */
function showEweDetail(row) {
sheepDetail.value = {
manage_tags: row.ewe_manage_tags,
variety: row.ewe_variety,
family: row.ewe_family,
sheep_type: row.ewe_sheep_type,
breed_status: row.ewe_breed_status,
parity: row.ewe_parity,
month_age: row.ewe_month_age,
current_weight: row.ewe_current_weight,
is_core: row.ewe_is_core,
is_breeding: row.ewe_is_breeding,
sheepfold_name: row.ewe_sheepfold_name,
comment: row.ewe_comment,
reproduction_info: row.ewe_reproduction_info
}
sheepDetailTitle.value = '母羊详情'
sheepDetailOpen.value = true
}
/** 显示公羊详情 */
function showRamDetail(row) {
if (!row.ram_id) {
proxy.$modal.msgWarning("该母羊未分配公羊")
return
}
sheepDetail.value = {
manage_tags: row.ram_manage_tags,
variety: row.ram_variety,
family: row.ram_family,
sheep_type: row.ram_sheep_type,
birthday: row.ram_birthday,
month_age: row.ram_month_age,
current_weight: row.ram_current_weight
}
sheepDetailTitle.value = '公羊详情'
sheepDetailOpen.value = true
}
/** 确认审批 */
function confirmApprove() {
proxy.$modal.confirm('确认审批通过此配种计划？').then(function () {
const params = {
planId: approveData.value.planInfo.id,
planDetails: approveData.value.planDetails,
status: 1,
approveRemark: '审批通过'
}
return confirmApproveBreedPlan(params)
}).then(() => {
proxy.$modal.msgSuccess("审批成功")
// 刷新列表
approveOpen.value = false
getList()
}).catch(() => {
})
}).catch(() => {})
}
/** 拒绝审批 */
function rejectApprove() {
proxy.$modal.prompt('请输入拒绝原因', '拒绝审批', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /.+/,
inputErrorMessage: '拒绝原因不能为空'
}).then(({ value }) => {
const params = {
planId: approveData.value.planInfo.id,
status: 2,
approveRemark: value
}
return confirmApproveBreedPlan(params)
}).then(() => {
proxy.$modal.msgSuccess("已拒绝审批")
approveOpen.value = false
getList()
}).catch(() => {})
}
/** 删除按钮操作 */
@ -411,18 +770,35 @@ function handleDelete(row) {
return delBreedPlanGenerate(_ids)
}).then(() => {
proxy.$modal.msgSuccess("删除成功")
// 刷新列表
getList()
}).catch(() => {
})
}).catch(() => {})
}
/** 导出配种计划详情 */
function exportBreedPlanDetails() {
if (!planInfo.value || !planDetails.value || planDetails.value.length === 0) {
proxy.$modal.msgError("暂无数据可导出")
return
}
// 检查是否已审批
if (planInfo.value.status !== 1) {
proxy.$modal.msgError("只有已审批的配种计划才能导出")
return
}
// 使用proxy.download方法，会自动携带认证信息
proxy.download(`/mating_plan/generate/export/${planInfo.value.id}`, {}, `${planInfo.value.planName}_配种计划详情_${new Date().getTime()}.xlsx`)
}
// 页面挂载时加载数据
onMounted(() => {
console.log('配种计划生成页面已挂载')
getList()
})
</script>
// 初始加载数据
getList()
</script>
<style scoped>
.mb8 {
margin-bottom: 8px;
}
</style>

118
src/views/mating_plan/mating_plan/index.vue → src/views/mating_plan/mating_plan/mating_plan/index.vue
View File

@ -3,18 +3,18 @@
<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"
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"
v-model="queryParams.eweId"
placeholder="请输入母羊id"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
@ -26,40 +26,40 @@
<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']"
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']"
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']"
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']"
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>
@ -67,10 +67,17 @@
<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="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" prop="breedType">
<template #default="scope">
<el-tag v-if="scope.row.breedType === 1" type="primary">自然交配</el-tag>
<el-tag v-else-if="scope.row.breedType === 2" type="success">人工授精</el-tag>
<el-tag v-else-if="scope.row.breedType === 3" type="info">胚胎移植</el-tag>
<el-tag v-else type="warning">未知类型</el-tag>
</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="['mating_plan:mating_plan:edit']">修改</el-button>
@ -80,11 +87,11 @@
</el-table>
<pagination
v-show="total>0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
v-show="total>0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改配种计划对话框 -->
@ -96,6 +103,13 @@
<el-form-item label="母羊id" prop="eweId">
<el-input v-model="form.eweId" placeholder="请输入母羊id" />
</el-form-item>
<el-form-item label="配种类型" prop="breedType">
<el-select v-model="form.breedType" placeholder="请选择配种类型">
<el-option label="自然交配" :value="1"></el-option>
<el-option label="人工授精" :value="2"></el-option>
<el-option label="胚胎移植" :value="3"></el-option>
</el-select>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
@ -108,6 +122,7 @@
</template>
<script setup name="Mating_plan">
import { ref, reactive, toRefs, onMounted, getCurrentInstance } from 'vue'
import { listMating_plan, getMating_plan, delMating_plan, addMating_plan, updateMating_plan } from "@/api/mating_plan/mating_plan"
const { proxy } = getCurrentInstance()
@ -132,6 +147,15 @@ const data = reactive({
breedType: null
},
rules: {
ramId: [
{ required: true, message: "公羊id不能为空", trigger: "blur" }
],
eweId: [
{ required: true, message: "母羊id不能为空", trigger: "blur" }
],
breedType: [
{ required: true, message: "配种类型不能为空", trigger: "change" }
]
}
})
@ -141,9 +165,14 @@ 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
mating_planList.value = response.rows || []
total.value = response.total || 0
loading.value = false
}).catch(error => {
console.error('获取列表失败:', error)
loading.value = false
mating_planList.value = []
total.value = 0
})
}
@ -240,5 +269,14 @@ function handleExport() {
}, `mating_plan_${new Date().getTime()}.xlsx`)
}
getList()
// 页面挂载时加载数据
onMounted(() => {
getList()
})
</script>
<style scoped>
.mb8 {
margin-bottom: 8px;
}
</style>

447
src/views/miscarriage/miscarriage/index.vue Normal file
View File

@ -0,0 +1,447 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
<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="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="reason">
<el-select v-model="queryParams.reason" placeholder="请选择流产原因" clearable>
<el-option
v-for="item in reasonOptions"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</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>
<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="['miscarriage:miscarriage:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['miscarriage:miscarriage:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['miscarriage:miscarriage:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['miscarriage:miscarriage:export']"
>导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="miscarriageList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="耳号" align="center" prop="bsManageTags" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="事件类型" align="center">
<template #default="scope">
<span>流产</span>
</template>
</el-table-column>
<el-table-column label="流产日期" align="center" prop="datetime" width="100">
<template #default="scope">
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="流产原因" align="center" prop="reason" />
<el-table-column label="配种类型" align="center" prop="matingTypeName" />
<el-table-column label="配种日期" align="center" prop="matingDate" width="100">
<template #default="scope">
<span>{{ scope.row.matingDate ? parseTime(scope.row.matingDate, '{y}-{m}-{d}') : '-' }}</span>
</template>
</el-table-column>
<el-table-column label="胎次" align="center" prop="parity" />
<el-table-column label="配种公羊品种" align="center" prop="ramVariety" />
<el-table-column label="流产数量" align="center" prop="miscaLamb" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="月龄" align="center" prop="monthAge" />
<el-table-column label="流产时怀孕天数" align="center" prop="pregnantDays" />
<el-table-column label="当前羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建日期" align="center" prop="createTime" width="100">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="所在牧场" align="center" prop="drRanch" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="是否列胎次" align="center" prop="status">
<template #default="scope">
<el-tag v-if="scope.row.status === 1" type="success">是</el-tag>
<el-tag v-else-if="scope.row.status === 0" type="danger">否</el-tag>
</template>
</el-table-column>
<el-table-column label="是否见胎" align="center" prop="exposeType">
<template #default="scope">
<el-tag v-if="scope.row.exposeType === 1" type="success">是</el-tag>
<el-tag v-else-if="scope.row.exposeType === 2" type="warning">复检无胎</el-tag>
<el-tag v-else-if="scope.row.exposeType === 3" type="danger">返情</el-tag>
</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="['miscarriage:miscarriage:edit']">修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['miscarriage:miscarriage: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="600px" append-to-body>
<el-form ref="miscarriageRef" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="12">
<el-form-item label="耳号" prop="manageTags">
<el-input
v-model="form.manageTags"
placeholder="请输入羊只耳号"
@blur="handleEarTagChange"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<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-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="流产原因" prop="reason">
<el-select v-model="form.reason" placeholder="请选择流产原因" style="width: 100%;">
<el-option
v-for="item in reasonOptions"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="是否列胎次" prop="status">
<el-select v-model="form.status" placeholder="请选择" style="width: 100%;" @change="handleStatusChange">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否见胎" prop="exposeType">
<el-select v-model="form.exposeType" placeholder="请选择" style="width: 100%;" :disabled="form.status === 1">
<el-option label="是" :value="1"></el-option>
<el-option label="复检无胎" :value="2"></el-option>
<el-option label="返情" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="流产羔羊数" prop="miscaLamb">
<el-input-number v-model="form.miscaLamb" :min="0" :max="10" style="width: 100%;" />
</el-form-item>
</el-col>
</el-row>
<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="Miscarriage">
import { listMiscarriage, getMiscarriage, delMiscarriage, addMiscarriage, updateMiscarriage, getSheepInfo, getReasonOptions } from "@/api/miscarriage/miscarriage"
const { proxy } = getCurrentInstance()
const miscarriageList = 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 reasonOptions = ref([])
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
bsManageTags: null,
variety: null,
datetime: null,
comment: null,
technician: null,
reason: null,
exposeType: null,
status: null,
miscaLamb: null,
},
rules: {
manageTags: [
{ required: true, message: "耳号不能为空", trigger: "blur" }
],
datetime: [
{ required: true, message: "事件日期不能为空", trigger: "blur" }
],
reason: [
{ required: true, message: "流产原因不能为空", trigger: "change" }
],
status: [
{ required: true, message: "是否列胎次不能为空", trigger: "change" }
],
exposeType: [
{ required: true, message: "是否见胎不能为空", trigger: "change" }
]
}
})
const { queryParams, form, rules } = toRefs(data)
/** 查询流产记录列表 */
function getList() {
loading.value = true
listMiscarriage(queryParams.value).then(response => {
miscarriageList.value = response.rows
total.value = response.total
loading.value = false
})
}
/** 获取流产原因选项 */
function getReasonOptionsList() {
getReasonOptions().then(response => {
reasonOptions.value = response.data
})
}
// 取消按钮
function cancel() {
open.value = false
reset()
}
// 表单重置
function reset() {
form.value = {
id: null,
sheepId: null,
manageTags: null,
datetime: null,
comment: null,
technician: null,
reason: null,
exposeType: null,
status: null,
miscaLamb: null
}
proxy.resetForm("miscarriageRef")
}
/** 搜索按钮操作 */
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
getMiscarriage(_id).then(response => {
form.value = response.data
form.value.manageTags = response.data.bsManageTags
open.value = true
title.value = "修改流产记录"
})
}
/** 耳号输入框失焦事件 */
function handleEarTagChange() {
if (form.value.manageTags) {
getSheepInfo(form.value.manageTags).then(response => {
if (response.data) {
// 这里可以显示羊只相关信息或做验证
proxy.$modal.msgSuccess("羊只信息验证成功")
} else {
proxy.$modal.msgError("未找到该耳号对应的羊只信息")
}
}).catch(() => {
proxy.$modal.msgError("羊只信息查询失败")
})
}
}
/** 是否列胎次变化事件 */
function handleStatusChange(value) {
if (value === 1) {
// 如果选择是，则是否见胎默认选择是
form.value.exposeType = 1
} else {
// 如果选择否，则清空是否见胎的值
form.value.exposeType = null
}
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["miscarriageRef"].validate(valid => {
if (valid) {
// 将耳号转换为sheepId保存
form.value.sheepId = form.value.manageTags
if (form.value.id != null) {
updateMiscarriage(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
getList()
})
} else {
addMiscarriage(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 delMiscarriage(_ids)
}).then(() => {
getList()
proxy.$modal.msgSuccess("删除成功")
}).catch(() => {})
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('miscarriage/miscarriage/export', {
...queryParams.value
}, `miscarriage_${new Date().getTime()}.xlsx`)
}
getList()
getReasonOptionsList()
</script>

157
src/views/produce/bodyManage/body_measure/index.vue
View File

@ -4,13 +4,32 @@
<!-- <el-form-item label="羊只id" prop="sheepId">
<el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="创建时间" 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>
<el-form-item label="测量日期" style="width: 308px">
<el-date-picker v-model="daterangeMeasureDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
</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="sheepfoldId">
<el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
<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" style="width: 308px">
<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="sheepTypeId">
<el-select v-model="queryParams.sheepTypeId" placeholder="请选择羊只类别" clearable style="min-width:150px">
<el-option v-for="type in sheepTypeList" :key="type.id" :label="type.name" :value="type.id" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -40,9 +59,30 @@
<el-table v-loading="loading" :data="body_measureList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
<!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
<el-table-column label="管理耳号" align="center" prop="manageTags" fixed min-width="100px" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180" fixed>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="测量日期" align="center" prop="measureDate" width="120">
<template #default="scope">
<span>{{ parseTime(scope.row.measureDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="事件类型" align="center" prop="eventType" width="120" />
<el-table-column label="羊只类别" align="center" prop="sheepTypeName" />
<el-table-column label="性别" align="center">
<template #default="scope">
<span>{{ genderMap[scope.row.gender] || '未知' }}</span>
</template>
</el-table-column>
<el-table-column label="胎次" align="center" prop="parity" />
<el-table-column label="出生体重(kg)" align="center" prop="birthWeight" min-width="100px" />
<el-table-column label="断奶体重(kg)" align="center" prop="weaningWeight" min-width="100px" />
<el-table-column label="当前体重(kg)" align="center" prop="currentWeight" min-width="100px" />
<el-table-column label="体高" align="center" prop="height" />
<el-table-column label="胸围" align="center" prop="bust" />
<el-table-column label="体斜长" align="center" prop="bodyLength" />
@ -53,14 +93,29 @@
<el-table-column label="尻高" align="center" prop="rumpHeignt" />
<el-table-column label="腰角宽" align="center" prop="hipWidth" />
<el-table-column label="十字部高" align="center" prop="hipCrossHeight" />
<el-table-column label="繁育状态" align="center" prop="breedStatusName" width="100">
<template #default="scope">
<span>{{ scope.row.breedStatusName || '未设置' }}</span>
</template>
</el-table-column>
<el-table-column label="泌乳天数" align="center" prop="lactationDay" width="100">
<template #default="scope">
<span>{{ scope.row.lactationDay || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="怀孕天数" align="center" prop="gestationDay" width="100">
<template #default="scope">
<span>{{ scope.row.gestationDay || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="配后天数" align="center" prop="postMatingDay" width="100">
<template #default="scope">
<span>{{ scope.row.postMatingDay || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="comment" min-width="100px" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="创建人" align="center" prop="createBy" />
<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" class-name="small-padding fixed-width" fixed="right" min-width="130px">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@ -84,7 +139,10 @@
<el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="onManageTagsBlur" :disabled="!isAdd"
clearable />
</el-form-item>
<el-form-item label="测量日期" prop="measureDate">
<el-date-picker v-model="form.measureDate" value-format="YYYY-MM-DD" type="date" placeholder="请选择测量日期"
:disabled="!isAdd"></el-date-picker>
</el-form-item>
<el-form-item label="体高" prop="height">
<el-input v-model="form.height" placeholder="请输入体高" :disabled="!isAdd" clearable />
</el-form-item>
@ -149,10 +207,11 @@
</template>
<script setup name="Body_measure">
import { listBody_measure, getBody_measure, delBody_measure, addBody_measure, updateBody_measure } from "@/api/produce/bodyManage/body_measure"
import { getCurrentInstance } from 'vue'
import { listBody_measure, getBody_measure, delBody_measure, addBody_measure, updateBody_measure, getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
import { getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { getVarietyOptions } from '@/api/produce/other/fixHoof'
import { getCurrentInstance } from 'vue'
const { proxy } = getCurrentInstance()
const body_measureList = ref([])
@ -166,6 +225,13 @@ const total = ref(0)
const title = ref("")
const daterangeCreateTime = ref([])
const isAdd = ref(false)
const daterangeMeasureDate = ref([]);
const genderMap = {
1: '母',
2: '公',
3: '阉羊'
};
const data = reactive({
form: { manageTags: null, technician: null },
@ -173,7 +239,10 @@ const data = reactive({
pageNum: 1,
pageSize: 10,
sheepId: null,
sheepfoldId: null,
varietyId: null,
manageTags: null,
measureDate: null,
createTime: null
},
rules: {
@ -183,7 +252,12 @@ const data = reactive({
technician: [
{ required: true, message: '请输入技术员', trigger: 'blur' }
],
}
measureDate: [
{ required: true, message: '请选择测量日期', trigger: 'change' }
]
},
sheepfoldName: '',
varietyName: '',
})
const { queryParams, form, rules } = toRefs(data)
@ -196,6 +270,10 @@ function getList() {
queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
}
if (daterangeMeasureDate.value.length > 0) {
queryParams.value.params["beginMeasureDate"] = daterangeMeasureDate.value[0];
queryParams.value.params["endMeasureDate"] = daterangeMeasureDate.value[1];
}
listBody_measure(queryParams.value).then(response => {
body_measureList.value = response.rows
total.value = response.total
@ -252,6 +330,7 @@ function reset() {
comment: null,
technician: null,
createBy: null,
measureDate: null,
createTime: null
}
proxy.resetForm("body_measureRef")
@ -265,9 +344,14 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
daterangeCreateTime.value = []
proxy.resetForm("queryRef")
handleQuery()
daterangeCreateTime.value = [];
queryParams.value.sheepfoldId = null;
data.sheepfoldName = '';
queryParams.value.varietyId = null;
data.varietyName = '';
daterangeMeasureDate.value = [];
proxy.resetForm("queryRef");
handleQuery();
}
// 多选框选中数据
@ -321,7 +405,7 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除体尺测量编号为"' + _ids + '"的数据项？').then(function () {
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
return delBody_measure(_ids)
}).then(() => {
getList()
@ -336,5 +420,36 @@ function handleExport() {
}, `body_measure_${new Date().getTime()}.xlsx`)
}
getList()
//加载羊舍数据
const sheepfoldOptions = ref([])
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows
})
}
//加载品种数据
const varietyOptions = ref([])
function loadVarietyOptions() {
getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
varietyOptions.value = res.rows;
})
}
// 加载羊只类别数据
const sheepTypeList = ref([]);
function loadSheepTypeList() {
getSheepTypeList().then(response => {
sheepTypeList.value = response.rows || [];
}).catch(error => {
console.error('加载羊只类别失败', error);
});
}
onMounted(() => {
getSheepfoldOptions()
loadSheepTypeList()
loadVarietyOptions()
getList()
})
</script>

101
src/views/produce/bodyManage/body_score/index.vue
View File

@ -4,29 +4,31 @@
<!-- <el-form-item label="羊只id" prop="sheepId">
<el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
<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>
<el-form-item label="事件日期" style="width: 308px">
<el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="体况评分" prop="score">
<el-input v-model="queryParams.score" placeholder="请输入体况评分" clearable @keyup.enter="handleQuery"
style="max-width: 150px;" />
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
</el-form-item>
<el-form-item label="羊舍" prop="sheepfold">
<el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" clearable filterable @keyup.enter="handleQuery">
<el-option v-for="item in sheepfoldList" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
<el-form-item label="品种" prop="varietyId">
<el-select v-model="queryParams.varietyId" placeholder="请选择品种" clearable style="min-width:150px">
<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="羊舍id" prop="sheepfold">
<el-input v-model="queryParams.sheepfold" placeholder="请输入羊舍id" clearable @keyup.enter="handleQuery" />
<!-- <el-form-item label="体况评分" prop="score">
<el-input v-model="queryParams.score" placeholder="请输入体况评分" clearable @keyup.enter="handleQuery"
style="max-width: 150px;" />
</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="sheepfold">
<el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -39,10 +41,10 @@
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['body_score:body_score:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['body_score:body_score:edit']">修改</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['body_score:body_score:remove']">删除</el-button>
@ -58,27 +60,29 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
<!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
<el-table-column label="管理耳号" align="center" prop="manageTags" fixed />
<el-table-column label="事件日期" align="center" prop="datetime" width="180">
<el-table-column label="创建时间" align="center" prop="createTime" min-width="130px" fixed>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="事件日期" align="center" prop="datetime" min-width="120px">
<template #default="scope">
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="事件类型" align="center" prop="eventType" />
<el-table-column label="体况评分" align="center" prop="score" />
<!-- <el-table-column label="羊舍id" align="center" prop="sheepfold" /> -->
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
<el-table-column label="备注" align="center" prop="comment" min-width="130px" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150px" fixed="right">
<template #default="scope">
<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="150px">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['body_score:body_score:edit']">修改</el-button>
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['body_score:body_score:edit']">修改</el-button> -->
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['body_score:body_score:remove']">删除</el-button>
</template>
@ -133,8 +137,8 @@
<script setup name="Body_score">
import { listBody_score, getBody_score, delBody_score, addBody_score, updateBody_score } from "@/api/produce/bodyManage/body_score"
import { listSheepfold } from "@/api/produce/manage_sheep/trans_group"
import { checkSheepByManageTags } from "@/api/produce/other/fixHoof"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { checkSheepByManageTags, getVarietyOptions } from "@/api/produce/other/fixHoof"
import { getCurrentInstance, ref, reactive, toRefs } from 'vue'
const { proxy } = getCurrentInstance()
@ -167,6 +171,8 @@ const data = reactive({
pageNum: 1,
pageSize: 10,
manageTags: null,
varietyId: null,
sheepfold: null,
score: null,
createTime: null
},
@ -177,6 +183,9 @@ const data = reactive({
score: [
{ required: true, message: '请输入体况评分', trigger: 'blur' }
],
datetime:[
{ required: true, message: '请选择事件日期', trigger: 'blur' }
],
technician: [
{ required: true, message: '请输入技术员', trigger: 'blur' }
]
@ -234,14 +243,12 @@ function onManageTagsBlur() {
});
}
// 加载羊舍列表
function loadSheepfoldList() {
listSheepfold().then(response => {
sheepfoldList.value = response.rows || [];
}).catch(err => {
console.error("加载羊舍列表失败：", err);
proxy.$modal.msgError("加载羊舍列表失败，请刷新页面重试");
});
//加载羊舍数据
const sheepfoldOptions = ref([])
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows
})
}
// 取消按钮
@ -276,6 +283,7 @@ function handleQuery() {
function resetQuery() {
daterangeDatetime.value = []
daterangeCreateTime.value = []
queryParams.value.varietyId = null;
proxy.resetForm("queryRef")
handleQuery()
}
@ -335,7 +343,7 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除体况评分编号为"' + _ids + '"的数据项？').then(function () {
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
return delBody_score(_ids)
}).then(() => {
getList()
@ -350,6 +358,17 @@ function handleExport() {
}, `body_score_${new Date().getTime()}.xlsx`)
}
getList()
loadSheepfoldList();
//加载品种数据
const varietyOptions = ref([])
function loadVarietyOptions() {
getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
varietyOptions.value = res.rows;
})
}
onMounted(() => {
loadVarietyOptions()
getSheepfoldOptions()
getList()
})
</script>

97
src/views/produce/bodyManage/breast_rating/index.vue
View File

@ -4,29 +4,42 @@
<!-- <el-form-item label="羊只id" prop="sheepId">
<el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="创建时间" 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>
<el-form-item label="事件日期" style="width: 308px">
<el-date-picker v-model="daterangeEventDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入耳号搜索" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
</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="varietyId">
<el-select v-model="queryParams.varietyId" placeholder="请选择品种" clearable style="min-width:150px">
<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="sheepfoldId">
<el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
</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="handleAdd"
v-hasPermi="['breast_rating:breast_rating:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['breast_rating:breast_rating:edit']">修改</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['breast_rating:breast_rating:remove']">删除</el-button>
@ -40,27 +53,33 @@
<el-table v-loading="loading" :data="breast_ratingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
<!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
<el-table-column label="管理耳号" align="center" prop="manageTags" />
<el-table-column label="创建时间" align="center" prop="createTime" min-width="150" fixed>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="事件日期" align="center" prop="eventDate" min-width="120px">
<template #default="scope">
<span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="事件类型" align="center" prop="eventType" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="120px" />
<el-table-column label="乳房深度" align="center" prop="depth" />
<el-table-column label="乳房长度" align="center" prop="length" />
<el-table-column label="乳房位置" align="center" prop="position" />
<el-table-column label="乳房附着" align="center" prop="adbere" />
<el-table-column label="乳房间隔度" align="center" prop="spacing" />
<el-table-column label="乳房间隔度" align="center" prop="spacing" min-width="120px" />
<el-table-column label="乳房评分" align="center" prop="score" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="150">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120px" fixed="right">
<template #default="scope">
<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="120px">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['breast_rating:breast_rating:edit']">修改</el-button>
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['breast_rating:breast_rating:edit']">修改</el-button> -->
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['breast_rating:breast_rating:remove']">删除</el-button>
</template>
@ -80,6 +99,11 @@
<el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="onManageTagsBlur" clearable
:disabled="!isAdd" />
</el-form-item>
<el-form-item label="事件日期" prop="eventDate">
<el-date-picker clearable v-model="form.eventDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择事件日期"
:disabled="!isAdd">
</el-date-picker>
</el-form-item>
<el-form-item label="乳房深度" prop="depth">
<el-input v-model="form.depth" placeholder="请输入乳房深度" :disabled="!isAdd" />
</el-form-item>
@ -117,7 +141,8 @@
<script setup name="Breast_rating">
import { listBreast_rating, getBreast_rating, delBreast_rating, addBreast_rating, updateBreast_rating } from "@/api/produce/bodyManage/breast_rating"
import { checkSheepByManageTags } from "@/api/produce/other/fixHoof"
import { checkSheepByManageTags, getVarietyOptions } from "@/api/produce/other/fixHoof"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { getCurrentInstance, reactive, ref } from "vue"
const { proxy } = getCurrentInstance()
@ -132,11 +157,13 @@ const multiple = ref(true)
const total = ref(0)
const title = ref("")
const daterangeCreateTime = ref([])
const daterangeEventDate = ref([]);
const isAdd = ref(false)
const data = reactive({
form: {
id: null,
manageTags: null,
eventDate: null,
depth: null,
length: null,
position: null,
@ -155,6 +182,9 @@ const data = reactive({
manageTags: [
{ required: true, message: '请输入管理耳号', trigger: 'blur' }
],
eventDate:[
{ required: true, message: '请选择事件日期', trigger: 'blur' }
],
score: [
{ required: true, message: '请输入乳房评分', trigger: 'blur' }
],
@ -170,6 +200,10 @@ const { queryParams, form, rules } = toRefs(data)
function getList() {
loading.value = true
queryParams.value.params = {}
if (daterangeEventDate.value.length) {
queryParams.value.params["beginEventDate"] = daterangeEventDate.value[0]
queryParams.value.params["endEventDate"] = daterangeEventDate.value[1]
}
if (daterangeCreateTime.value.length) {
queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
@ -241,6 +275,7 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
daterangeCreateTime.value = []
daterangeEventDate.value = [];
proxy.resetForm("queryRef")
handleQuery()
}
@ -300,7 +335,7 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除乳房评分编号为"' + _ids + '"的数据项？').then(function () {
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
return delBreast_rating(_ids)
}).then(() => {
getList()
@ -315,5 +350,25 @@ function handleExport() {
}, `breast_rating_${new Date().getTime()}.xlsx`)
}
getList()
//加载羊舍数据
const sheepfoldOptions = ref([])
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows
})
}
//加载品种数据
const varietyOptions = ref([])
function loadVarietyOptions() {
getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
varietyOptions.value = res.rows;
})
}
onMounted(() => {
loadVarietyOptions()
getSheepfoldOptions()
getList()
})
</script>

135
src/views/produce/manage_sheep/add_sheep/index.vue
View File

@ -14,9 +14,24 @@
<el-input v-model="form.earNumber" placeholder="请输入耳号" @blur="handleEarNumberBlur" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="入群日期" prop="joinDate">
<el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="10">
<el-form-item label="牧场" prop="ranchId">
<el-select v-model="form.ranchId" placeholder="请选择牧场" clearable @change="handleRanchChange" required>
<el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName" :value="ranch.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="羊舍" prop="sheepfold">
<el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
<el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable :disabled="!form.ranchId">
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
</el-select>
</el-form-item>
@ -61,7 +76,7 @@
</el-col>
<el-col :span="10">
<el-form-item label="胎次" prop="parity">
<el-input v-model="form.parity" placeholder="请输入胎次" />
<el-input-number v-model="form.parity" :min="0" label="胎次" />
</el-form-item>
</el-col>
</el-row>
@ -75,13 +90,16 @@
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="入群日期" prop="joinDate">
<el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
<el-form-item label="羊只类别" prop="typeId">
<el-select v-model="form.typeId" placeholder="请选择羊只类别" clearable>
<el-option v-for="type in sheepTypeList" :key="type.id" :label="type.name" :value="Number(type.id)" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="10">
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" />
@ -102,26 +120,28 @@
<el-button @click="resetForm">重置</el-button>
</el-form-item>
</el-form>
</div>
<!-- 导入弹窗 -->
<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>
<i class="el-icon-upload" />
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
</el-upload>
<template #footer>
<el-button type="info" @click="downloadTemplate">下载模板</el-button>
<el-button type="primary" @click="submitUpload">确 定</el-button>
</template>
</el-dialog>
<!-- 导入弹窗 -->
<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>
<i class="el-icon-upload" />
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
</el-upload>
<template #footer>
<el-button type="info" @click="downloadTemplate">下载模板</el-button>
<el-button type="primary" @click="submitUpload">确 定</el-button>
</template>
</el-dialog>
</div>
</template>
<script setup>
import { ref, onMounted, getCurrentInstance } from 'vue'
import { ref, getCurrentInstance } from 'vue'
import request from '@/utils/request'
import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep'
import { getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
import { listRanch } from '@/api/produce/manage_sheep/trans_group'
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { getToken } from '@/utils/auth'
@ -129,6 +149,7 @@ import { getToken } from '@/utils/auth'
const { proxy } = getCurrentInstance()
const form = ref({
earNumber: '',
ranchId: null,
sheepfold: '',
father: '',
mother: '',
@ -137,24 +158,29 @@ const form = ref({
gender: '',
parity: '',
varietyId: '',
typeId: null,
joinDate: '',
comment: '',
technician: ''
})
const formRef = ref(null)
const sheepfoldOptions = ref([])
const varietyOptions = ref([])
const ranchOptions = ref([])
const rules = {
earNumber: [
{ required: true, message: '请输入耳号', trigger: 'blur' },
{ validator: checkEarNumberExists, trigger: 'blur' }
],
ranchId: [{ required: true, message: '请选择牧场', trigger: 'change' }],
sheepfold: [{ required: true, message: '请选择羊舍', trigger: 'change' }],
bornWeight: [{ required: true, message: '请输入出生体重', trigger: 'blur' }],
bornWeight: [{ required: true, message: '请输入出生体重', trigger: 'change' }],
birthday: [{ required: true, message: '请选择出生日期', trigger: 'change' }],
gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }],
joinDate:[{ required: true, message: '请选择入群日期', trigger: 'change' }],
technician:[{ required: true, message: '请输入技术员', trigger: 'change' }],
typeId: [{ required: true, message: '请选择羊只类别', trigger: 'change' }],
joinDate: [{ required: true, message: '请选择入群日期', trigger: 'change' }],
technician: [{ required: true, message: '请输入技术员', trigger: 'change' }],
}
// 校验耳号是否存在
@ -189,15 +215,33 @@ function handleEarNumberBlur() {
formRef.value.validateField('earNumber')
}
function handleRanchChange(ranchId) {
form.value.sheepfold = '';
sheepfoldOptions.value = [];
const sheepfoldOptions = ref([])
const varietyOptions = ref([])
if (!ranchId) return;
listSheepfold({
pageNum: 1,
pageSize: 9999,
ranchId: ranchId
}).then(res => {
if (res.rows && res.rows.length > 0) {
sheepfoldOptions.value = res.rows || [];
} else {
proxy.$modal.msgWarning(`该牧场下暂无羊舍数据`);
}
}).catch(error => {
console.error('加载羊舍数据失败', error);
proxy.$modal.msgError('获取羊舍数据失败');
});
}
//羊舍列表
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows || []
})
// listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
// sheepfoldOptions.value = res.rows || []
// })
}
//品种列表
@ -211,6 +255,29 @@ function getVarietyOptions() {
})
}
//加载所有牧场列表
function loadRanchList() {
listRanch().then(res => {
ranchOptions.value = res.rows.map(ranch => ({
id: ranch.id,
ranchName: ranch.ranch
}));
}).catch(error => {
console.error('加载牧场列表失败', error);
proxy.$modal.msgError('获取牧场数据失败');
});
}
// 加载羊只类别数据
const sheepTypeList = ref([]);
function loadSheepTypeList() {
getSheepTypeList().then(response => {
sheepTypeList.value = response.rows || [];
}).catch(error => {
console.error('加载羊只类别失败', error);
});
}
//确保日期格式一致
function formatDate(date) {
if (!date) return null;
@ -237,6 +304,7 @@ function submitForm() {
addSheep(formData).then(res => {
if (res.code === 200) {
proxy.$modal.msgSuccess('新增成功');
formRef.value.clearValidate();
resetForm();
} else {
proxy.$modal.msgError(res.msg || '新增失败');
@ -254,8 +322,9 @@ function resetForm() {
bornWeight: '',
birthday: '',
gender: '',
parity: '',
parity: 0,
varietyId: '',
typeId: null,
joinDate: '',
comment: '',
technician: ''
@ -312,10 +381,12 @@ function handleImportError(err) {
proxy.$modal.msgError('导入失败：' + msg)
}
getSheepfoldOptions()
getVarietyOptions()
onMounted(() => {
getSheepfoldOptions()
loadSheepTypeList()
loadRanchList()
getVarietyOptions()
})
</script>
<style scoped>

54
src/views/produce/manage_sheep/changeComment/index.vue
View File

@ -9,6 +9,10 @@
@keyup.enter="handleQuery"
/>
</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>
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
@ -21,9 +25,10 @@
<el-input v-model="queryParams.oldComment" placeholder="请输入原备注" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
</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="sheepfoldId">
<el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
<el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -36,10 +41,10 @@
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['changeComment:changeComment:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['changeComment:changeComment:edit']">修改</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['changeComment:changeComment:remove']">删除</el-button>
@ -55,19 +60,21 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
<!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="管理耳号" align="center" prop="manageTags" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="事件类型" align="center" prop="eventType" width="120" />
<el-table-column label="新备注" align="center" prop="newComment" />
<el-table-column label="原备注" align="center" prop="oldComment" />
<el-table-column label="创建人" align="center" prop="createBy" />
<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" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['changeComment:changeComment:edit']">修改</el-button>
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['changeComment:changeComment:edit']">修改</el-button> -->
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['changeComment:changeComment:remove']">删除</el-button>
</template>
@ -90,7 +97,7 @@
<el-input v-model="form.newComment" placeholder="请输入新备注" :disabled="!isAddMode" />
</el-form-item>
<el-form-item label="原备注" prop="oldComment">
<el-input v-model="form.oldComment" placeholder="请输入原备注" :disabled="!isAddMode" />
<el-input v-model="form.oldComment" placeholder="请输入原备注" disabled />
</el-form-item>
</el-form>
<template #footer>
@ -106,6 +113,7 @@
<script setup name="ChangeComment">
import { listChangeComment, getChangeComment, delChangeComment, addChangeComment, updateChangeComment } from "@/api/produce/manage_sheep/changeComment"
import { getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
const { proxy } = getCurrentInstance()
@ -127,6 +135,7 @@ const data = reactive({
pageSize: 10,
sheepId: null,
manageTags: null,
sheepfoldId: null,
newComment: null,
oldComment: null,
createTime: null
@ -151,6 +160,9 @@ function getList() {
queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
}
if (queryParams.value.sheepfoldId) {
queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
}
listChangeComment(queryParams.value).then(response => {
changeCommentList.value = response.rows
total.value = response.total
@ -208,6 +220,7 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
daterangeCreateTime.value = []
queryParams.value.sheepfoldId = null
proxy.resetForm("queryRef")
handleQuery()
}
@ -270,7 +283,7 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除改备注编号为"' + _ids + '"的数据项？').then(function () {
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
return delChangeComment(_ids)
}).then(() => {
getList()
@ -285,5 +298,16 @@ function handleExport() {
}, `changeComment_${new Date().getTime()}.xlsx`)
}
getList()
//加载羊舍数据
const sheepfoldOptions = ref([])
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows
})
}
onMounted(() => {
getSheepfoldOptions();
getList();
});
</script>

54
src/views/produce/manage_sheep/changeEar/index.vue
View File

@ -4,6 +4,10 @@
<!-- <el-form-item label="羊只id" prop="sheepId">
<el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="创建时间" style="width: 300px">
<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>
<el-form-item label="耳号" prop="manageTag">
<el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
@ -16,9 +20,10 @@
<el-input v-model="queryParams.oldTag" placeholder="请输入旧耳号" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
</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="sheepfoldId">
<el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
<el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -31,10 +36,10 @@
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['changeEar:changeEar:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['changeEar:changeEar:edit']">修改</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['changeEar:changeEar:remove']">删除</el-button>
@ -50,7 +55,14 @@
<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="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="耳号" align="center" prop="manageTags" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="事件类型" align="center" prop="eventType" />
<el-table-column label="耳号类型" align="center" prop="earType">
<template #default="scope">
{{ scope.row.earType === 0 ? '电子耳号' : '管理耳号' }}
@ -60,15 +72,10 @@
<el-table-column label="旧耳号" align="center" prop="oldTag" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="创建人" align="center" prop="createBy" />
<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" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['changeEar:changeEar:edit']">修改</el-button>
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['changeEar:changeEar:edit']">修改</el-button> -->
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['changeEar:changeEar:remove']">删除</el-button>
</template>
@ -87,7 +94,6 @@
<el-form-item label="耳号" prop="earNumber">
<el-input v-model="form.earNumber" placeholder="请输入管理耳号或电子耳号" @change="fetchOldTag" :disabled="!isAddMode" />
</el-form-item>
<el-form-item label="耳号类型" prop="earType">
<el-select v-model="form.earType" placeholder="请选择耳号类型" @change="fetchOldTag" :disabled="!isAddMode">
<el-option label="电子耳号" :value="0"></el-option>
@ -98,7 +104,7 @@
<el-input v-model="form.newTag" placeholder="请输入新耳号/电子耳号" @blur="checkNewTagExists" :disabled="!isAddMode" />
</el-form-item>
<el-form-item label="旧耳号" prop="oldTag">
<el-input v-model="form.oldTag" placeholder="请输入旧耳号/电子耳号" :disabled="!isAddMode" />
<el-input v-model="form.oldTag" placeholder="请输入旧耳号/电子耳号" disabled />
</el-form-item>
<el-form-item label="备注" prop="comment" v-if="!isAddMode">
<el-input v-model="form.comment" type="textarea" placeholder="请输入内容" :disabled="!isAddMode" />
@ -115,8 +121,8 @@
</template>
<script setup name="ChangeEar">
import { listChangeEar, getChangeEar, delChangeEar, addChangeEar, updateChangeEar, getSheepByEarNumber,checkTagExists } from "@/api/produce/manage_sheep/changeEar"
import { listChangeEar, getChangeEar, delChangeEar, addChangeEar, updateChangeEar, getSheepByEarNumber, checkTagExists } from "@/api/produce/manage_sheep/changeEar"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
const { proxy } = getCurrentInstance()
const changeEarList = ref([])
@ -138,6 +144,7 @@ const data = reactive({
pageSize: 10,
manageTags: null,
// sheepId: null,
sheepfoldId: null,
earType: null,
newTag: null,
oldTag: null,
@ -168,6 +175,9 @@ async function getList() {
if (queryParams.value.manageTags) {
queryParams.value.params["manageTags"] = queryParams.value.manageTags;
}
if (queryParams.value.sheepfoldId) {
queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
}
if (daterangeCreateTime.value && daterangeCreateTime.value.length > 0) {
queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0];
queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1];
@ -214,7 +224,7 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
daterangeCreateTime.value = []
queryParams.value.sheepfoldName = null
queryParams.value.manageTags = null
queryParams.value.newTag = null
queryParams.value.oldTag = null
@ -347,7 +357,7 @@ function fetchOldTag() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除修改电子耳号记录编号为"' + _ids + '"的数据项？').then(function () {
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
return delChangeEar(_ids)
}).then(() => {
getList()
@ -362,8 +372,16 @@ function handleExport() {
}, `changeEar_${new Date().getTime()}.xlsx`)
}
//加载羊舍数据
const sheepfoldOptions = ref([])
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows
})
}
onMounted(() => {
getSheepfoldOptions();
getList();
});
</script>

51
src/views/produce/manage_sheep/changeVariety/index.vue
View File

@ -9,6 +9,10 @@
@keyup.enter="handleQuery"
/>
</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>
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="width: 150px;" />
@ -23,9 +27,10 @@
<el-option v-for="item in varietyOptions" :key="item.value" :label="item.label" :value="item.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-date-picker>
<el-form-item label="羊舍" prop="sheepfoldId">
<el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
<el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -38,10 +43,10 @@
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['changeVariety:changeVariety:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['changeVariety:changeVariety:edit']">修改</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['changeVariety:changeVariety:remove']">删除</el-button>
@ -57,20 +62,22 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="羊只id" align="center" prop="sheepId" /> -->
<el-table-column label="创建日期" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="管理耳号" align="center" prop="manageTags" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="事件类型" align="center" prop="eventType" width="120" />
<el-table-column label="原品种" align="center" prop="varietyOld" />
<el-table-column label="新品种" align="center" prop="varietyNew" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="创建人" align="center" prop="createBy" />
<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" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['changeVariety:changeVariety:edit']">修改</el-button>
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['changeVariety:changeVariety:edit']">修改</el-button> -->
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['changeVariety:changeVariety:remove']">删除</el-button>
</template>
@ -90,7 +97,7 @@
<el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="onManageTagsBlur" :disabled="!isAdd" />
</el-form-item>
<el-form-item label="原品种" prop="varietyOld">
<el-input v-model="form.varietyOld" placeholder="请输入原品种" :disabled="!isAdd" />
<el-input v-model="form.varietyOld" placeholder="请输入原品种" disabled />
</el-form-item>
<el-form-item label="新品种" prop="varietyNew">
<el-select v-model="form.varietyNew" placeholder="请选择新品种" clearable filterable :disabled="!isAdd">
@ -113,6 +120,7 @@
<script setup name="ChangeVariety">
import { listChangeVariety, getChangeVariety, delChangeVariety, addChangeVariety, updateChangeVariety, getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { listVariety } from '@/api/variety/variety'
const { proxy } = getCurrentInstance()
@ -139,6 +147,7 @@ const data = reactive({
pageSize: 10,
// sheepId: null,
manageTags: null,
sheepfoldId: null,
varietyOld: null,
varietyNew: null,
createTime: null
@ -166,6 +175,9 @@ function getList() {
queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
}
if (queryParams.value.sheepfoldId) {
queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
}
listChangeVariety(queryParams.value).then(response => {
changeVarietyList.value = response.rows
total.value = response.total
@ -234,6 +246,7 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
daterangeCreateTime.value = []
queryParams.value.sheepfoldId = null;
proxy.resetForm("queryRef")
handleQuery()
}
@ -298,7 +311,7 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除改品种记录编号为"' + _ids + '"的数据项？').then(function () {
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
return delChangeVariety(_ids)
}).then(() => {
getList()
@ -313,8 +326,18 @@ function handleExport() {
}, `changeVariety_${new Date().getTime()}.xlsx`)
}
//加载羊舍数据
const sheepfoldOptions = ref([])
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows
})
}
onMounted(() => {
loadVarietyOptions();
getSheepfoldOptions();
getList();
});
</script>

405
src/views/produce/manage_sheep/trans_group/index.vue
View File

@ -1,16 +1,29 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<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>
<el-form-item label="转群日期" style="width: 308px">
<el-date-picker v-model="daterangeTransDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery"
style="width: 150px;" />
</el-form-item>
<el-form-item label="转出羊舍" prop="foldFrom">
<el-form-item label="事件类型" prop="eventType">
<el-select v-model="queryParams.eventType" placeholder="请选择事件类型" style="min-width:150px" clearable required>
<el-option v-for="dict in eventTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="转出羊舍" prop="foldFrom" style="width: 308px">
<el-select v-model="queryParams.foldFrom" placeholder="请选择转出羊舍" style="min-width:150px" clearable>
<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="foldTo">
<el-form-item label="转入羊舍" prop="foldTo" style="width: 308px">
<el-select v-model="queryParams.foldTo" placeholder="请选择转入羊舍" style="min-width:150px" clearable>
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
</el-select>
@ -20,15 +33,16 @@
<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-form-item label="羊只类型" prop="sheepTypeId">
<el-select v-model="queryParams.sheepTypeId" placeholder="请选择羊只类型" clearable style="min-width:150px">
<el-option v-for="type in sheepTypeOptions" :key="type.id" :label="type.name" :value="type.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" />
</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>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -40,10 +54,10 @@
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['trans_group:trans_group:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['trans_group:trans_group:edit']">修改</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['trans_group:trans_group:remove']">删除</el-button>
@ -57,30 +71,34 @@
<el-table v-loading="loading" :data="trans_groupList" @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="foldFromName" />
<el-table-column label="转入羊舍" align="center" prop="foldToName" />
<el-table-column label="创建时间" align="center" prop="createTime" min-width="120" fixed>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="转群日期" align="center" prop="transDate" min-width="120" />
<el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" />
<el-table-column label="事件类型" align="center" prop="eventTypeText" />
<el-table-column label="转出羊舍" align="center" prop="foldFromName" min-width="130" />
<el-table-column label="转入羊舍" align="center" prop="foldToName" min-width="130" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="转群原因" align="center" prop="reasonText" />
<el-table-column label="羊只类别" align="center" prop="sheepTypeName" />
<el-table-column label="转群原因" align="center" prop="reasonText" min-width="120" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="状态" align="center" prop="status">
<!-- <el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="comment" />
</el-table-column> -->
<el-table-column label="备注" align="center" prop="comment" min-width="120" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="160" fixed="right">
<template #default="scope">
<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="160">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
<!-- <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
v-hasPermi="['trans_group:trans_group:approve']">
审批
</el-button>
</el-button> -->
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['trans_group:trans_group:remove']">
删除
@ -96,20 +114,28 @@
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="trans_groupRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="管理耳号" prop="manageTags">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
style="width: 100%" @change="loadSheepInfo" :disabled="!isAdd">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
<div style="display: flex; align-items: center; gap: 8px;">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
style="width: 100%; flex:1;" @change="loadSheepInfo" :disabled="!isAdd">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
<span v-if="form.manageTags?.length > 0" class="tag-count">
已选 {{ form.manageTags.length }} 个
</span>
</div>
</el-form-item>
<el-form-item label="事件类型" prop="eventType">
<el-select v-model="form.eventType" placeholder="请选择事件类型" clearable required>
<el-option v-for="dict in eventTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<!-- 在el-form中新增牧场选择项 -->
<el-form-item label="牧场" prop="ranchId">
<el-select v-model="form.ranchId" placeholder="请选择牧场" clearable @change="handleRanchChange">
<el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName" :value="ranch.id" />
</el-select>
</el-form-item>
<!-- 调整转出羊舍的options为当前牧场的羊舍 -->
<el-form-item label="转出羊舍" prop="foldFrom">
<el-select v-model="form.foldFrom" placeholder="请选择转出羊舍" clearable :disabled="!form.ranchId"
@change="handleSheepFilter">
@ -118,7 +144,6 @@
</el-select>
</el-form-item>
<!-- 调整转入羊舍的options为当前牧场的羊舍 -->
<el-form-item label="转入羊舍" prop="foldTo">
<el-select v-model="form.foldTo" placeholder="请选择转入羊舍" clearable :disabled="!form.ranchId">
<el-option v-for="fold in currentRanchSheepfolds" :key="fold.id" :label="fold.sheepfoldName"
@ -136,6 +161,10 @@
:value="Number(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="转群日期" prop="transDate">
<el-date-picker v-model="form.transDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择转群日期"
style="width: 100%" required />
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" />
</el-form-item>
@ -147,53 +176,57 @@
</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="耳号">
<el-input v-model="displayManageTags" disabled />
</el-form-item>
<el-form-item label="转出羊舍">
<el-input :value="sheepfoldNameMap[approveForm.foldFrom] || approveForm.foldFrom" disabled />
</el-form-item>
<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-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 />
</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="耳号">
<el-input v-model="displayManageTags" disabled />
</el-form-item>
<el-form-item label="事件类型">
<el-input :value="approveForm.eventTypeText || '未知'" disabled />
</el-form-item>
<el-form-item label="转出羊舍">
<el-input :value="sheepfoldNameMap[approveForm.foldFrom] || approveForm.foldFrom" disabled />
</el-form-item>
<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-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 />
</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="Trans_group">
import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group, approveScTransGroup, listRanch } from '@/api/produce/manage_sheep/trans_group'
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
import { getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
import request from '@/utils/request'
const { proxy } = getCurrentInstance();
const { trans_group_reason, status } = proxy.useDict('trans_group_reason', 'status');
const { trans_group_reason, status, trans_group_event_type } = proxy.useDict('trans_group_reason', 'status', 'trans_group_event_type');
const trans_groupList = ref([]);
const open = ref(false);
@ -204,11 +237,12 @@ const single = ref(true);
const multiple = ref(false);
const total = ref(0);
const title = ref('');
const daterangeTransDate = ref([]);
const daterangeCreateTime = ref([]);
const approveDialog = ref(false);
const approveForm = ref({});
const displayManageTags = ref('');
const eventTypeOptions = trans_group_event_type || [];
// const approveDialog = ref(false);
// const approveForm = ref({});
// const displayManageTags = ref('');
const sheepOptions = ref([]);
const sheepfoldOptions = ref([]);
const sheepfoldNameMap = ref({});
@ -222,25 +256,31 @@ const data = reactive({
form: {
manageTags: [],
tagDetails: {},
eventType: null,
transDate: null,
},
queryParams: {
pageNum: 1,
pageSize: 10,
sheepId: null,
manageTags: null,
eventType: null,
ranchId: null,
foldTo: null,
foldFrom: null,
varietyId: null,
sheepTypeId: null,
status: null,
createTime: null,
},
rules: {
manageTags: [{ required: true, message: '请输入耳号', trigger: 'blur' }],
eventType: [{ required: true, message: '请选择事件类型', trigger: 'change' }],
ranchId: [{ required: true, message: '请选择牧场', trigger: 'change' }],
foldTo: [{ required: true, message: '请选择转入羊舍', trigger: 'change' }],
varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }],
reason: [{ required: true, message: '请选择转群原因', trigger: 'change' }],
transDate: [{ required: true, message: '请选择转群日期', trigger: 'change' }],
technician: [{ required: true, message: '请输入技术员', trigger: 'blur' }],
},
});
@ -254,6 +294,13 @@ function getList() {
queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0];
queryParams.value.params.endCreateTime = daterangeCreateTime.value[1];
}
if (daterangeTransDate.value?.length) {
queryParams.value.params.beginTransDate = daterangeTransDate.value[0];
queryParams.value.params.endTransDate = daterangeTransDate.value[1];
}
if (queryParams.value.sheepTypeId !== null && queryParams.value.sheepTypeId !== undefined) {
queryParams.value.params.sheepTypeId = queryParams.value.sheepTypeId;
}
listTrans_group(queryParams.value).then((res) => {
trans_groupList.value = res.rows;
total.value = res.total;
@ -315,9 +362,9 @@ async function handleSheepFilter() {
let loadedSheep = [];
if (foldFrom && sheepTypeId) {
loadedSheep = await loadSheepBySheepfoldAndType(foldFrom, sheepTypeId, ranchId);
loadedSheep = await loadSheepBySheepfoldAndType(foldFrom, sheepTypeId, ranchId);
} else if (sheepTypeId) {
loadedSheep = await loadSheepByTypeOnly(sheepTypeId, ranchId);
loadedSheep = await loadSheepByTypeOnly(sheepTypeId, ranchId);
}
if (loadedSheep.length > 0) {
@ -329,33 +376,13 @@ async function handleSheepFilter() {
}
}
//转群类型列表
function getSheepTypeList() {
return new Promise((resolve, reject) => {
request({
url: '/base/base/list',
method: 'get',
params: { pageNum: 1, pageSize: 9999 },
}).then((res) => {
sheepTypeOptions.value = res.rows.map(item => ({
id: Number(item.id),
name: item.name || item.typeName
})) || [];
resolve();
}).catch((error) => {
console.error('获取羊只类型失败', error);
proxy.$modal.msgError('加载羊只类型失败，请重试');
reject(error);
});
});
}
//加载所有牧场列表
function loadRanchList() {
listRanch().then(res => {
ranchOptions.value = res.rows.map(ranch => ({
id: ranch.id,
ranchName: ranch.ranch
ranchName: ranch.ranch
}));
}).catch(error => {
console.error('加载牧场列表失败', error);
@ -390,10 +417,10 @@ function handleRanchChange(ranchId) {
}
//只通过羊舍
async function loadSheepBySheepfoldOnly(sheepfoldId, ranchId) {
async function loadSheepBySheepfoldOnly(sheepfoldId, ranchId) {
if (!sheepfoldId || isNaN(Number(sheepfoldId))) {
proxy.$message.error('请选择有效的羊舍');
sheepOptions.value = [];
sheepOptions.value = [];
return [];
}
if (!ranchId) {
@ -402,10 +429,10 @@ async function loadSheepBySheepfoldOnly(sheepfoldId, ranchId) {
return [];
}
try {
const res = await getSheepBySheepfoldId(Number(sheepfoldId));
const res = await getSheepBySheepfoldId(Number(sheepfoldId));
const newSheepList = (res.data || []).map((sheep) => ({
id: sheep.id,
manageTags: sheep.manageTags || '未知耳号',
manageTags: sheep.manageTags || '未知耳号',
sheepfoldId: Number(sheepfoldId),
})).filter(item => item.manageTags);
@ -414,13 +441,13 @@ async function loadSheepBySheepfoldOnly(sheepfoldId, ranchId) {
sheepOptions.value = [];
return [];
}
sheepOptions.value = newSheepList;
sheepOptions.value = newSheepList;
return newSheepList;
} catch (error) {
console.error('根据羊舍加载耳号失败:', error);
const errorMsg = error.response?.data?.msg || '加载羊舍耳号失败，请重试';
proxy.$modal.msgError(errorMsg);
sheepOptions.value = [];
sheepOptions.value = [];
return [];
}
}
@ -475,54 +502,54 @@ async function loadSheepByTypeOnly(typeId) {
//加载羊只信息
async function loadSheepInfo() {
const tags = form.value.manageTags;
if (!tags || tags.length === 0) return;
const tags = form.value.manageTags;
if (!tags || tags.length === 0) return;
const tagDetails = {};
const validResults = [];
let firstSheepfoldId = null;
let firstRanchId = null;
const tagDetails = {};
const validResults = [];
let firstSheepfoldId = null;
let firstRanchId = null;
for (const tag of tags) {
try {
const { data: sheepData } = await checkSheepByManageTags(tag.trim());
if (!sheepData) {
validResults.push(false);
proxy.$modal.msgError(`耳号 ${tag} 不存在或信息异常`);
} else {
validResults.push(true);
tagDetails[tag] = {
comment: sheepData.comment || '',
varietyId: sheepData.varietyId,
sheepId: sheepData.id,
sheepfoldId: sheepData.sheepfoldId,
};
if (!firstSheepfoldId) {
firstSheepfoldId = sheepData.sheepfoldId;
firstRanchId = sheepData.ranchId;
}
}
} catch (error) {
console.error('获取耳号信息失败:', error);
proxy.$modal.msgError(`耳号 ${tag} 验证失败，请重试`);
validResults.push(false);
for (const tag of tags) {
try {
const { data: sheepData } = await checkSheepByManageTags(tag.trim());
if (!sheepData) {
validResults.push(false);
proxy.$modal.msgError(`耳号 ${tag} 不存在或信息异常`);
} else {
validResults.push(true);
tagDetails[tag] = {
comment: sheepData.comment || '',
varietyId: sheepData.varietyId,
sheepId: sheepData.id,
sheepfoldId: sheepData.sheepfoldId,
};
if (!firstSheepfoldId) {
firstSheepfoldId = sheepData.sheepfoldId;
firstRanchId = sheepData.ranchId;
}
}
} catch (error) {
console.error('获取耳号信息失败:', error);
proxy.$modal.msgError(`耳号 ${tag} 验证失败，请重试`);
validResults.push(false);
}
}
if (validResults.includes(false)) {
form.value.manageTags = tags.filter((_, index) => validResults[index]);
proxy.$message.warning('部分耳号不合法，已自动过滤');
}
form.value.tagDetails = tagDetails;
if (validResults.includes(false)) {
form.value.manageTags = tags.filter((_, index) => validResults[index]);
proxy.$message.warning('部分耳号不合法，已自动过滤');
}
form.value.tagDetails = tagDetails;
if (firstRanchId && isAdd.value) {
form.value.ranchId = firstRanchId;
handleRanchChange(firstRanchId);
}
if (firstRanchId && isAdd.value) {
form.value.ranchId = firstRanchId;
handleRanchChange(firstRanchId);
}
if (firstSheepfoldId && isAdd.value) {
form.value.foldFrom = Number(firstSheepfoldId);
}
if (firstSheepfoldId && isAdd.value) {
form.value.foldFrom = Number(firstSheepfoldId);
}
}
//取消按钮
@ -540,6 +567,8 @@ function handleQuery() {
//重置搜索框
function resetQuery() {
daterangeCreateTime.value = [];
daterangeTransDate.value = [];
queryParams.value.eventType = null;
proxy.resetForm('queryRef');
handleQuery();
}
@ -583,6 +612,8 @@ async function handleUpdate(row) {
const formData = {
...d,
manageTags: manageTags,
eventType: d.eventType || null,
transDate: d.transDate || null,
foldFrom: Number(d.foldFrom || 0),
foldTo: Number(d.foldTo || 0),
sheepTypeId: Number(d.sheepTypeId || 0),
@ -651,7 +682,7 @@ function submitForm() {
//删除
function handleDelete(row) {
const _ids = row.id || ids.value;
proxy.$modal.confirm(`是否确认删除转群记录编号为“${_ids}”的数据项？`)
proxy.$modal.confirm(`是否确认删除这条记录数据`)
.then(() => delTrans_group(_ids))
.then(() => {
getList();
@ -668,38 +699,38 @@ function handleExport() {
}
// 审核
function handleApprove(row) {
approveForm.value = { ...row };
approveDialog.value = true;
displayManageTags.value = row.manageTags;
}
//function handleApprove(row) {
// approveForm.value = { ...row };
// approveDialog.value = true;
// displayManageTags.value = row.manageTags;
// }
// 审批同意
function handleApproveAgree() {
if (typeof approveForm.value.foldTo !== 'number') {
approveForm.value.foldTo = Number(approveForm.value.foldTo);
}
// function handleApproveAgree() {
// if (typeof approveForm.value.foldTo !== 'number') {
// approveForm.value.foldTo = Number(approveForm.value.foldTo);
// }
approveForm.value.status = 1;
approveScTransGroup(approveForm.value).then(() => {
approveDialog.value = false;
proxy.$modal.msgSuccess('审批通过，羊只所在羊舍已更新');
getList();
}).catch(error => {
proxy.$modal.msgError(`审批失败：${error.message}`);
});
}
// approveForm.value.status = 1;
// approveScTransGroup(approveForm.value).then(() => {
// approveDialog.value = false;
// proxy.$modal.msgSuccess('审批通过，羊只所在羊舍已更新');
// getList();
// }).catch(error => {
// proxy.$modal.msgError(`审批失败：${error.message}`);
// });
// }
function handleApproveReject() {
approveForm.value.status = 2;
approveScTransGroup(approveForm.value).then(() => {
approveDialog.value = false;
proxy.$modal.msgSuccess('审批已驳回');
getList();
}).catch(error => {
proxy.$modal.msgError(`审批失败：${error.message}`);
});
}
// function handleApproveReject() {
// approveForm.value.status = 2;
// approveScTransGroup(approveForm.value).then(() => {
// approveDialog.value = false;
// proxy.$modal.msgSuccess('审批已驳回');
// getList();
// }).catch(error => {
// proxy.$modal.msgError(`审批失败：${error.message}`);
// });
// }
//加载羊舍数据
function loadSheepfold() {
@ -723,11 +754,37 @@ function getVarietyOptions() {
});
}
// 加载羊只类别数据
const sheepTypeList = ref([]);
function loadSheepTypeList() {
getSheepTypeList().then(response => {
sheepTypeList.value = response.rows || [];
sheepTypeOptions.value = (response.rows || []).map(item => ({
id: Number(item.id),
name: item.name || item.typeName
}));
}).catch(error => {
console.error('加载羊只类别失败', error);
sheepTypeList.value = [];
sheepTypeOptions.value = [];
});
}
onMounted(() => {
loadSheepfold();
loadRanchList();
getVarietyOptions();
getSheepTypeList();
loadSheepTypeList();
getList();
});
</script>
</script>
<style scoped>
.tag-count {
color: #606266;
background-color: #f5f7fa;
padding: 2px 8px;
border-radius: 12px;
font-size: 12px;
}
</style>

245
src/views/produce/manage_sheep/transition_info/index.vue
View File

@ -2,14 +2,36 @@
<div class="app-container">
<!-- 查询表单 -->
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<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 label="转场日期" style="width: 308px">
<el-date-picker v-model="transitionDateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery" style="width: 150px;"/>
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="width: 150px;" />
</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="eventType" style="width: 308px">
<el-select v-model="queryParams.eventType" placeholder="请选择事件类型" clearable style="min-width:150px">
<el-option label="转场转入" value="转场转入" />
<el-option label="转场转出" value="转场转出" />
</el-select>
</el-form-item>
<el-form-item label="转场类型" prop="transType" style="width: 308px">
<el-select v-model="queryParams.transType" placeholder="请选择转场类型" clearable style="min-width:150px">
<el-option label="内部调拨" :value="0" />
<el-option label="内部销售" :value="1" />
<el-option label="育肥调拨" :value="2" />
</el-select>
</el-form-item>
<el-form-item label="转入牧场" prop="transTo">
<el-select v-model="queryParams.transTo" placeholder="请选择转入牧场" clearable style="min-width:150px">
<el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName" :value="ranch.ranchName" />
@ -25,10 +47,6 @@
<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>
@ -41,10 +59,10 @@
<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-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-col>
</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>
@ -59,9 +77,21 @@
<!-- 列表 -->
<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="manageTags" />
<el-table-column label="创建时间" align="center" prop="createTime" min-width="130" fixed>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="转场日期" align="center" prop="transitionDate" min-width="150">
<template #default="scope">
<span>{{ parseTime(scope.row.transitionDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" />
<el-table-column label="事件类型" align="center" prop="eventType" min-width="120" />
<el-table-column label="转场类型" align="center" prop="transTypeText" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="转入牧场" align="center" prop="transTo" />
<el-table-column label="转入牧场" align="center" prop="transTo" min-width="120" />
<el-table-column label="当前牧场" align="center" prop="transFrom" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
@ -69,18 +99,19 @@
</template>
</el-table-column>
<el-table-column label="技术员" align="center" prop="technician" />
<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" width="180">
<el-table-column label="当前状态" align="center" prop="status" min-width="120">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
<span v-if="scope.row.status === 0">待审批</span>
<span v-else-if="scope.row.status === 1 || scope.row.status === 2">审批完成</span>
<span v-else>未知状态</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="180">
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="操作" align="center" min-width="180" fixed="right">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
v-hasPermi="['transition_info:transition_info:approve']">审批</el-button>
v-hasPermi="['transition_info:transition_info:approve']" :disabled="scope.row.status !== 0">审批</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['transition_info:transition_info:remove']">删除</el-button>
</template>
@ -94,33 +125,51 @@
<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="管理耳号" prop="manageTags">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" filterable multiple allow-create
@change="loadSheepInfo" :disabled="!isAdd" >
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
<div style="display: flex; align-items: center; gap: 8px;">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" filterable multiple allow-create
@change="loadSheepInfo" :disabled="!isAdd" style="flex:1;">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
<span v-if="form.manageTags?.length > 0" class="tag-count">
已选 {{ form.manageTags.length }} 个
</span>
</div>
</el-form-item>
<el-form-item label="转入牧场" prop="transTo">
<el-select v-model="form.transTo" placeholder="请选择转入牧场" clearable :disabled="!isAdd" >
<el-select v-model="form.transTo" placeholder="请选择转入牧场" clearable :disabled="!isAdd">
<el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName"
:value="ranch.ranchName" />
</el-select>
</el-form-item>
<el-form-item label="当前牧场" prop="transFrom">
<el-select v-model="form.transFrom" placeholder="请选择当前牧场" clearable @change="handleRanchChange" :disabled="!isAdd" >
<el-select v-model="form.transFrom" placeholder="请选择当前牧场" clearable @change="handleRanchChange"
:disabled="!isAdd">
<el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName"
:value="ranch.ranchName" />
</el-select>
</el-form-item>
<el-form-item label="事件类型" prop="eventType">
<el-select v-model="form.eventType" placeholder="请选择事件类型">
<el-option label="转场转入" value="转场转入" />
<el-option label="转场转出" value="转场转出" />
</el-select>
</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-select>
</el-form-item>
<el-form-item label="转场日期" prop="transitionDate">
<el-date-picker v-model="form.transitionDate" value-format="YYYY-MM-DD" type="date" placeholder="请选择转场日期"
:disabled="!isAdd"></el-date-picker>
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" />
</el-form-item>
@ -143,6 +192,9 @@
<el-form-item label="品种">
<el-input :value="approveForm.varietyName" disabled />
</el-form-item>
<el-form-item label="事件类型">
<el-input :value="approveForm.eventType" disabled />
</el-form-item>
<el-form-item label="转入牧场">
<el-input :value="approveForm.transTo" disabled />
</el-form-item>
@ -161,6 +213,12 @@
<el-form-item label="状态">
<el-input :value="getStatusLabel(approveForm.status)" disabled />
</el-form-item>
<el-form-item label="接收羊舍" v-if="approveForm.eventType === '转场转入'">
<el-select v-model="approveForm.sheepfoldId" placeholder="请选择接收羊舍" clearable>
<el-option v-for="sheepfold in acceptSheepfold" :key="sheepfold.id" :label="sheepfold.sheepfoldName"
:value="sheepfold.id" />
</el-select>
</el-form-item>
</el-form>
<template #footer>
@ -174,7 +232,7 @@
</template>
<script setup name="Transition_info">
import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, getSheepByRanchId, updateTransition_info, listRanch,approveTransitionInfo } from "@/api/produce/manage_sheep/transition_info"
import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, getSheepByRanchId, updateTransition_info, listRanch, approveTransitionInfo } from "@/api/produce/manage_sheep/transition_info"
import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
import request from '@/utils/request'
@ -191,15 +249,17 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref('')
const transitionDateRange = ref([])
const daterangeCreateTime = ref([])
const approveDialog = ref(false)
const approveForm = ref({})
const displayManageTags = ref('')
const varietyOptions = ref([])
const ranchOptions = ref([]);
const sheepOptions = ref([]);
const isAdd = ref(true);
const isEdit = ref(false);
const ranchOptions = ref([])
const sheepOptions = ref([])
const isAdd = ref(true)
const isEdit = ref(false)
const acceptSheepfold = ref([])
const data = reactive({
form: {
@ -207,22 +267,27 @@ const data = reactive({
manageTags: [],
transTo: null,
transFrom: null,
eventType: null,
transType: null,
transitionDate: null,
technician: null,
tagDetails: {}
tagDetails: {}
},
queryParams: {
pageNum: 1,
pageSize: 10,
manageTags: [],
varietyId: null,
eventType: null,
transType: null,
transTo: null,
transFrom: null,
status: null,
createTime: null
createTime: null,
transitionDate: null
},
rules: {
manageTags:[
manageTags: [
{ required: true, message: "请输入管理耳号", trigger: "blur" }
],
transTo: [
@ -231,9 +296,15 @@ const data = reactive({
transFrom: [
{ required: false, message: "请选择当前牧场", trigger: "blur" }
],
eventType: [
{ required: true, message: '请选择事件类型', trigger: 'change' }
],
transType: [
{ required: true, message: "请选择转场类型", trigger: "change" }
],
transitionDate: [
{ required: true, message: "请选择转场日期", trigger: "change" }
],
technician: [
{ required: true, message: "请输入技术员", trigger: "blur" }
]
@ -249,6 +320,13 @@ function getList() {
queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
}
if (queryParams.value.transType !== null) {
queryParams.value.params.transType = queryParams.value.transType;
}
if (transitionDateRange.value && transitionDateRange.value.length > 0) {
queryParams.value.params["beginTransitionDate"] = transitionDateRange.value[0];
queryParams.value.params["endTransitionDate"] = transitionDateRange.value[1];
}
listTransition_info(queryParams.value).then(res => {
transition_infoList.value = res.rows
total.value = res.total
@ -264,12 +342,12 @@ function reset() {
transFrom: null,
transType: null,
technician: null,
createBy:null,
createBy: null,
tagDetails: {}
};
sheepOptions.value = [];
proxy.resetForm("transition_infoRef");
isAdd.value = true;
isAdd.value = true;
isEdit.value = false;
}
@ -280,7 +358,7 @@ function loadRanchOptions() {
if (res.rows && Array.isArray(res.rows)) {
const mapped = res.rows.map((ranch) => ({
id: Number(ranch.id),
ranchName: ranch.ranch || '未知牧场',
ranchName: ranch.ranch || '未知牧场',
}));
ranchOptions.value = mapped;
} else {
@ -302,6 +380,40 @@ function loadSheepOptions() {
});
}
// 加载牧场下的羊舍
// 修改：加载转入牧场下的接收羊舍（使用牧场ID而非名称）
function loadSheepfoldsByRanch(ranchName) {
// 1. 根据转入牧场名称匹配牧场ID
const matchedRanch = ranchOptions.value.find(
ranch => ranch.ranchName === ranchName
);
if (!matchedRanch) {
proxy.$modal.msgWarning(`未找到牧场“${ranchName}”的信息`);
acceptSheepfold.value = [];
return;
}
const ranchId = matchedRanch.id; // 获取匹配的牧场ID
// 2. 使用牧场ID调用接口加载羊舍（修正参数）
request({
url: '/sheepfold_management/sheepfold_management/list',
method: 'get',
params: {
ranchId: ranchId, // 关键：使用牧场ID而非名称
pageNum: 1,
pageSize: 999
}
}).then(res => {
acceptSheepfold.value = res.rows || [];
if (acceptSheepfold.value.length === 0) {
proxy.$modal.msgWarning(`转入牧场“${ranchName}”没有可用的接收羊舍`);
}
}).catch(error => {
console.error('加载接收羊舍失败:', error);
proxy.$modal.msgError('获取接收羊舍数据失败');
});
}
// 通过牧场 ID 查询牧场名称
async function getRanchNameByRanchId(ranchId) {
if (!ranchId) return '';
@ -312,7 +424,7 @@ async function getRanchNameByRanchId(ranchId) {
const matchedRanch = ranchOptions.value.find(
(item) => item.id === Number(ranchId)
);
return matchedRanch ? matchedRanch.ranchName : '';
return matchedRanch ? matchedRanch.ranchName : '';
} catch (error) {
console.error('通过 ranchId 查询牧场名称失败:', error);
return '';
@ -337,7 +449,7 @@ function handleRanchChange(ranchName) {
getSheepByRanchId(ranchIdNum)
.then((res) => {
if (res.code === 200) {
if (res.code === 200) {
if (res.data && res.data.length > 0) {
sheepOptions.value = res.data.map((sheep) => ({
id: sheep.id,
@ -410,7 +522,7 @@ async function loadSheepInfo() {
// 导出
function handleExport() {
proxy.download(
'/produce/manage_sheep/transition_info/export',
'/produce/manage_sheep/transition_info/export',
{ ...queryParams.value },
`transition_info_${Date.now()}.xlsx`
);
@ -418,11 +530,22 @@ function handleExport() {
// 审批
function handleApprove(row) {
approveForm.value = { ...row };
if (row.status !== 0) {
proxy.$modal.msgWarning("该记录已完成审批，无法重复操作");
return;
}
approveForm.value = { ...row };
approveDialog.value = true;
displayManageTags.value = Array.isArray(row.manageTags)
? row.manageTags.join(',')
: row.manageTags || '';
if (row.eventType === '转场转入') {
loadSheepfoldsByRanch(row.transTo);
} else {
acceptSheepfold.value = [];
}
approveDialog.value = true;
}
// 审批同意
@ -431,12 +554,15 @@ function handleApproveAgree() {
proxy.$modal.msgError('转入牧场不能为空');
return;
}
approveForm.value.status = 1;
approveForm.value.status = 1;
if (approveForm.value.eventType === '转场转入' && !approveForm.value.sheepfoldId) {
proxy.$modal.msgError('请选择接收羊舍');
return;
}
approveTransitionInfo(approveForm.value).then(() => {
approveDialog.value = false;
proxy.$modal.msgSuccess('审批通过，已更新羊只所在牧场');
proxy.$modal.msgSuccess('通过请求，已更新羊只信息');
getList();
}).catch(error => {
proxy.$modal.msgError(`审批失败：${error.message}`);
@ -448,8 +574,10 @@ function handleApproveReject() {
approveForm.value.status = 2;
updateTransition_info(approveForm.value).then(() => {
approveDialog.value = false;
proxy.$modal.msgSuccess('审批成功，状态已更新为驳回');
proxy.$modal.msgSuccess('驳回请求');
getList();
}).catch(error => {
proxy.$modal.msgError(`审批失败：${error.message}`);
});
}
@ -488,6 +616,8 @@ function handleQuery() {
//重置
function resetQuery() {
daterangeCreateTime.value = []
queryParams.value.transType = null;
transitionDateRange.value = [];
proxy.resetForm("queryRef")
handleQuery()
}
@ -503,7 +633,7 @@ function handleAdd() {
reset();
open.value = true;
title.value = "添加转场";
isAdd.value = true;
isAdd.value = true;
isEdit.value = false;
sheepOptions.value = [];
form.value.manageTags = [];
@ -516,11 +646,11 @@ async function handleUpdate(row) {
getTransition_info(_id).then(response => {
form.value = {
...response.data,
manageTags: [response.data.manageTags]
manageTags: [response.data.manageTags]
};
open.value = true;
title.value = "修改转场";
isAdd.value = false;
isAdd.value = false;
isEdit.value = true;
}).catch(error => {
console.error('获取转场详情失败:', error);
@ -536,7 +666,7 @@ async function submitForm() {
const allTags = form.value.manageTags;
let validTags = [];
if (isAdd.value) {
if (isAdd.value) {
if (!allTags || allTags.length === 0) {
proxy.$modal.msgError('请选择至少一个耳号');
return;
@ -549,7 +679,7 @@ async function submitForm() {
proxy.$modal.msgError('所有耳号均无效，请重新输入');
return;
}
} else {
} else {
validTags = allTags;
}
@ -559,10 +689,12 @@ async function submitForm() {
sheepId: form.value.tagDetails[tag].sheepId,
varietyId: form.value.tagDetails[tag].varietyId,
varietyName: form.value.tagDetails[tag].varietyName,
manageTags: tag,
manageTags: tag,
transTo: form.value.transTo,
transFrom: form.value.tagDetails[tag].ranchName,
transType: form.value.transType,
eventType: form.value.eventType,
transitionDate: form.value.transitionDate,
technician: form.value.technician,
comment: form.value.tagDetails[tag].comment,
status: 0,
@ -571,6 +703,7 @@ async function submitForm() {
submitData = {
...form.value,
manageTags: validTags.join(','),
eventType: form.value.eventType,
};
}
@ -602,7 +735,7 @@ function getVarietyOptions() {
//删除
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除转场编号为"' + _ids + '"的数据项？')
proxy.$modal.confirm('是否确认删除这条记录数据')
.then(() => delTransition_info(_ids))
.then(() => {
getList()
@ -617,4 +750,14 @@ onMounted(() => {
loadSheepOptions();
getList();
});
</script>
</script>
<style scoped>
.tag-count {
color: #606266;
background-color: #f5f7fa;
padding: 2px 8px;
border-radius: 12px;
font-size: 12px;
}
</style>

79
src/views/produce/other/castrate/index.vue
View File

@ -2,27 +2,24 @@
<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" style="width: 150px;"/>
<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 label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="width: 150px;" />
</el-form-item>
<el-form-item label="羊舍" prop="sheepfold">
<el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
<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="创建时间" 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>
@ -55,17 +52,18 @@
<el-table v-loading="loading" :data="castrateList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="耳号" align="center" prop="manageTags" />
<el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
<el-table-column label="事件类型" align="center" prop="eventType" width="120" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="创建人" align="center" prop="createBy" />
<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="createBy" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<!-- 按需添加 是否需要修改功能 -->
@ -84,11 +82,16 @@
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="castrateRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="管理耳号" prop="manageTags">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
style="width: 100%" @change="loadSheepInfo" @blur="loadSheepInfo">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
<div style="display: flex; align-items: center; gap: 8px;">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
style="width: 100%; flex:1;" @change="loadSheepInfo" @blur="loadSheepInfo">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
<span v-if="form.manageTags?.length > 0" class="tag-count">
已选 {{ form.manageTags.length }} 个
</span>
</div>
</el-form-item>
<el-form-item label="羊舍" prop="sheepfold">
<el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable @change="loadSheepBySheepfold">
@ -154,9 +157,9 @@ const data = reactive({
manageTags: [
{ required: true, message: '请输入管理耳号', trigger: 'blur' }
],
sheepfold: [
{ required: true, message: '请选择羊舍', trigger: 'change' }
],
// sheepfold: [
// { required: true, message: '请选择羊舍', trigger: 'change' }
// ],
technician: [
{ required: true, message: '请输入技术员', trigger: 'blur' }
]
@ -186,7 +189,7 @@ function loadSheepBySheepfold() {
sheepOptions.value = sheepList.map(sheep => ({
id: sheep.id,
manageTags: sheep.manageTags,
gender: sheep.gender
gender: sheep.gender
}));
})
.catch(error => {
@ -207,18 +210,18 @@ async function loadSheepInfo() {
for (const tag of tags) {
try {
const { data: sheepData } = await checkSheepByManageTags(tag.trim());
if (!sheepData) {
validResults.push(false);
proxy.$modal.msgError(`耳号 ${tag} 不存在`);
} else if (sheepData.gender !== 2) {
} else if (sheepData.gender !== 2) {
validResults.push(false);
proxy.$modal.msgError(`耳号 ${tag} 对应的羊只性别不是公，无法添加`);
} else {
validResults.push(true);
tagDetails[tag] = {
sheepId: sheepData.id,
gender: sheepData.gender,
gender: sheepData.gender,
sheepfoldId: sheepData.sheepfoldId,
varietyId: sheepData.varietyId,
comment: sheepData.comment || ''
@ -261,7 +264,7 @@ function getList() {
loading.value = false;
});
getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
varietyOptions.value = res.rows || []
})
}
@ -404,7 +407,7 @@ function submitForm() {
//删除
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm(`是否确认删除去势编号为"${_ids}"的数据项？`).then(() => {
proxy.$modal.confirm(`是否确认删除这条记录数据`).then(() => {
return delCastrate(_ids)
}).then(() => {
getList()
@ -426,8 +429,18 @@ function getSheepfoldOptions() {
}
onMounted(() => {
getList()
getSheepfoldOptions()
getVarietyOptions()
getList()
})
</script>
</script>
<style scoped>
.tag-count {
color: #606266;
background-color: #f5f7fa;
padding: 2px 8px;
border-radius: 12px;
font-size: 12px;
}
</style>

55
src/views/produce/other/fixHoof/index.vue
View File

@ -1,11 +1,14 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<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 label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="width: 150px;" />
</el-form-item>
<el-form-item label="羊舍" prop="sheepfold">
<el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
@ -16,12 +19,6 @@
<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-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -53,17 +50,18 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="fixHoofList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="耳号" align="center" prop="manageTags" />
<el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
<el-table-column label="事件类型" align="center" prop="eventType" width="120" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="创建人" align="center" prop="createBy" />
<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" class-name="small-padding fixed-width">
<template #default="scope">
<!-- 按需添加 是否需要修改功能 -->
@ -82,11 +80,16 @@
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="fixHoofRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="耳号" prop="manageTags">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
style="width: 100%" @change="loadSheepInfo">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
<div style="display: flex; align-items: center; gap: 8px;">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
style="width: 100%; flex:1;" @change="loadSheepInfo">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
<span v-if="form.manageTags?.length > 0" class="tag-count">
已选 {{ form.manageTags.length }} 个
</span>
</div>
</el-form-item>
<el-form-item label="羊舍" prop="sheepfolds">
<el-select v-model="form.sheepfold" filterable style="width: 100%" @change="loadSheepBySheepfold">
@ -219,7 +222,7 @@ async function loadSheepInfo() {
form.value.tagDetails = tagDetails;
if (validTags.length > 0) {
const firstValidTag = validTags[0]; 耳号
const firstValidTag = validTags[0];
const firstSheepfoldId = tagDetails[firstValidTag].sheepfoldId;
form.value.sheepfold = firstSheepfoldId;
}
@ -345,7 +348,7 @@ function submitForm() {
//删除
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm(`是否确认删除修蹄编号为"${_ids}"的数据项？`).then(() => {
proxy.$modal.confirm(`是否确认删除这条记录数据`).then(() => {
return delFixHoof(_ids)
}).then(() => {
getList()
@ -371,4 +374,14 @@ onMounted(() => {
getVarietyOptions()
getList()
})
</script>
</script>
<style scoped>
.tag-count {
color: #606266;
background-color: #f5f7fa;
padding: 2px 8px;
border-radius: 12px;
font-size: 12px;
}
</style>

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

@ -7,14 +7,7 @@
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"
@blur="validateManageTagsInQuery"
/>
</el-form-item>
<el-form-item label="事件类型" prop="eventType">
@ -33,12 +26,6 @@
placeholder="请选择死亡日期">
</el-date-picker>
</el-form-item>
<el-form-item label="性别" prop="gender">
<el-select v-model="queryParams.gender" placeholder="请选择性别" clearable>
<el-option label="公" value="1" />
<el-option label="母" value="0" />
</el-select>
</el-form-item>
<el-form-item label="死淘去向" prop="disposalDirection">
<el-select v-model="queryParams.disposalDirection" placeholder="请选择死淘去向" clearable>
<el-option label="深埋" value="深埋" />
@ -131,7 +118,7 @@
<el-table-column label="死亡时羊只类别" align="center" prop="sheepType" width="130" />
<el-table-column label="性别" align="center" prop="gender" width="80">
<template #default="scope">
<span>{{ scope.row.gender === 1 ? '公' : scope.row.gender === 0 ? '母' : '' }}</span>
<span>{{ scope.row.gender === 1 ? '母' : scope.row.gender === 2 ? '公' : '' }}</span>
</template>
</el-table-column>
<el-table-column label="日龄" align="center" prop="dayAge" width="80" />
@ -171,63 +158,17 @@
/>
<!-- 添加或修改羊只死淘记录对话框 -->
<el-dialog :title="title" v-model="open" width="800px" append-to-body>
<el-dialog :title="title" v-model="open" width="600px" append-to-body>
<el-form ref="deathRef" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="handleEarTagBlur" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="事件类型" prop="eventType">
<el-input v-model="form.eventType" placeholder="事件类型" readonly />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="品种" prop="variety">
<el-input v-model="form.variety" placeholder="品种" readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="死亡时羊只类别" prop="sheepType">
<el-input v-model="form.sheepType" placeholder="羊只类别" readonly />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="性别" prop="gender">
<el-select v-model="form.gender" placeholder="请选择性别" disabled>
<el-option label="公" :value="1" />
<el-option label="母" :value="0" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="日龄" prop="dayAge">
<el-input-number v-model="form.dayAge" placeholder="日龄" :min="0" readonly />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="胎次" prop="parity">
<el-input-number v-model="form.parity" placeholder="胎次" :min="0" readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="羊舍" prop="sheepfoldName">
<el-input v-model="form.sheepfoldName" placeholder="羊舍" readonly />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="繁育状态" prop="breedStatus">
<el-input v-model="form.breedStatus" placeholder="繁育状态" readonly />
<el-input
v-model="form.manageTags"
placeholder="请输入管理耳号"
@blur="validateManageTagsInForm"
:loading="validatingTags"
/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -241,23 +182,9 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="死亡时产后天数" prop="postLambingDay">
<el-input-number v-model="form.postLambingDay" placeholder="产后天数" :min="0" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="死亡时泌乳天数" prop="lactationDay">
<el-input-number v-model="form.lactationDay" placeholder="泌乳天数" :min="0" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="死亡时怀孕天数" prop="gestationDay">
<el-input-number v-model="form.gestationDay" placeholder="怀孕天数" :min="0" readonly />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="疾病类型ID" prop="diseaseTypeId">
@ -270,6 +197,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="死淘去向" prop="disposalDirection">
@ -285,6 +213,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="处理人" prop="handler">
@ -297,6 +226,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="comment">
@ -316,9 +246,9 @@
</template>
<script setup name="Death">
import { listDeath, getDeath, delDeath, addDeath, updateDeath, getSheepInfo } from "@/api/sheep_death/death"
import {listDeath, getDeath, delDeath, addDeath, updateDeath, getSheepInfo} from "@/api/sheep_death/death"
const { proxy } = getCurrentInstance()
const {proxy} = getCurrentInstance()
const deathList = ref([])
const open = ref(false)
@ -329,6 +259,7 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const validatingTags = ref(false) // 验证管理耳号的loading状态
const data = reactive({
form: {},
@ -336,38 +267,28 @@ const data = reactive({
pageNum: 1,
pageSize: 10,
manageTags: null,
variety: null,
eventType: null,
deathDate: null,
sheepType: null,
gender: null,
dayAge: null,
parity: null,
diseaseTypeId: null,
diseaseSubtypeId: null,
disposalDirection: null,
technician: null,
handler: null,
sheepfoldName: null,
workGroup: null,
breedStatus: null,
postLambingDay: null,
lactationDay: null,
gestationDay: null,
comment: null,
isDelete: null
},
rules: {
manageTags: [
{ required: true, message: "管理耳号不能为空", trigger: "blur" }
{required: true, message: "管理耳号不能为空", trigger: "blur"}
],
deathDate: [
{ required: true, message: "死亡日期不能为空", trigger: "blur" }
{required: true, message: "死亡日期不能为空", trigger: "blur"}
],
}
})
const { queryParams, form, rules } = toRefs(data)
const {queryParams, form, rules} = toRefs(data)
/** 查询羊只死淘记录列表 */
function getList() {
@ -379,6 +300,57 @@ function getList() {
})
}
/** 验证查询条件中的管理耳号 */
function validateManageTagsInQuery() {
const manageTags = queryParams.value.manageTags
if (manageTags && manageTags.trim()) {
validateManageTags(manageTags.trim(), 'query')
}
}
/** 验证表单中的管理耳号 */
function validateManageTagsInForm() {
const manageTags = form.value.manageTags
if (manageTags && manageTags.trim()) {
validateManageTags(manageTags.trim(), 'form')
}
}
/** 验证管理耳号是否存在 */
function validateManageTags(manageTags, source) {
if (validatingTags.value) return // 防止重复请求
validatingTags.value = true
getSheepInfo(manageTags).then(response => {
if (response.code === 200 && response.data) {
if (source === 'form') {
proxy.$modal.msgSuccess("羊只验证成功")
} else {
proxy.$modal.msgSuccess("耳号验证成功")
}
} else {
// 耳号不存在时清除输入并提示
if (source === 'form') {
form.value.manageTags = null
} else {
queryParams.value.manageTags = null
}
proxy.$modal.msgError("该耳号不存在")
}
}).catch(error => {
// 验证失败时清除输入并提示
if (source === 'form') {
form.value.manageTags = null
} else {
queryParams.value.manageTags = null
}
proxy.$modal.msgError("该耳号不存在")
}).finally(() => {
validatingTags.value = false
})
}
// 取消按钮
function cancel() {
open.value = false
@ -391,27 +363,17 @@ function reset() {
id: null,
sheepId: null,
manageTags: null,
variety: null,
eventType: "死亡",
deathDate: new Date().toISOString().split('T')[0],
sheepType: null,
gender: null,
dayAge: null,
parity: null,
eventType: "死亡", // 默认事件类型
deathDate: new Date().toISOString().split('T')[0], // 默认今日
diseaseTypeId: null,
diseaseSubtypeId: null,
disposalDirection: null,
technician: null,
handler: null,
sheepfoldName: null,
workGroup: null,
breedStatus: null,
postLambingDay: null,
lactationDay: null,
gestationDay: null,
comment: null,
createBy: null,
createTime: null,
comment: null,
updateBy: null,
updateTime: null,
isDelete: null
@ -419,44 +381,6 @@ function reset() {
proxy.resetForm("deathRef")
}
/** 管理耳号失去焦点事件 */
function handleEarTagBlur() {
if (form.value.manageTags && form.value.manageTags.trim()) {
getSheepInfo(form.value.manageTags.trim()).then(response => {
if (response.code === 200 && response.data) {
const sheepData = response.data
form.value.sheepId = sheepData.sheepId
form.value.variety = sheepData.variety
form.value.sheepType = sheepData.sheepType
form.value.gender = sheepData.gender
form.value.dayAge = sheepData.dayAge
form.value.parity = sheepData.parity
form.value.sheepfoldName = sheepData.sheepfoldName
form.value.breedStatus = sheepData.breedStatus
form.value.postLambingDay = sheepData.postLambingDay
form.value.lactationDay = sheepData.lactationDay
form.value.gestationDay = sheepData.gestationDay
} else {
proxy.$modal.msgWarning("未找到该耳号对应的羊只信息")
// 清空自动填充的字段
form.value.sheepId = null
form.value.variety = null
form.value.sheepType = null
form.value.gender = null
form.value.dayAge = null
form.value.parity = null
form.value.sheepfoldName = null
form.value.breedStatus = null
form.value.postLambingDay = null
form.value.lactationDay = null
form.value.gestationDay = null
}
}).catch(() => {
proxy.$modal.msgError("查询羊只信息失败")
})
}
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1
@ -518,12 +442,13 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除羊只死淘记录编号为"' + _ids + '"的数据项？').then(function() {
proxy.$modal.confirm('是否确认删除羊只死淘记录编号为"' + _ids + '"的数据项？').then(function () {
return delDeath(_ids)
}).then(() => {
getList()
proxy.$modal.msgSuccess("删除成功")
}).catch(() => {})
}).catch(() => {
})
}
/** 导出按钮操作 */
@ -534,4 +459,7 @@ function handleExport() {
}
getList()
</script>
</script>
<style scoped>
</style>