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

Merge branch 'main' of http://118.182.97.76:3000/admin/zhyc-sheep-ui

Browse Source
This commit is contained in:
wyt
2026-02-02 16:20:36 +08:00
parent 73c95a1df3 a748ca994e
commit c6f0910cc0
16 changed files with 2178 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/Weaning/weaning_record.js
View File

@@ -51,10 +51,10 @@ export function getSheepIdByEarNumber(earNumber) {
})
}
// 模糊查询母羊耳号列表
// 新增：模糊查询耳号列表 (用于远程搜索)
export function searchEarNumbers(query) {
return request({
url: '/Weaning/weaning_record/search_ear_numbers', // 根据实际路径修改
url: '/Weaning/weaning_record/search_ear_numbers',
method: 'get',
params: { query }
})

46
src/api/drymilk/drymilk.js
View File

@@ -25,6 +25,24 @@ export function getSheepIdByManageTags(manageTags) {
})
}
// 远程搜索耳号列表
export function searchEarNumbers(query) {
return request({
url: '/drymilk/drymilk/searchEarNumbers',
method: 'get',
params: { query }
})
}
// 远程搜索技术员列表 (新增)
export function searchTechnicians(query) {
return request({
url: '/drymilk/drymilk/searchTechnicians',
method: 'get',
params: { query }
})
}
// 新增干奶记录
export function addDrymilk(data) {
return request({
@@ -49,30 +67,4 @@ export function delDrymilk(id) {
url: '/drymilk/drymilk/' + id,
method: 'delete'
})
}
export function searchEarNumbers(query) {
return request({
url: '/drymilk/drymilk/search_ear_numbers',
method: 'get',
params: { query }
})
}
// 搜索耳号（新增）
export function searchEarTags(manageTags) {
return request({
url: '/drymilk/drymilk/searchEarTags',
method: 'get',
params: { manageTags }
})
}
// 验证耳号（新增）
export function validateEarTag(manageTags) {
return request({
url: '/drymilk/drymilk/validateEarTag',
method: 'get',
params: { manageTags }
})
}
}

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

@@ -109,4 +109,14 @@ export function delBreedPlanGenerate(id) {
url: '/mating_plan/generate/' + id,
method: 'delete'
})
}
}
// 模糊查询母羊耳号列表
export function searchEarNumbers(query) {
return request({
url: '/mating_plan/generate/search_ear_numbers', // 根据实际路径修改
method: 'get',
params: { query }
})
}

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

@@ -43,7 +43,7 @@ export function delDeath(id) {
})
}
// 根据管理耳号查询羊只信息
// 根据耳号查询羊只信息
export function getSheepInfo(manageTags) {
return request({
url: '/sheep_death/death/sheepInfo/' + manageTags,
@@ -59,10 +59,30 @@ export function getDiseaseTree() {
})
}
// 模糊查询母羊耳号列表
export function searchEarNumbers(query) {
// --- 远程搜索 API ---
// 搜索耳号
export function searchEarNo(query) {
return request({
url: '/sheep_death/death/search_ear_numbers', // 根据实际路径修改
url: '/sheep_death/death/search/earNo',
method: 'get',
params: { query }
})
}
// 搜索技术员
export function searchTechnician(query) {
return request({
url: '/sheep_death/death/search/technician',
method: 'get',
params: { query }
})
}
// 搜索处理人
export function searchHandler(query) {
return request({
url: '/sheep_death/death/search/handler',
method: 'get',
params: { query }
})

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

@@ -1,15 +1,15 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="母羊耳号" prop="eweManageTags">
<el-form-item label="供体母羊耳号" prop="eweManageTags">
<el-input
v-model="queryParams.eweManageTags"
placeholder="请输入母羊耳号"
placeholder="请输入供体母羊耳号"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="公羊耳号" prop="ramManageTags">
<el-form-item label="供体公羊耳号" prop="ramManageTags">
<el-input
v-model="queryParams.ramManageTags"
placeholder="请输入公羊耳号"
@@ -17,7 +17,7 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="母羊品种" prop="eweVariety">
<el-form-item label="供体母羊品种" prop="eweVariety">
<el-input
v-model="queryParams.eweVariety"
placeholder="请输入母羊品种"
@@ -25,7 +25,7 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="公羊品种" prop="ramVariety">
<el-form-item label="供体公羊品种" prop="ramVariety">
<el-input
v-model="queryParams.ramVariety"
placeholder="请输入公羊品种"
@@ -35,11 +35,12 @@
</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-option label="冲胚" value="3"></el-option>
<el-option label="自然发情人工授精" value="4"></el-option>
</el-select>
<el-option label="供体母羊配种" value="1"></el-option>
<el-option label="同期发情人工授精" value="2"></el-option>
<el-option label="本交" value="3"></el-option>
<el-option label="胚胎移植" value="4"></el-option>
<el-option label="自然法请人工授精" value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input
@@ -260,10 +261,11 @@
<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-option label="冲胚" :value="3"></el-option>
<el-option label="自然发情人工授精" :value="4"></el-option>
<el-option label="供体母羊配种" value="1"></el-option>
<el-option label="同期发情人工授精" value="2"></el-option>
<el-option label="本交" value="3"></el-option>
<el-option label="胚胎移植" value="4"></el-option>
<el-option label="自然法请人工授精" value="5"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -489,10 +491,11 @@ const {queryParams, form, rules} = toRefs(data)
/** 获取配种方式文字显示 */
function getBreedTypeText(breedType) {
if (breedType === 1) return '同期发情'
if (breedType === 2) return '本交'
if (breedType === 3) return '冲胚'
if (breedType === 4) return '自然发情人工授精'
if (breedType === 1) return '供体母羊配种'
if (breedType === 2) return '同期发情人工授精'
if (breedType === 3) return '本交'
if (breedType === 4) return '胚胎移植'
if (breedType === 5) return '自然发情人工授精'
return '-'
}

464
src/views/Weaning/weaning_record/index.vue
View File

@@ -1,180 +1,77 @@
<template>
<div class="app-container">
<!-- 查询表单 -->
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="耳号" prop="allEarNumbers">
<div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
<!-- 主选择器：不显示已选标签 -->
<el-select
v-model="queryParams.allEarNumbers"
multiple
filterable
remote
reserve-keyword
placeholder="输入耳号搜索"
:remote-method="searchEarNumber"
:loading="earNumberLoading"
allow-create
default-first-option
collapse-tags
:max-collapse-tags="0"
style="width: 300px"
@change="handleEarNumberChange"
>
<el-option
v-for="item in earNumberOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
<!-- 辅助粘贴输入框 -->
<el-input
v-model="pasteInput"
placeholder="或粘贴多个耳号(空格/换行/逗号分隔)"
style="width: 300px"
@paste="handlePaste"
@keyup.enter="handlePasteSubmit"
clearable
>
<template #append>
<el-button @click="handlePasteSubmit" :icon="Plus">添加</el-button>
</template>
</el-input>
<!-- 耳号计数显示 -->
<el-tag
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
type="info"
effect="plain"
size="large"
>
已选: {{ queryParams.allEarNumbers.length }} 个
</el-tag>
<!-- 清空按钮 -->
<el-button
type="danger"
plain
@click="clearAllEarNumbers"
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
:icon="Delete"
>
清空全部
</el-button>
</div>
<!-- 已选耳号展示区域（默认显示2个，可展开） -->
<div
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
class="selected-ear-numbers-display"
style="margin-top: 10px;"
<el-select
v-model="queryParams.allEarNumbers"
multiple
filterable
remote
reserve-keyword
placeholder="请输入耳号搜索"
:remote-method="searchEarNumber"
:loading="earNumberLoading"
style="width: 240px"
clearable
>
<!-- 显示前2个或全部耳号 -->
<el-tag
v-for="(tag, index) in displayedEarNumbers"
:key="tag"
closable
@close="handleRemoveEarNumber(tag)"
style="margin: 4px;"
type="success"
>
{{ tag }}
</el-tag>
<el-option
v-for="item in earNumberOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<!-- 展开/收起按钮 -->
<el-button
v-if="queryParams.allEarNumbers.length > defaultShowCount"
type="primary"
link
@click="toggleExpand"
style="margin-left: 8px;"
>
{{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.length - defaultShowCount} 个` }}
<el-icon class="el-icon--right">
<component :is="isExpanded ? ArrowUp : ArrowDown" />
</el-icon>
</el-button>
</div>
<el-form-item label="是否在群" prop="isInHerd">
<el-select v-model="queryParams.isInHerd" placeholder="请选择" clearable style="width: 240px">
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item label="品种" prop="breed">
<el-input
v-model="queryParams.breed"
placeholder="请输入品种"
clearable
@keyup.enter="handleQuery"
/>
<el-form-item label="断奶日期" style="width: 340px">
<el-date-picker
v-model="daterangeTime"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 240px"
></el-date-picker>
</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 label="羊只类别" prop="sheepCategory">
<el-select v-model="queryParams.sheepCategory" placeholder="请选择羊只类别" clearable style="width: 240px">
<el-option label="种公羊" value="种公羊"></el-option>
<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="gender">
<el-select v-model="queryParams.gender" placeholder="请选择性别" clearable>
<el-select v-model="queryParams.gender" placeholder="请选择性别" clearable style="width: 240px">
<el-option label="公" value="公"></el-option>
<el-option label="母" value="母"></el-option>
</el-select>
</el-form-item>
<el-form-item label="父号" prop="fatherNumber">
<el-input
v-model="queryParams.fatherNumber"
placeholder="请输入父号"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="母号" prop="motherNumber">
<el-input
v-model="queryParams.motherNumber"
placeholder="请输入母号"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="是否留养" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择是否留养" clearable>
<el-select v-model="queryParams.status" placeholder="请选择是否留养" clearable style="width: 240px">
<el-option label="留养" value="1"></el-option>
<el-option label="不留养" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="羊舍" prop="sheepPen">
<el-input
v-model="queryParams.sheepPen"
placeholder="请输入羊舍"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input
v-model="queryParams.technician"
placeholder="请输入技术员"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<!-- 修改后的选项，与数据库实际值保持一致 -->
<el-form-item label="繁殖状态" prop="breedingStatus">
<el-select v-model="queryParams.breedingStatus" placeholder="请选择繁殖状态" clearable>
<el-option label="后备" value="后备"></el-option>
<el-option label="已配" value="已配"></el-option>
<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>
<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
@@ -217,10 +114,8 @@
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 数据表格 -->
<el-table v-loading="loading" :data="weaning_recordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 日期作为第一列 -->
<el-table-column label="断奶日期" align="center" prop="datetime" width="120" fixed="left">
<template #default="scope">
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
@@ -245,7 +140,7 @@
<el-table-column label="电子耳号" align="center" prop="electronicTags" width="120" />
<el-table-column label="羊舍" align="center" prop="sheepPen" width="100" />
<el-table-column label="技术员" align="center" prop="technician" width="100" />
<el-table-column label="繁育状态" align="center" prop="breedingStatus" width="100" />
<el-table-column label="羊只类别" align="center" prop="breedingStatus" width="100" />
<el-table-column label="创建人" align="center" prop="createBy" width="100" />
<el-table-column label="创建日期" align="center" prop="createTime" width="120">
<template #default="scope">
@@ -261,17 +156,14 @@
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination
v-show="total>0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
:page-sizes="[20,50,100,200, 500, 1000, 2000]"
@pagination="getList"
/>
<!-- 添加或修改断奶记录对话框 -->
<el-dialog :title="title" v-model="open" width="600px" append-to-body>
<el-form ref="weaning_recordRef" :model="form" :rules="rules" label-width="100px">
<el-row>
@@ -286,7 +178,8 @@
v-model="form.datetime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择断奶日期">
placeholder="请选择断奶日期"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
@@ -294,15 +187,15 @@
<el-row>
<el-col :span="12">
<el-form-item label="断奶重量(kg)" prop="weight">
<el-input-number v-model="form.weight" :precision="2" :step="0.1" placeholder="请输入断奶重量" />
<el-input-number v-model="form.weight" :precision="2" :step="0.1" placeholder="请输入" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否留养" prop="status">
<el-select v-model="form.status" placeholder="请选择是否留养">
<el-option label="留养" value="1"></el-option>
<el-option label="不留养" value="0"></el-option>
</el-select>
<el-radio-group v-model="form.status">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
@@ -337,38 +230,8 @@
</template>
<script setup name="Weaning_record">
import {
listWeaning_record,
getWeaning_record,
delWeaning_record,
addWeaning_record,
updateWeaning_record,
getSheepIdByEarNumber,
searchEarNumbers
} from "@/api/Weaning/weaning_record"
import { ref, computed, nextTick } from 'vue'
import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
import { listWeaning_record, getWeaning_record, delWeaning_record, addWeaning_record, updateWeaning_record, getSheepIdByEarNumber, searchEarNumbers } from "@/api/Weaning/weaning_record"
// 响应式数据
const pasteInput = ref('') // 批量粘贴输入框
const earNumberOptions = ref([]) // 耳号下拉选项
const earNumberLoading = ref(false) // 耳号加载状态
const isExpanded = ref(false) // 控制耳号展开/折叠状态
const defaultShowCount = 2 // 默认显示的耳号数量
// 计算属性：控制显示的耳号列表
const displayedEarNumbers = computed(() => {
if (!queryParams.value.allEarNumbers || queryParams.value.allEarNumbers.length === 0) {
return []
}
// 如果展开或总数<=2，显示全部；否则只显示前2个
if (isExpanded.value || queryParams.value.allEarNumbers.length <= defaultShowCount) {
return queryParams.value.allEarNumbers
} else {
return queryParams.value.allEarNumbers.slice(0, defaultShowCount)
}
})
const { proxy } = getCurrentInstance()
const weaning_recordList = ref([])
@@ -380,28 +243,27 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const daterangeTime = ref([]) // 时间范围数组
// 远程搜索相关
const earNumberOptions = ref([])
const earNumberLoading = ref(false)
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
earNumber: null,
breed: null,
datetime: null,
allEarNumbers: [], // 🔥 必须添加
weight: null,
allEarNumbers: [], // 核心：多选数组
isInHerd: null, // 新增：是否在群
sheepCategory: null, // 新增：羊只类别
status: null,
technician: null,
comment: null,
createBy: null,
createTime: null,
electronicTags: null,
gender: null,
fatherNumber: null,
motherNumber: null,
breed: null,
technician: null,
sheepPen: null,
breedingStatus: null
fatherNumber: null,
motherNumber: null
},
rules: {
earNumber: [
@@ -421,135 +283,38 @@ const data = reactive({
const { queryParams, form, rules } = toRefs(data)
/** 处理粘贴事件 */
function handlePaste(event) {
nextTick(() => {
handlePasteSubmit()
/** 查询断奶记录列表 */
function getList() {
loading.value = true
// 处理时间范围
queryParams.value.params = {};
if (null != daterangeTime.value && '' != daterangeTime.value) {
queryParams.value.params["beginTime"] = daterangeTime.value[0];
queryParams.value.params["endTime"] = daterangeTime.value[1];
}
listWeaning_record(queryParams.value).then(response => {
weaning_recordList.value = response.rows
total.value = response.total
loading.value = false
})
}
/** 处理粘贴内容提交 */
function handlePasteSubmit() {
if (!pasteInput.value || pasteInput.value.trim() === '') {
return
}
// 支持多种分隔符: 空格、换行、逗号、制表符
const separators = /[\s,，\n\r\t]+/
const earNumbers = pasteInput.value
.trim()
.split(separators)
.filter(item => item.trim() !== '')
.map(item => item.trim())
if (earNumbers.length === 0) {
return
}
// 去重并添加到已选列表
const existingSet = new Set(queryParams.value.allEarNumbers || [])
const newEarNumbers = []
const duplicates = []
earNumbers.forEach(earNumber => {
if (!existingSet.has(earNumber)) {
newEarNumbers.push(earNumber)
existingSet.add(earNumber)
} else {
duplicates.push(earNumber)
}
})
// 添加新耳号
if (newEarNumbers.length > 0) {
queryParams.value.allEarNumbers = [
...(queryParams.value.allEarNumbers || []),
...newEarNumbers
]
const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
(duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
proxy.$modal.msgSuccess(message)
} else if (duplicates.length > 0) {
proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
}
// 清空输入框
pasteInput.value = ''
}
/** 远程搜索耳号 */
function searchEarNumber(query) {
if (query !== '') {
earNumberLoading.value = true
const queries = query.trim().split(/[\s,，]+/).filter(q => q)
if (queries.length === 1) {
// 单个耳号模糊搜索
searchEarNumbers(query).then(response => {
earNumberOptions.value = response.data || []
earNumberLoading.value = false
}).catch(() => {
earNumberOptions.value = []
earNumberLoading.value = false
})
} else {
// 多个耳号直接作为选项
earNumberOptions.value = queries
searchEarNumbers(query).then(response => {
earNumberOptions.value = response.data || []
earNumberLoading.value = false
}
}).catch(() => {
earNumberOptions.value = []
earNumberLoading.value = false
})
} else {
earNumberOptions.value = []
}
}
/** 耳号选择变化处理 */
function handleEarNumberChange(value) {
queryParams.value.allEarNumbers = [...new Set(value)]
console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
}
/** 切换展开/收起状态 */
function toggleExpand() {
isExpanded.value = !isExpanded.value
}
/** 移除单个耳号 */
function handleRemoveEarNumber(tag) {
const index = queryParams.value.allEarNumbers.indexOf(tag)
if (index > -1) {
queryParams.value.allEarNumbers.splice(index, 1)
proxy.$modal.msgSuccess('已移除该耳号')
}
// 如果删除后剩余<=2个，自动收起
if (queryParams.value.allEarNumbers.length <= defaultShowCount) {
isExpanded.value = false
}
}
/** 清空所有耳号 */
function clearAllEarNumbers() {
proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
queryParams.value.allEarNumbers = []
pasteInput.value = ''
earNumberOptions.value = []
isExpanded.value = false // 重置展开状态
proxy.$modal.msgSuccess('已清空所有耳号')
}).catch(() => {})
}
/** 查询断奶记录列表 */
function getList() {
loading.value = true
listWeaning_record(queryParams.value).then(response => {
weaning_recordList.value = response.rows
total.value = response.total
loading.value = false
})
}
// 取消按钮
function cancel() {
open.value = false
@@ -564,7 +329,7 @@ function reset() {
earNumber: null,
datetime: null,
weight: null,
status: null,
status: "1", // 修改：默认设为 '1' (是)
technician: null,
comment: null,
createBy: null,
@@ -582,10 +347,11 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
queryParams.value.allEarNumbers = []
earNumberOptions.value = [] // ✅ 添加这一行
isExpanded.value = false
daterangeTime.value = []
earNumberOptions.value = []
proxy.resetForm("queryRef")
// 必须手动清空多选数组
queryParams.value.allEarNumbers = []
handleQuery()
}
@@ -672,44 +438,10 @@ getList()
</script>
<style scoped>
/* 已选耳号展示区样式 */
.selected-ear-numbers-display {
max-height: 150px;
overflow-y: auto;
padding: 8px;
background-color: #f5f7fa;
border-radius: 4px;
border: 1px dashed #dcdfe6;
display: flex;
flex-wrap: wrap;
align-items: center;
.app-container {
padding: 20px;
}
.selected-ear-numbers-display::-webkit-scrollbar {
width: 6px;
height: 6px;
}
.selected-ear-numbers-display::-webkit-scrollbar-thumb {
background-color: #dcdfe6;
border-radius: 3px;
}
.selected-ear-numbers-display::-webkit-scrollbar-track {
background-color: #f5f7fa;
}
.selected-ear-numbers-display .el-tag {
margin: 4px;
cursor: pointer;
}
.selected-ear-numbers-display .el-tag:hover {
opacity: 0.8;
}
/* 隐藏 el-select 的下拉箭头（可选） */
:deep(.el-select__caret) {
display: none;
.mb8 {
margin-bottom: 8px;
}
</style>

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

@@ -704,8 +704,8 @@ function getVarietyName(varietyId) {
/** 性别转换函数 - 前端显示转后端数值 */
function genderToNumber(gender) {
if (gender === 'male') return 1
if (gender === 'female') return 0
if (gender === 'male') return 2
if (gender === 'female') return 1
return gender
}

607
src/views/drymilk/drymilk/index.vue
View File

@@ -1,23 +1,20 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<!-- 羊只耳号（全部） - 多选模糊查询 -->
<el-form-item label="耳号" prop="allEarNumbers">
<el-select
v-model="queryParams.allEarNumbers"
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="耳号" prop="manageTagsList">
<el-select
v-model="queryParams.manageTagsList"
multiple
filterable
remote
reserve-keyword
placeholder="输入耳号搜索，支持多选"
placeholder="请输入耳号搜索"
:remote-method="searchEarNumber"
:loading="earNumberLoading"
allow-create
default-first-option
style="width: 300px"
@change="handleEarNumberChange"
collapse-tags
:max-collapse-tags="0"
style="width: 240px"
clearable
@change="handleQuery"
>
<el-option
v-for="item in earNumberOptions"
@@ -26,184 +23,90 @@
:value="item"
/>
</el-select>
<el-input
v-model="pasteInput"
placeholder="或粘贴多个耳号(空格/换行/逗号分隔)"
style="width: 300px; margin-left: 10px"
@paste="handlePaste"
@keyup.enter="handlePasteSubmit"
clearable
>
<template #append>
<el-button @click="handlePasteSubmit" icon="Plus">添加</el-button>
</template>
</el-input>
<!-- 耳号计数显示 -->
<el-tag
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
type="info"
effect="plain"
size="large"
>
已选: {{ queryParams.allEarNumbers.length }} 个
</el-tag>
<!-- 清空按钮 -->
<el-button
type="danger"
plain
@click="clearAllEarNumbers"
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
icon="Delete"
>
清空全部
</el-button>
<el-button
type="text"
@click="clearEarNumbers"
v-if="queryParams.femaleEarNumbers && queryParams.femaleEarNumbers.length > 0"
style="margin-left: 10px"
>
清空
</el-button>
</el-form-item>
<el-form-item label="干奶日期" style="width: 308px">
<el-date-picker
v-model="dateRange"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="品种" prop="variety">
<el-input
v-model="queryParams.variety"
placeholder="请输入品种"
<el-form-item label="技术员" prop="technicianList">
<el-select
v-model="queryParams.technicianList"
multiple
filterable
remote
reserve-keyword
placeholder="请输入技术员搜索"
:remote-method="searchTechnician"
:loading="technicianLoading"
style="width: 200px"
clearable
@keyup.enter="handleQuery"
/>
@change="handleQuery"
>
<el-option
v-for="item in technicianOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="干奶日期" prop="datetime">
<el-date-picker clearable
v-model="queryParams.datetime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择干奶日期">
</el-date-picker>
</el-form-item>
<el-form-item label="技术员" prop="tecahnician">
<el-input
v-model="queryParams.tecahnician"
placeholder="请输入技术员"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="创建人" prop="createBy">
<el-input
v-model="queryParams.createBy"
placeholder="请输入创建人"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker clearable
v-model="queryParams.createTime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择创建时间">
</el-date-picker>
<el-form-item label="封闭剂" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" clearable style="width: 120px">
<el-option label="是" :value="1" />
<el-option label="否" :value="0" />
</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>
<div v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0" class="selected-ear-numbers">
<span style="margin-right: 10px; color: #606266;">已选择耳号：</span>
<el-tag
v-for="(tag, index) in displayedEarNumbers"
:key="tag"
closable
@close="handleRemoveEarNumber(index)"
style="margin: 4px;"
type="success"
>
{{ tag }}
</el-tag>
<el-button
v-if="queryParams.allEarNumbers.length > 1"
type="text"
@click="toggleExpand"
style="margin-left: 8px;"
>
<el-icon><component :is="isExpanded ? 'ArrowUp' : 'ArrowDown'" /></el-icon>
{{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.length - 1} 个` }}
</el-button>
</div>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['drymilk:drymilk:add']"
>新增</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['drymilk:drymilk:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['drymilk:drymilk:edit']"
>修改</el-button>
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['drymilk:drymilk:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['drymilk:drymilk:remove']"
>删除</el-button>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['drymilk:drymilk:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['drymilk:drymilk:export']"
>导出</el-button>
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['drymilk:drymilk:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="drymilkList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 日期作为第一列 -->
<el-table-column label="干奶日期" align="center" prop="datetime" width="180" fixed="left">
<el-table-column label="干奶日期" align="center" prop="datetime" width="120">
<template #default="scope">
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="耳号" align="center" prop="manageTags" />
<el-table-column label="耳号" align="center" prop="manageTags" min-width="120" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="事件类型" align="center" prop="eventType" />
<el-table-column label="是否使用乳头封闭剂" align="center" prop="status">
<el-table-column label="乳头封闭剂" align="center" prop="status">
<template #default="scope">
<span>{{ scope.row.status === 1 ? '是' : '否' }}</span>
<el-tag v-if="scope.row.status === 1" type="success">是</el-tag>
<el-tag v-else type="info">否</el-tag>
</template>
</el-table-column>
<el-table-column label="转入羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="技术员" align="center" prop="tecahnician" />
<el-table-column label="创建日期" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="备注" align="center" prop="comment" show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['drymilk:drymilk:edit']">修改</el-button>
@@ -217,36 +120,45 @@
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
:page-sizes="[20,50,100,200, 500, 1000, 2000]"
@pagination="getList"
/>
<!-- 添加或修改干奶记录对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-dialog :title="title" v-model="open" width="600px" append-to-body>
<el-form ref="drymilkRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="耳号" prop="manageTags">
<el-input v-model="form.manageTags" placeholder="请输入耳号" />
<el-input
v-if="!form.id"
v-model="form.manageTags"
type="textarea"
:rows="4"
placeholder="请输入耳号，多个耳号请用空格、逗号或回车换行分隔"
/>
<el-input v-else v-model="form.manageTags" placeholder="请输入耳号" disabled />
</el-form-item>
<el-form-item label="干奶日期" prop="datetime">
<el-date-picker clearable
v-model="form.datetime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择干奶日期">
</el-date-picker>
<el-date-picker clearable v-model="form.datetime" type="date" value-format="YYYY-MM-DD" placeholder="请选择干奶日期"></el-date-picker>
</el-form-item>
<el-form-item label="乳头封闭剂" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="转入羊舍id" prop="sheepfold">
<el-input v-model="form.sheepfold" placeholder="请输入转入羊舍id" />
<el-form-item label="转入羊舍" prop="sheepfold">
<el-select v-model="form.sheepfold" filterable placeholder="请输入关键字选择" style="width: 100%">
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="技术员" prop="tecahnician">
<el-input v-model="form.tecahnician" placeholder="请输入技术员" />
<el-select v-model="form.tecahnician" filterable allow-create default-first-option placeholder="请输入或选择技术员">
<el-option v-for="user in userOptions" :key="user.userName" :label="user.nickName" :value="user.nickName"></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="comment">
<el-input v-model="form.comment" type="textarea" placeholder="请输入备注" />
</el-form-item>
@@ -259,16 +171,16 @@
</template>
</el-dialog>
</div>
</template>
<script setup name="Drymilk">
import { listDrymilk, getDrymilk, delDrymilk, addDrymilk, updateDrymilk,searchEarNumbers} from "@/api/drymilk/drymilk"
import { listDrymilk, getDrymilk, delDrymilk, addDrymilk, updateDrymilk, searchEarNumbers, searchTechnicians } from "@/api/drymilk/drymilk"
import { listUser } from "@/api/system/user";
import axios from 'axios';
import { getToken } from "@/utils/auth";
const { proxy } = getCurrentInstance()
// 新增：耳号搜索相关状态
const earNumberOptions = ref([])
const earNumberLoading = ref(false)
const drymilkList = ref([])
const open = ref(false)
const loading = ref(true)
@@ -278,220 +190,121 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const pasteInput = ref('')
const isExpanded = ref(false) // 控制耳号展开/折叠状态
const dateRange = ref([])
const sheepfoldOptions = ref([])
const userOptions = ref([])
// 耳号搜索变量
const earNumberLoading = ref(false)
const earNumberOptions = ref([])
// 技术员搜索变量
const technicianLoading = ref(false)
const technicianOptions = ref([])
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
allEarNumbers: [],
manageTags: null,
manageTagsList: [],
technicianList: [], // 技术员多选列表
tecahnician: null, // 兼容旧字段
variety: null,
datetime: null,
status: null,
sheepfold: null,
tecahnician: null,
createBy: null,
createTime: null
},
rules: {
manageTags: [
{ required: true, message: "耳号不能为空", trigger: "blur" }
],
datetime: [
{ required: true, message: "干奶日期不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "请选择是否使用乳头封闭剂", trigger: "change" }
]
manageTags: [{ required: true, message: "耳号不能为空", trigger: "blur" }],
datetime: [{ required: true, message: "干奶日期不能为空", trigger: "blur" }],
status: [{ required: true, message: "请选择是否使用乳头封闭剂", trigger: "change" }]
}
})
const { queryParams, form, rules } = toRefs(data)
/** 计算显示的耳号列表 */
const displayedEarNumbers = computed(() => {
if (!queryParams.value.allEarNumbers || queryParams.value.allEarNumbers.length === 0) {
return []
}
// 如果展开或总数<=2，显示全部；否则只显示前2个
if (isExpanded.value || queryParams.value.allEarNumbers.length <= 1) {
return queryParams.value.allEarNumbers
/** 远程搜索耳号 */
function searchEarNumber(query) {
if (query) {
earNumberLoading.value = true;
searchEarNumbers(query).then(res => {
earNumberLoading.value = false;
const list = res.data || res.msg || res;
earNumberOptions.value = Array.isArray(list) ? list : [];
}).catch(err => {
earNumberLoading.value = false;
earNumberOptions.value = [];
});
} else {
return queryParams.value.allEarNumbers.slice(0, 1)
}
})
/** 切换展开/收起状态 */
function toggleExpand() {
isExpanded.value = !isExpanded.value
}
/** 移除单个耳号（需要修改以处理展开状态下的索引） */
function handleRemoveEarNumber(displayIndex) {
// 如果是收起状态，直接使用显示索引
// 如果是展开状态，需要找到实际索引
let actualIndex = displayIndex
if (!isExpanded.value && queryParams.value.allEarNumbers.length > 1) {
// 收起状态下，显示的是前2个，索引直接对应
actualIndex = displayIndex
}
queryParams.value.allEarNumbers.splice(actualIndex, 1)
proxy.$modal.msgSuccess('已移除该耳号')
// 如果删除后剩余<=2个，自动收起
if (queryParams.value.allEarNumbers.length <= 1) {
isExpanded.value = false
earNumberOptions.value = [];
}
}
/** 清空所有耳号 */
function clearAllEarNumbers() {
proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
queryParams.value.allEarNumbers = []
pasteInput.value = ''
earNumberOptions.value = []
isExpanded.value = false // 重置展开状态
proxy.$modal.msgSuccess('已清空所有耳号')
}).catch(() => {})
}
/** 处理粘贴事件 */
function handlePaste(event) {
// 延迟处理,确保粘贴内容已填入
nextTick(() => {
handlePasteSubmit()
})
}
/** 处理粘贴内容提交 */
function handlePasteSubmit() {
if (!pasteInput.value || pasteInput.value.trim() === '') {
return
}
// 支持多种分隔符: 空格、换行、逗号、制表符
const separators = /[\s,，\n\r\t]+/
const earNumbers = pasteInput.value
.trim()
.split(separators)
.filter(item => item.trim() !== '')
.map(item => item.trim())
if (earNumbers.length === 0) {
return
}
// 去重并添加到已选列表
const existingSet = new Set(queryParams.value.allEarNumbers || [])
const newEarNumbers = []
const duplicates = []
earNumbers.forEach(earNumber => {
if (!existingSet.has(earNumber)) {
newEarNumbers.push(earNumber)
existingSet.add(earNumber)
} else {
duplicates.push(earNumber)
}
})
// 添加新耳号
if (newEarNumbers.length > 0) {
queryParams.value.allEarNumbers = [
...(queryParams.value.allEarNumbers || []),
...newEarNumbers
]
const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +
(duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')
proxy.$modal.msgSuccess(message)
} else if (duplicates.length > 0) {
proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)
}
// 清空输入框
pasteInput.value = ''
}
/** 批量验证耳号(可选功能) */
async function validateBatchEarNumbers(earNumbers) {
try {
// 可以调用后端批量验证接口
// 这里简化处理,仅在搜索时验证
console.log('待验证耳号:', earNumbers)
} catch (error) {
console.error('验证耳号失败:', error)
/** 远程搜索技术员 */
function searchTechnician(query) {
if (query) {
technicianLoading.value = true;
searchTechnicians(query).then(res => {
technicianLoading.value = false;
const list = res.data || res.msg || res;
technicianOptions.value = Array.isArray(list) ? list : [];
}).catch(err => {
technicianLoading.value = false;
technicianOptions.value = [];
});
} else {
technicianOptions.value = [];
}
}
/** 查询干奶记录列表 */
function getList() {
loading.value = true
listDrymilk(queryParams.value).then(response => {
const params = proxy.addDateRange(queryParams.value, dateRange.value);
// 处理技术员多选：转字符串传给后端
if (queryParams.value.technicianList && queryParams.value.technicianList.length > 0) {
params.tecahnician = queryParams.value.technicianList.join(',');
} else {
params.tecahnician = null;
}
// 处理耳号多选：转字符串传给后端
if (queryParams.value.manageTagsList && queryParams.value.manageTagsList.length > 0) {
params.manageTags = queryParams.value.manageTagsList.join(',');
} else {
params.manageTags = null;
}
listDrymilk(params).then(response => {
drymilkList.value = response.rows
total.value = response.total
loading.value = false
})
}).catch(() => {
loading.value = false;
});
}
function getSheepfoldList() {
const url = '/drymilk/drymilk/sheepfoldList';
const req = proxy.$request ? proxy.$request : axios.create({ baseURL: import.meta.env.VITE_APP_BASE_API, headers: { 'Authorization': 'Bearer ' + getToken() } });
req.get(url).then(res => { sheepfoldOptions.value = res.data || res.rows || []; });
}
function getUserList() {
listUser({ pageNum: 1, pageSize: 1000 }).then(response => { userOptions.value = response.rows; });
}
// 取消按钮
function cancel() {
open.value = false
reset()
}
/** 新增：远程搜索耳号（模糊查询） */
function searchEarNumber(query) {
if (query !== '') {
earNumberLoading.value = true
const queries = query.trim().split(/[\s,，]+/).filter(q => q)
if (queries.length === 1) {
searchEarNumbers(query).then(response => {
earNumberOptions.value = response.data || []
earNumberLoading.value = false
}).catch(() => {
earNumberOptions.value = []
earNumberLoading.value = false
})
} else {
earNumberOptions.value = queries
earNumberLoading.value = false
}
} else {
earNumberOptions.value = []
}
}
/** 新增：耳号选择变化处理 */
function handleEarNumberChange(value) {
queryParams.value.allEarNumbers = [...new Set(value)]
console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)
}
/** 新增：移除单个耳号 */
function removeEarNumber(earNumber) {
const index = queryParams.value.allEarNumbers.indexOf(earNumber)
if (index > -1) {
queryParams.value.allEarNumbers.splice(index, 1)
}
}
// 表单重置
function reset() {
form.value = {
id: null,
manageTags: null,
datetime: null,
status: null,
datetime: new Date().toISOString().split('T')[0],
status: 0,
sheepfold: null,
tecahnician: null,
comment: null
@@ -499,37 +312,39 @@ function reset() {
proxy.resetForm("drymilkRef")
}
function resetQuery() {
dateRange.value = []
queryParams.value.manageTagsList = []
queryParams.value.technicianList = []
earNumberOptions.value = []
technicianOptions.value = []
proxy.resetForm("queryRef")
handleQuery()
}
function handleQuery() {
queryParams.value.pageNum = 1
getList()
}
/** 重置按钮操作 - 修改 */
function resetQuery() {
queryParams.value.allEarNumbers = []
earNumberOptions.value = []
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()
getSheepfoldList();
getUserList();
open.value = true
title.value = "添加干奶记录"
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
getSheepfoldList();
getUserList();
const _id = row.id || ids.value
getDrymilk(_id).then(response => {
form.value = response.data
@@ -538,7 +353,6 @@ function handleUpdate(row) {
})
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["drymilkRef"].validate(valid => {
if (valid) {
@@ -550,7 +364,11 @@ function submitForm() {
})
} else {
addDrymilk(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功")
if(response.code === 200 || response.code === undefined) {
proxy.$modal.msgSuccess(response.msg || "新增成功")
} else {
proxy.$modal.msgWarning(response.msg)
}
open.value = false
getList()
})
@@ -559,7 +377,6 @@ function submitForm() {
})
}
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除干奶记录编号为"' + _ids + '"的数据项？').then(function() {
@@ -570,61 +387,19 @@ function handleDelete(row) {
}).catch(() => {})
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('drymilk/drymilk/export', {
...queryParams.value
}, `drymilk_${new Date().getTime()}.xlsx`)
let params = proxy.addDateRange(queryParams.value, dateRange.value);
if (params.manageTagsList && params.manageTagsList.length > 0) {
params.manageTags = params.manageTagsList.join(',');
}
if (params.technicianList && params.technicianList.length > 0) {
params.tecahnician = params.technicianList.join(',');
}
proxy.download('drymilk/drymilk/export', params, `drymilk_${new Date().getTime()}.xlsx`)
}
// 初始化
getList()
</script>
<style scoped>
/* 已选耳号展示区样式 */
.selected-ear-numbers-display {
max-height: 150px;
overflow-y: auto;
padding: 8px;
background-color: #f5f7fa;
border-radius: 4px;
border: 1px dashed #dcdfe6;
display: flex;
flex-wrap: wrap;
align-items: center;
}
.selected-ear-numbers-display::-webkit-scrollbar {
width: 6px;
height: 6px;
}
.selected-ear-numbers-display::-webkit-scrollbar-thumb {
background-color: #dcdfe6;
border-radius: 3px;
}
.selected-ear-numbers-display::-webkit-scrollbar-track {
background-color: #f5f7fa;
}
.selected-ear-numbers-display .el-tag {
margin: 4px;
cursor: pointer;
}
.selected-ear-numbers-display .el-tag:hover {
opacity: 0.8;
}
/* 展开按钮样式 */
.selected-ear-numbers-display .el-button--text {
padding: 0 8px;
font-size: 14px;
color: #409eff;
}
.selected-ear-numbers-display .el-button--text:hover {
color: #66b1ff;
}
</style>
getSheepfoldList()
getUserList()
</script>

47
src/views/feed/FeedList/index.vue
View File

@@ -72,10 +72,18 @@
<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-form-item label="饲草班人员" prop="zookeeper">
<el-input v-model="form.zookeeper" placeholder="请输入饲草班人员名称" />
</el-form-item>
<!-- <el-form-item label="配料日期" prop="deployDate">
</el-form-item> -->
<el-form-item label="技术员">
<el-select v-model="form.zookeeper" filterable clearable placeholder="请输入饲草班人员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</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>
@@ -91,7 +99,7 @@
</div>
<!-- 弹框：详情/修改 -->
<el-dialog :title="title" v-model="open" width="60%" append-to-body v-if="openModel === 'view'">
<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>
@@ -113,7 +121,7 @@
</template>
</el-table-column>
</el-table-column>
<el-table-column label="配量" align="center" prop="ratio" >
<el-table-column label="配量" align="center" prop="ratio">
<el-table-column label="上午" align="center" prop="ratio" sortable>
<template #default="scope">
{{ (scope.row.ratio / 100 * showFeedList.rootPlan.planMorningSize).toFixed(2) }}
@@ -143,7 +151,7 @@
<script setup name="FeedList">
import { listFeedList, getFeedList, delFeedList, addFeedList, updateFeedList } from "@/api/feed/FeedList"
import { getUserByPost } from '@/api/common/user'
const { proxy } = getCurrentInstance()
const FeedListList = ref([])
@@ -295,5 +303,32 @@
}, `FeedList_${new Date().getTime()}.xlsx`)
}
const technicalOptions = ref([]) //自定义技术员数组变量
// 获取技术员列表
const fetchTechnicalList = () => {
getUserByPost({ postCode: "techs" })
.then(res => {
if (res.code === 200 && Array.isArray(res.data)) {
technicalOptions.value = res.data.map(item => ({
// value: item.userId,
value: item.nickName,
label: item.nickName,
// postName: item.postName, // 保留用于下拉显示
// postCode: item.postCode // 保留用于逻辑判断
}))
console.log(technicalOptions.value);
} else {
technicalOptions.value = []
ElMessage.warning(res.msg || '获取技术员列表失败')
}
})
}
/* ------------------ 初始化 ------------------ */
onMounted(() => {
fetchTechnicalList() //在onMounted()函数中调用获取技术员列表的函数
})
getList()
</script>

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

@@ -55,7 +55,7 @@
</template>
</el-table-column>
<!-- <el-table-column label="计划总量" align="center" prop="planMorningTotal" /> -->
<el-table-column label="实际量" align="center" prop="actualMorningSize" sortable/>
<el-table-column label="实际量" align="center" prop="actualMorningSize" sortable />
</el-table-column>
<!-- <el-table-column label="中午" prop="materialId" align="center">
<el-table-column label="计划量" align="center" prop="planNoonSize">
@@ -67,13 +67,13 @@
<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" sortable >
<el-table-column label="计划量" align="center" prop="planAfternoonSize" sortable>
<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" sortable/>
<el-table-column label="实际量" align="center" prop="actualAfternoonSize" sortable />
</el-table-column>
<!-- <el-table-column label="饲喂比例(%)" align="center" prop="ratioTotal">
<el-table-column label="上午" align="center" prop="ratioMorning" />
@@ -81,7 +81,7 @@
<el-table-column label="下午" align="center" prop="ratioAfternoon" />
</el-table-column> -->
<el-table-column label="计划饲喂总量" align="center" prop="planFeedTotal" sortable/>
<el-table-column label="计划饲喂总量" align="center" prop="planFeedTotal" sortable />
<el-table-column label="饲草班人员" align="center" prop="zookeeper" />
<el-table-column label="饲喂计划日期" align="center" prop="planDate" width="180">
<template #default="scope">
@@ -135,8 +135,17 @@
<el-input v-model="form.ratioAfternoon" placeholder="下午比例" style="width: 100px;" />
</div>
</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="技术员">
<el-select v-model="form.zookeeper" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="计划日期" prop="planDate">
<el-date-picker clearable v-model="form.planDate" type="date" value-format="YYYY-MM-DD"
@@ -168,7 +177,7 @@
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";
import { getUserByPost } from '@/api/common/user'
const { proxy } = getCurrentInstance()
const FeedPlanList = ref([])
@@ -416,6 +425,35 @@
}, `FeedPlan_${new Date().getTime()}.xlsx`)
}
const technicalOptions = ref([]) //自定义技术员数组变量
// 获取技术员列表
const fetchTechnicalList = () => {
getUserByPost({ postCode: "techs" })
.then(res => {
if (res.code === 200 && Array.isArray(res.data)) {
technicalOptions.value = res.data.map(item => ({
// value: item.userId,
value: item.nickName,
label: item.nickName,
// postName: item.postName, // 保留用于下拉显示
// postCode: item.postCode // 保留用于逻辑判断
}))
console.log(technicalOptions.value);
} else {
technicalOptions.value = []
ElMessage.warning(res.msg || '获取技术员列表失败')
}
})
}
/* ------------------ 初始化 ------------------ */
onMounted(() => {
fetchTechnicalList() //在onMounted()函数中调用获取技术员列表的函数
})
getList()
// 获取配方编码字典
getFormulaDict()

2
src/views/feed/FeedStatistic/index.vue
View File

@@ -201,7 +201,7 @@
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 { listMaterial } from "@/api/feed/material"
import { ref } from "vue";
const { proxy } = getCurrentInstance()

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

@@ -282,7 +282,7 @@
import { listFormulaManagement, getFormulaManagement, delFormulaManagement, addFormulaManagement, updateFormulaManagement } from "@/api/feed/FormulaManagement"
import { ref, reactive, toRefs, getCurrentInstance } from 'vue'
import { listFormulaList, getFormulaList, delFormulaList, addFormulaList, updateFormulaList } from "@/api/feed/FormulaList"
import { listMaterial } from "@/api/feed/Material"
import { listMaterial } from "@/api/feed/material"
const { proxy } = getCurrentInstance()
const { pres_status } = proxy.useDict('pres_status')

2
src/views/feed/material/index.vue
View File

@@ -131,7 +131,7 @@
</template>
<script setup name="Material">
import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/feed/Material"
import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/feed/material"
const { proxy } = getCurrentInstance()
const { material_type } = proxy.useDict('material_type')

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

File diff suppressed because it is too large Load Diff

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

@@ -1,118 +1,60 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="耳号" prop="allEarNumbers">
<div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
<!-- 主选择器：不显示已选标签 -->
<el-select
v-model="queryParams.allEarNumbers"
multiple
filterable
remote
reserve-keyword
placeholder="输入耳号搜索"
:remote-method="searchEarNumber"
:loading="earNumberLoading"
allow-create
default-first-option
collapse-tags
:max-collapse-tags="0"
style="width: 300px"
@change="handleEarNumberChange"
>
<el-option
v-for="item in earNumberOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
<!-- 辅助粘贴输入框 -->
<el-input
v-model="pasteInput"
placeholder="或粘贴多个耳号(空格/换行/逗号分隔)"
style="width: 300px"
@paste="handlePaste"
@keyup.enter="handlePasteSubmit"
clearable
>
<template #append>
<el-button @click="handlePasteSubmit" :icon="Plus">添加</el-button>
</template>
</el-input>
<!-- 耳号计数显示 -->
<el-tag
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
type="info"
effect="plain"
size="large"
>
已选: {{ queryParams.allEarNumbers.length }} 个
</el-tag>
<!-- 清空按钮 -->
<el-button
type="danger"
plain
@click="clearAllEarNumbers"
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
:icon="Delete"
>
清空全部
</el-button>
</div>
<!-- 已选耳号展示区域（默认显示2个，可展开） -->
<div
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
class="selected-ear-numbers-display"
style="margin-top: 10px;"
>
<!-- 显示前2个或全部耳号 -->
<el-tag
v-for="(tag, index) in displayedEarNumbers"
:key="tag"
closable
@close="handleRemoveEarNumber(tag)"
style="margin: 4px;"
type="success"
>
{{ tag }}
</el-tag>
<!-- 展开/收起按钮 -->
<el-button
v-if="queryParams.allEarNumbers.length > defaultShowCount"
type="primary"
link
@click="toggleExpand"
style="margin-left: 8px;"
>
{{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.length - defaultShowCount} 个` }}
<el-icon class="el-icon--right">
<component :is="isExpanded ? ArrowUp : ArrowDown" />
</el-icon>
</el-button>
</div>
</el-form-item>
<el-form-item label="事件类型" prop="eventType">
<el-input
v-model="queryParams.eventType"
placeholder="请输入事件类型"
<el-form-item label="管理耳号" prop="manageTagsList">
<el-select
v-model="queryParams.manageTagsList"
multiple
filterable
remote
reserve-keyword
placeholder="请输入耳号"
:remote-method="remoteSearchEarNo"
:loading="loadingSearch"
allow-create
default-first-option
clearable
@keyup.enter="handleQuery"
/>
style="width: 240px"
>
<el-option
v-for="item in earNoOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="死亡日期" prop="deathDate">
<el-date-picker clearable
v-model="queryParams.deathDate"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择死亡日期">
</el-date-picker>
<el-form-item label="死亡日期" prop="deathDateRange">
<el-date-picker
v-model="queryParams.deathDateRange"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
style="width: 240px"
></el-date-picker>
</el-form-item>
<el-form-item label="羊只类型" prop="sheepTypeList">
<el-select
v-model="queryParams.sheepTypeList"
placeholder="请选择羊只类型"
multiple
clearable
collapse-tags
style="width: 200px">
<el-option
v-for="dict in sys_sheep_type"
:key="dict.value"
:label="dict.label"
:value="dict.label"
/>
</el-select>
</el-form-item>
<el-form-item label="疾病类型" prop="diseaseTypeId">
<el-tree-select
v-model="queryParams.diseaseTypeId"
@@ -125,36 +67,76 @@
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="死淘去向" prop="disposalDirection">
<el-select v-model="queryParams.disposalDirection" placeholder="请选择死淘去向" clearable>
<el-select v-model="queryParams.disposalDirection" placeholder="请选择死淘去向" clearable style="width: 200px;">
<el-option label="深埋" value="深埋" />
<el-option label="无害化" value="无害化" />
</el-select>
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input
v-model="queryParams.technician"
<el-form-item label="技术员" prop="technicianList">
<el-select
v-model="queryParams.technicianList"
multiple
filterable
remote
reserve-keyword
placeholder="请输入技术员"
:remote-method="remoteSearchTechnician"
:loading="loadingSearch"
clearable
@keyup.enter="handleQuery"
/>
style="width: 200px"
>
<el-option
v-for="item in technicianOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="处理人" prop="handler">
<el-input
v-model="queryParams.handler"
<el-form-item label="处理人" prop="handlerList">
<el-select
v-model="queryParams.handlerList"
multiple
filterable
remote
reserve-keyword
placeholder="请输入处理人"
:remote-method="remoteSearchHandler"
:loading="loadingSearch"
clearable
@keyup.enter="handleQuery"
/>
style="width: 200px"
>
<el-option
v-for="item in handlerOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="班组" prop="workGroup">
<el-form-item label="班组" prop="workGroupList">
<el-select v-model="queryParams.workGroupList" placeholder="请选择班组" multiple clearable style="width: 200px">
<el-option label="一组" value="一组" />
<el-option label="二组" value="二组" />
<el-option label="三组" value="三组" />
</el-select>
</el-form-item>
<el-form-item label="羊只品种" prop="variety">
<el-input
v-model="queryParams.workGroup"
placeholder="请输入班组"
v-model="queryParams.variety"
placeholder="请输入羊只品种"
clearable
style="width: 200px"
@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>
@@ -209,7 +191,6 @@
<el-table v-loading="loading" :data="deathList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<!-- 日期作为第一列 -->
<el-table-column label="死亡日期" align="center" prop="deathDate" width="120" fixed="left">
<template #default="scope">
<span>{{ parseTime(scope.row.deathDate, '{y}-{m}-{d}') }}</span>
@@ -219,7 +200,7 @@
<el-table-column label="管理耳号" align="center" prop="manageTags" width="120"/>
<el-table-column label="品种" align="center" prop="variety" width="100"/>
<el-table-column label="事件类型" align="center" prop="eventType" width="100"/>
<el-table-column label="死亡时羊只类别" align="center" prop="sheepType" width="130"/>
<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 === 2 ? '公' : '' }}</span>
@@ -266,7 +247,6 @@
@pagination="getList"
/>
<!-- 添加或修改羊只死淘记录对话框 -->
<el-dialog :title="title" v-model="open" width="700px" append-to-body>
<el-form ref="deathRef" :model="form" :rules="rules" label-width="120px">
<el-row>
@@ -274,9 +254,7 @@
<el-form-item label="管理耳号" prop="manageTags">
<el-input
v-model="form.manageTags"
placeholder="请输入管理耳号"
@blur="validateManageTagsInForm"
:loading="validatingTags"
placeholder="请输入管理耳号 (可多个空格隔开)"
/>
</el-form-item>
</el-col>
@@ -286,12 +264,13 @@
v-model="form.deathDate"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择死亡日期">
placeholder="请选择死亡日期"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="疾病类型" prop="diseaseTypeId">
@@ -373,17 +352,17 @@
<script setup name="Death">
import {
listDeath,
getDeath,
delDeath,
addDeath,
updateDeath,
getSheepInfo,
listDeath,
getDeath,
delDeath,
addDeath,
updateDeath,
getSheepInfo,
getDiseaseTree,
searchEarNumbers
searchEarNo,
searchTechnician,
searchHandler
} from "@/api/sheep_death/death"
import { ref, computed, nextTick } from 'vue'
import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
// 响应式数据
const pasteInput = ref('') // 批量粘贴输入框
@@ -406,6 +385,8 @@ const displayedEarNumbers = computed(() => {
}
})
const {proxy} = getCurrentInstance()
// 获取字典数据
const { sys_sheep_type } = proxy.useDict("sys_sheep_type");
const deathList = ref([])
const open = ref(false)
@@ -416,26 +397,31 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const validatingTags = ref(false) // 验证管理耳号的loading状态
const diseaseOptions = ref([]) // 疾病类型选项
const diseaseSubtypeOptions = ref([]) // 疾病子类型选项
const diseaseOptions = ref([])
const diseaseSubtypeOptions = ref([])
// 远程搜索相关变量
const loadingSearch = ref(false)
const earNoOptions = ref([])
const technicianOptions = ref([])
const handlerOptions = ref([])
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
manageTags: null,
eventType: null,
deathDate: null,
manageTagsList: [], // 多选耳号
deathDateRange: [], // 死亡日期范围
sheepTypeList: [], // 多选羊只类型
technicianList: [], // 多选技术员
handlerList: [], // 多选处理人
workGroupList: [], // 多选班组
variety: null,
diseaseTypeId: null,
diseaseSubtypeId: null,
disposalDirection: null,
technician: null,
handler: null,
workGroup: null,
comment: null,
isDelete: null
disposalDirection: null
},
rules: {
manageTags: [
@@ -570,32 +556,80 @@ function clearAllEarNumbers() {
/** 查询羊只死淘记录列表 */
function getList() {
loading.value = true
listDeath(queryParams.value).then(response => {
// 处理日期范围
let params = { ...queryParams.value };
// 处理 params 对象 (BaseEntity 需要)
params.params = {};
if (queryParams.value.deathDateRange && queryParams.value.deathDateRange.length === 2) {
params.params['beginDeathDate'] = queryParams.value.deathDateRange[0];
params.params['endDeathDate'] = queryParams.value.deathDateRange[1];
}
listDeath(params).then(response => {
deathList.value = response.rows
total.value = response.total
loading.value = false
}).catch(() => {
loading.value = false
})
}
/** 远程搜索耳号 */
function remoteSearchEarNo(query) {
if (query) {
loadingSearch.value = true
searchEarNo(query).then(res => {
earNoOptions.value = res.data || []
loadingSearch.value = false
})
} else {
earNoOptions.value = []
}
}
/** 远程搜索技术员 */
function remoteSearchTechnician(query) {
if (query) {
loadingSearch.value = true
searchTechnician(query).then(res => {
technicianOptions.value = res.data || []
loadingSearch.value = false
})
} else {
technicianOptions.value = []
}
}
/** 远程搜索处理人 */
function remoteSearchHandler(query) {
if (query) {
loadingSearch.value = true
searchHandler(query).then(res => {
handlerOptions.value = res.data || []
loadingSearch.value = false
})
} else {
handlerOptions.value = []
}
}
/** 获取疾病树形列表 */
function getDiseaseTreeData() {
getDiseaseTree().then(response => {
if (response.code === 200) {
// 构建树形结构
diseaseOptions.value = proxy.handleTree(response.data, "id", "pid")
}
}).catch(() => {
proxy.$modal.msgError("获取疾病列表失败")
})
}).catch(() => {})
}
/** 疾病类型改变时，更新子类型选项 */
function onDiseaseTypeChange(value) {
form.value.diseaseSubtypeId = null // 清空子类型选择
form.value.diseaseSubtypeId = null
diseaseSubtypeOptions.value = []
if (value) {
// 查找选中疾病类型的子类型
const findChildren = (nodes, targetId) => {
for (const node of nodes) {
if (node.id === targetId) {
@@ -608,62 +642,10 @@ function onDiseaseTypeChange(value) {
}
return []
}
diseaseSubtypeOptions.value = findChildren(diseaseOptions.value, value)
}
}
/** 验证查询条件中的管理耳号 */
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
@@ -676,8 +658,8 @@ function reset() {
id: null,
sheepId: null,
manageTags: null,
eventType: "死亡", // 默认事件类型
deathDate: new Date().toISOString().split('T')[0], // 默认今日
eventType: "死亡",
deathDate: new Date().toISOString().split('T')[0],
diseaseTypeId: null,
diseaseSubtypeId: null,
disposalDirection: null,
@@ -692,7 +674,6 @@ function reset() {
updateTime: null,
isDelete: null
}
// 重置子类型选项
diseaseSubtypeOptions.value = []
proxy.resetForm("deathRef")
}
@@ -705,9 +686,14 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
queryParams.value.allEarNumbers = [] // ✅ 添加这一行
earNumberOptions.value = [] // ✅ 添加这一行
isExpanded.value = false // ✅ 添加这一行
// 手动清空数组类型的查询条件
queryParams.value.manageTagsList = []
queryParams.value.sheepTypeList = []
queryParams.value.technicianList = []
queryParams.value.handlerList = []
queryParams.value.workGroupList = []
queryParams.value.deathDateRange = []
proxy.resetForm("queryRef")
handleQuery()
}
@@ -722,7 +708,7 @@ function handleSelectionChange(selection) {
/** 新增按钮操作 */
function handleAdd() {
reset()
getDiseaseTreeData() // 获取疾病数据
getDiseaseTreeData()
open.value = true
title.value = "添加羊只死淘记录"
}
@@ -730,11 +716,10 @@ function handleAdd() {
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
getDiseaseTreeData() // 获取疾病数据
getDiseaseTreeData()
const _id = row.id || ids.value
getDeath(_id).then(response => {
form.value = response.data
// 如果有疾病类型，需要设置子类型选项
if (form.value.diseaseTypeId) {
onDiseaseTypeChange(form.value.diseaseTypeId)
}
@@ -778,9 +763,15 @@ function handleDelete(row) {
/** 导出按钮操作 */
function handleExport() {
proxy.download('sheep_death/death/export', {
...queryParams.value
}, `death_${new Date().getTime()}.xlsx`)
// 导出参数构造
let params = { ...queryParams.value };
params.params = {};
if (queryParams.value.deathDateRange && queryParams.value.deathDateRange.length === 2) {
params.params['beginDeathDate'] = queryParams.value.deathDateRange[0];
params.params['endDeathDate'] = queryParams.value.deathDateRange[1];
}
proxy.download('sheep_death/death/export', params, `death_${new Date().getTime()}.xlsx`)
}
// 初始化