繁育多个页面的多耳号查询
This commit is contained in:
@@ -63,4 +63,13 @@ export function getBreedInfoByManageTags(manageTags) {
|
||||
manageTags: manageTags
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 模糊查询母羊耳号列表
|
||||
export function searchEarNumbers(query) {
|
||||
return request({
|
||||
url: '/Pregnancy_Test/Pregnancy_Test/search_ear_numbers', // 根据实际路径修改
|
||||
method: 'get',
|
||||
params: { query }
|
||||
})
|
||||
}
|
||||
@@ -49,4 +49,13 @@ export function getSheepIdByEarNumber(earNumber) {
|
||||
url: '/Weaning/weaning_record/sheepId/' + earNumber,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 模糊查询母羊耳号列表
|
||||
export function searchEarNumbers(query) {
|
||||
return request({
|
||||
url: '/Weaning/weaning_record/search_ear_numbers', // 根据实际路径修改
|
||||
method: 'get',
|
||||
params: { query }
|
||||
})
|
||||
}
|
||||
@@ -8,6 +8,16 @@ export function listLambing_records(query) {
|
||||
params: query
|
||||
})
|
||||
}
|
||||
// lambing_records.js 添加方法
|
||||
|
||||
// 模糊查询母羊耳号列表
|
||||
export function searchEarNumbers(query) {
|
||||
return request({
|
||||
url: '/breed/lambing_records/search_ear_numbers',
|
||||
method: 'get',
|
||||
params: { query }
|
||||
})
|
||||
}
|
||||
|
||||
// 查询产羔记录详细
|
||||
export function getLambing_records(id) {
|
||||
|
||||
@@ -49,4 +49,30 @@ 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 }
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -57,4 +57,13 @@ export function delMiscarriage(id) {
|
||||
url: '/miscarriage/miscarriage/' + id,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
// 模糊查询母羊耳号列表
|
||||
export function searchEarNumbers(query) {
|
||||
return request({
|
||||
url: '/breed/lambing_records/search_ear_numbers', // 根据实际路径修改
|
||||
method: 'get',
|
||||
params: { query }
|
||||
})
|
||||
}
|
||||
@@ -57,4 +57,13 @@ export function getDiseaseTree() {
|
||||
url: '/sheep_death/death/disease/tree',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 模糊查询母羊耳号列表
|
||||
export function searchEarNumbers(query) {
|
||||
return request({
|
||||
url: '/sheep_death/death/search_ear_numbers', // 根据实际路径修改
|
||||
method: 'get',
|
||||
params: { query }
|
||||
})
|
||||
}
|
||||
@@ -237,6 +237,7 @@
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:page-sizes="[20,50,100,200, 500, 1000, 2000]"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
@@ -406,6 +407,29 @@ import {
|
||||
getLatestBreedPlanByEweTags
|
||||
} from "@/api/Breeding_records/Breeding_records"
|
||||
|
||||
import { ref, computed, nextTick } from 'vue'
|
||||
import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
|
||||
|
||||
// 响应式数据
|
||||
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 Breeding_recordsList = ref([])
|
||||
|
||||
@@ -1,14 +1,101 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="耳号" prop="manageTags">
|
||||
<el-input
|
||||
v-model="queryParams.manageTags"
|
||||
placeholder="请输入耳号,多个耳号用逗号分隔"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
@clear="handleQuery"
|
||||
/>
|
||||
<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="datetime">
|
||||
<el-date-picker clearable
|
||||
@@ -173,6 +260,7 @@
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:page-sizes="[20,50,100,200, 500, 1000, 2000]"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
@@ -288,8 +376,39 @@
|
||||
</template>
|
||||
|
||||
<script setup name="Pregnancy_Test">
|
||||
import { listPregnancy_Test, getPregnancy_Test, delPregnancy_Test, addPregnancy_Test, updatePregnancy_Test, getSheepByManageTags, getBreedInfoByManageTags } from "@/api/Pregnancy_Test/Pregnancy_Test"
|
||||
import {
|
||||
listPregnancy_Test,
|
||||
getPregnancy_Test,
|
||||
delPregnancy_Test,
|
||||
addPregnancy_Test,
|
||||
updatePregnancy_Test,
|
||||
getSheepByManageTags,
|
||||
getBreedInfoByManageTags,
|
||||
searchEarNumbers
|
||||
} from "@/api/Pregnancy_Test/Pregnancy_Test"
|
||||
import { ref, computed, nextTick } from 'vue'
|
||||
import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
|
||||
|
||||
// 响应式数据
|
||||
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 Pregnancy_TestList = ref([])
|
||||
@@ -310,6 +429,7 @@ const data = reactive({
|
||||
pageSize: 10,
|
||||
manageTags: null,
|
||||
datetime: null,
|
||||
allEarNumbers: [], // ✅ 添加这一行!
|
||||
result: null,
|
||||
technician: null,
|
||||
way: null,
|
||||
@@ -353,6 +473,125 @@ const data = reactive({
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data)
|
||||
|
||||
/** 处理粘贴事件 */
|
||||
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 = ''
|
||||
}
|
||||
|
||||
/** 远程搜索耳号 */
|
||||
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 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 getResultTagType(result) {
|
||||
switch (result) {
|
||||
@@ -487,6 +726,9 @@ function handleQuery() {
|
||||
/** 重置按钮操作 */
|
||||
function resetQuery() {
|
||||
console.log("重置搜索条件")
|
||||
queryParams.value.allEarNumbers = [] // ✅ 添加这一行
|
||||
earNumberOptions.value = [] // ✅ 添加这一行
|
||||
isExpanded.value = false
|
||||
proxy.resetForm("queryRef")
|
||||
queryParams.value.manageTags = null
|
||||
queryParams.value.datetime = null
|
||||
@@ -620,22 +862,44 @@ onMounted(() => {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.el-table {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.el-table .cell {
|
||||
padding: 0 5px;
|
||||
}
|
||||
|
||||
/* 调试样式 */
|
||||
.debug-info {
|
||||
background-color: #f0f9ff;
|
||||
border: 1px solid #0ea5e9;
|
||||
border-radius: 4px;
|
||||
/* 已选耳号展示区样式 */
|
||||
.selected-ear-numbers-display {
|
||||
max-height: 150px;
|
||||
overflow-y: auto;
|
||||
padding: 8px;
|
||||
margin: 8px 0;
|
||||
font-size: 12px;
|
||||
color: #0369a1;
|
||||
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;
|
||||
}
|
||||
|
||||
/* 隐藏 el-select 的下拉箭头(可选) */
|
||||
:deep(.el-select__caret) {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
@@ -157,6 +157,7 @@
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:page-sizes="[20,50,100,200, 500, 1000, 2000]"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
|
||||
@@ -2,13 +2,101 @@
|
||||
<div class="app-container">
|
||||
<!-- 查询表单 -->
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
|
||||
<el-form-item label="耳号" prop="earNumber">
|
||||
<el-input
|
||||
v-model="queryParams.earNumber"
|
||||
placeholder="请输入耳号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
<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="breed">
|
||||
<el-input
|
||||
@@ -179,6 +267,7 @@
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:page-sizes="[20,50,100,200, 500, 1000, 2000]"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
@@ -248,8 +337,38 @@
|
||||
</template>
|
||||
|
||||
<script setup name="Weaning_record">
|
||||
import { listWeaning_record, getWeaning_record, delWeaning_record, addWeaning_record, updateWeaning_record, getSheepIdByEarNumber } from "@/api/Weaning/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'
|
||||
|
||||
// 响应式数据
|
||||
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([])
|
||||
@@ -270,6 +389,7 @@ const data = reactive({
|
||||
earNumber: null,
|
||||
breed: null,
|
||||
datetime: null,
|
||||
allEarNumbers: [], // 🔥 必须添加
|
||||
weight: null,
|
||||
status: null,
|
||||
technician: null,
|
||||
@@ -301,6 +421,125 @@ const data = reactive({
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data)
|
||||
|
||||
/** 处理粘贴事件 */
|
||||
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 = ''
|
||||
}
|
||||
|
||||
/** 远程搜索耳号 */
|
||||
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 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
|
||||
@@ -343,6 +582,9 @@ function handleQuery() {
|
||||
|
||||
/** 重置按钮操作 */
|
||||
function resetQuery() {
|
||||
queryParams.value.allEarNumbers = []
|
||||
earNumberOptions.value = [] // ✅ 添加这一行
|
||||
isExpanded.value = false
|
||||
proxy.resetForm("queryRef")
|
||||
handleQuery()
|
||||
}
|
||||
@@ -430,7 +672,44 @@ getList()
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.app-container {
|
||||
padding: 20px;
|
||||
/* 已选耳号展示区样式 */
|
||||
.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;
|
||||
}
|
||||
|
||||
/* 隐藏 el-select 的下拉箭头(可选) */
|
||||
:deep(.el-select__caret) {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
@@ -675,6 +675,7 @@
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:page-sizes="[20,50,100,200, 500, 1000, 2000]"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
|
||||
@@ -1,14 +1,105 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
|
||||
<el-form-item label="母羊耳号" prop="femaleEarNumber">
|
||||
<el-input
|
||||
v-model="queryParams.femaleEarNumber"
|
||||
placeholder="请输入母羊耳号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
<!-- 修改母羊耳号查询组件 -->
|
||||
<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="femaleBreed">
|
||||
<el-input
|
||||
v-model="queryParams.femaleBreed"
|
||||
@@ -151,6 +242,7 @@
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:page-sizes="[20,50,100,200, 500, 1000, 2000]"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
@@ -240,6 +332,19 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<!-- 显示已选择的耳号标签 -->
|
||||
<div v-if="queryParams.femaleEarNumbers && queryParams.femaleEarNumbers.length > 0" class="selected-ear-numbers">
|
||||
<span style="margin-right: 10px; color: #606266;">已选择耳号:</span>
|
||||
<el-tag
|
||||
v-for="earNumber in queryParams.femaleEarNumbers"
|
||||
:key="earNumber"
|
||||
closable
|
||||
@close="removeEarNumber(earNumber)"
|
||||
style="margin-right: 8px;"
|
||||
>
|
||||
{{ earNumber }}
|
||||
</el-tag>
|
||||
</div>
|
||||
|
||||
<!-- 羔羊信息录入 -->
|
||||
<div v-if="form.lambsBorn > 0 && showLambForms">
|
||||
@@ -375,10 +480,32 @@
|
||||
</template>
|
||||
|
||||
<script setup name="Lambing_records">
|
||||
import { listLambing_records, getLambing_records, delLambing_records, addLambing_records, updateLambing_records, getLambDetail, getVarietyList, getBreedingInfo } from "@/api/breed/lambing_records"
|
||||
import { listLambing_records, getLambing_records, delLambing_records, addLambing_records, updateLambing_records, getLambDetail, getVarietyList, getBreedingInfo,searchEarNumbers } from "@/api/breed/lambing_records"
|
||||
import { ref, computed, nextTick } from 'vue'
|
||||
import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
|
||||
|
||||
// 响应式数据
|
||||
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 lambing_recordsList = ref([])
|
||||
const open = ref(false)
|
||||
const detailOpen = ref(false)
|
||||
@@ -400,7 +527,7 @@ const data = reactive({
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
femaleEarNumber: null,
|
||||
femaleEarNumber: [],
|
||||
femaleBreed: null,
|
||||
sheepId: null,
|
||||
parity: null,
|
||||
@@ -425,7 +552,125 @@ const data = reactive({
|
||||
})
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data)
|
||||
/** 处理粘贴事件 */
|
||||
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 = ''
|
||||
}
|
||||
|
||||
/** 远程搜索耳号 */
|
||||
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 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 getVarietyData() {
|
||||
return getVarietyList().then(response => {
|
||||
@@ -438,6 +683,17 @@ function getVarietyData() {
|
||||
})
|
||||
}
|
||||
|
||||
/** 新增:清空所有耳号 */
|
||||
function clearEarNumbers() {
|
||||
queryParams.value.femaleEarNumbers = []
|
||||
}
|
||||
/** 新增:移除单个耳号 */
|
||||
function removeEarNumber(earNumber) {
|
||||
const index = queryParams.value.femaleEarNumbers.indexOf(earNumber)
|
||||
if (index > -1) {
|
||||
queryParams.value.femaleEarNumbers.splice(index, 1)
|
||||
}
|
||||
}
|
||||
/** 根据品种ID获取品种名称 */
|
||||
function getVarietyName(varietyId) {
|
||||
if (!varietyId) return '-'
|
||||
@@ -535,6 +791,7 @@ function reset() {
|
||||
parity: null,
|
||||
maleEarNumber: null,
|
||||
breedingDate: null,
|
||||
allEarNumbers: [], // ✅ 添加这一行!
|
||||
pregnancyDays: null,
|
||||
lambsBorn: null,
|
||||
survival: null,
|
||||
@@ -550,13 +807,17 @@ function reset() {
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
/** 搜索按钮操作 - 修改 */
|
||||
function handleQuery() {
|
||||
queryParams.value.pageNum = 1
|
||||
getList()
|
||||
}
|
||||
|
||||
/** 重置按钮操作 */
|
||||
/** 重置按钮操作 - 修改 */
|
||||
function resetQuery() {
|
||||
queryParams.value.allEarNumbers = [] // ✅ 添加这一行
|
||||
earNumberOptions.value = [] // ✅ 添加这一行
|
||||
isExpanded.value = false
|
||||
proxy.resetForm("queryRef")
|
||||
handleQuery()
|
||||
}
|
||||
@@ -702,29 +963,44 @@ onMounted(() => {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.lamb-form-item {
|
||||
margin-bottom: 20px;
|
||||
padding: 15px;
|
||||
border: 1px solid #e4e7ed;
|
||||
/* 已选耳号展示区样式 */
|
||||
.selected-ear-numbers-display {
|
||||
max-height: 150px;
|
||||
overflow-y: auto;
|
||||
padding: 8px;
|
||||
background-color: #f5f7fa;
|
||||
border-radius: 4px;
|
||||
background-color: #fafafa;
|
||||
border: 1px dashed #dcdfe6;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.lamb-form-header {
|
||||
margin-bottom: 15px;
|
||||
.selected-ear-numbers-display::-webkit-scrollbar {
|
||||
width: 6px;
|
||||
height: 6px;
|
||||
}
|
||||
|
||||
.lamb-title {
|
||||
font-weight: bold;
|
||||
color: #409eff;
|
||||
font-size: 14px;
|
||||
.selected-ear-numbers-display::-webkit-scrollbar-thumb {
|
||||
background-color: #dcdfe6;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.lamb-form-content {
|
||||
margin-bottom: 10px;
|
||||
.selected-ear-numbers-display::-webkit-scrollbar-track {
|
||||
background-color: #f5f7fa;
|
||||
}
|
||||
|
||||
.lamb-form-content:last-child {
|
||||
margin-bottom: 0;
|
||||
.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;
|
||||
}
|
||||
</style>
|
||||
@@ -1,14 +1,73 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="耳号" prop="manageTags">
|
||||
<!-- 羊只耳号(全部) - 多选模糊查询 -->
|
||||
<el-form-item label="耳号" prop="allEarNumbers">
|
||||
<el-select
|
||||
v-model="queryParams.allEarNumbers"
|
||||
multiple
|
||||
filterable
|
||||
remote
|
||||
reserve-keyword
|
||||
placeholder="输入耳号搜索,支持多选"
|
||||
:remote-method="searchEarNumber"
|
||||
:loading="earNumberLoading"
|
||||
allow-create
|
||||
default-first-option
|
||||
style="width: 300px"
|
||||
@change="handleEarNumberChange"
|
||||
collapse-tags
|
||||
:max-collapse-tags="0"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in earNumberOptions"
|
||||
:key="item"
|
||||
:label="item"
|
||||
:value="item"
|
||||
/>
|
||||
</el-select>
|
||||
<el-input
|
||||
v-model="queryParams.manageTags"
|
||||
placeholder="请输入耳号"
|
||||
v-model="pasteInput"
|
||||
placeholder="或粘贴多个耳号(空格/换行/逗号分隔)"
|
||||
style="width: 300px; margin-left: 10px"
|
||||
@paste="handlePaste"
|
||||
@keyup.enter="handlePasteSubmit"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
>
|
||||
<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="品种" prop="variety">
|
||||
<el-input
|
||||
v-model="queryParams.variety"
|
||||
@@ -55,6 +114,30 @@
|
||||
</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
|
||||
@@ -134,6 +217,7 @@
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:page-sizes="[20,50,100,200, 500, 1000, 2000]"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
@@ -175,13 +259,16 @@
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<script setup name="Drymilk">
|
||||
import { listDrymilk, getDrymilk, delDrymilk, addDrymilk, updateDrymilk } from "@/api/drymilk/drymilk"
|
||||
import { listDrymilk, getDrymilk, delDrymilk, addDrymilk, updateDrymilk,searchEarNumbers} from "@/api/drymilk/drymilk"
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
|
||||
// 新增:耳号搜索相关状态
|
||||
const earNumberOptions = ref([])
|
||||
const earNumberLoading = ref(false)
|
||||
const drymilkList = ref([])
|
||||
const open = ref(false)
|
||||
const loading = ref(true)
|
||||
@@ -191,13 +278,15 @@ const single = ref(true)
|
||||
const multiple = ref(true)
|
||||
const total = ref(0)
|
||||
const title = ref("")
|
||||
const pasteInput = ref('')
|
||||
const isExpanded = ref(false) // 控制耳号展开/折叠状态
|
||||
|
||||
const data = reactive({
|
||||
form: {},
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
manageTags: null,
|
||||
allEarNumbers: [],
|
||||
variety: null,
|
||||
datetime: null,
|
||||
status: null,
|
||||
@@ -205,6 +294,7 @@ const data = reactive({
|
||||
tecahnician: null,
|
||||
createBy: null,
|
||||
createTime: null
|
||||
|
||||
},
|
||||
rules: {
|
||||
manageTags: [
|
||||
@@ -221,6 +311,127 @@ const data = reactive({
|
||||
|
||||
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
|
||||
} 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
|
||||
}
|
||||
}
|
||||
|
||||
/** 清空所有耳号 */
|
||||
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 getList() {
|
||||
loading.value = true
|
||||
@@ -236,6 +447,43 @@ 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() {
|
||||
@@ -251,14 +499,15 @@ function reset() {
|
||||
proxy.resetForm("drymilkRef")
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
function handleQuery() {
|
||||
queryParams.value.pageNum = 1
|
||||
getList()
|
||||
}
|
||||
|
||||
/** 重置按钮操作 */
|
||||
/** 重置按钮操作 - 修改 */
|
||||
function resetQuery() {
|
||||
queryParams.value.allEarNumbers = []
|
||||
earNumberOptions.value = []
|
||||
proxy.resetForm("queryRef")
|
||||
handleQuery()
|
||||
}
|
||||
@@ -277,6 +526,7 @@ function handleAdd() {
|
||||
title.value = "添加干奶记录"
|
||||
}
|
||||
|
||||
|
||||
/** 修改按钮操作 */
|
||||
function handleUpdate(row) {
|
||||
reset()
|
||||
@@ -328,4 +578,53 @@ function handleExport() {
|
||||
}
|
||||
|
||||
getList()
|
||||
</script>
|
||||
</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>
|
||||
|
||||
@@ -127,6 +127,7 @@
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:page-sizes="[20,50,100,200, 500, 1000, 2000]"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
|
||||
@@ -1,13 +1,101 @@
|
||||
<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 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="variety">
|
||||
<el-input
|
||||
@@ -285,8 +373,31 @@ import {
|
||||
addMiscarriage,
|
||||
updateMiscarriage,
|
||||
getSheepInfo,
|
||||
getReasonOptions
|
||||
getReasonOptions, searchEarNumbers
|
||||
} from "@/api/miscarriage/miscarriage"
|
||||
import { ref, computed, nextTick } from 'vue'
|
||||
import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
|
||||
|
||||
// 响应式数据
|
||||
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()
|
||||
|
||||
@@ -381,7 +492,125 @@ function getList() {
|
||||
loading.value = false
|
||||
})
|
||||
}
|
||||
/** 处理粘贴事件 */
|
||||
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 = ''
|
||||
}
|
||||
|
||||
/** 远程搜索耳号 */
|
||||
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 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 getReasonOptionsList() {
|
||||
getReasonOptions().then(response => {
|
||||
@@ -404,6 +633,7 @@ function reset() {
|
||||
datetime: null,
|
||||
comment: null,
|
||||
technician: null,
|
||||
allEarNumbers: [], // ✅ 添加这一行!
|
||||
reason: null,
|
||||
exposeType: null,
|
||||
status: null,
|
||||
@@ -422,6 +652,9 @@ function handleQuery() {
|
||||
|
||||
/** 重置按钮操作 */
|
||||
function resetQuery() {
|
||||
queryParams.value.allEarNumbers = [] // ✅ 添加这一行
|
||||
earNumberOptions.value = [] // ✅ 添加这一行
|
||||
isExpanded.value = false // ✅ 添加这一行
|
||||
proxy.resetForm("queryRef")
|
||||
handleQuery()
|
||||
}
|
||||
@@ -583,4 +816,47 @@ function handleExport() {
|
||||
|
||||
getList()
|
||||
getReasonOptionsList()
|
||||
</script>
|
||||
</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;
|
||||
}
|
||||
|
||||
/* 隐藏 el-select 的下拉箭头(可选) */
|
||||
:deep(.el-select__caret) {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
@@ -1,14 +1,101 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
|
||||
<el-form-item label="管理耳号" prop="manageTags">
|
||||
<el-input
|
||||
v-model="queryParams.manageTags"
|
||||
placeholder="请输入管理耳号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
@blur="validateManageTagsInQuery"
|
||||
/>
|
||||
<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
|
||||
@@ -175,6 +262,7 @@
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:page-sizes="[20,50,100,200, 500, 1000, 2000]"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
@@ -284,8 +372,39 @@
|
||||
</template>
|
||||
|
||||
<script setup name="Death">
|
||||
import {listDeath, getDeath, delDeath, addDeath, updateDeath, getSheepInfo, getDiseaseTree} from "@/api/sheep_death/death"
|
||||
import {
|
||||
listDeath,
|
||||
getDeath,
|
||||
delDeath,
|
||||
addDeath,
|
||||
updateDeath,
|
||||
getSheepInfo,
|
||||
getDiseaseTree,
|
||||
searchEarNumbers
|
||||
} from "@/api/sheep_death/death"
|
||||
import { ref, computed, nextTick } from 'vue'
|
||||
import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
|
||||
|
||||
// 响应式数据
|
||||
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 deathList = ref([])
|
||||
@@ -329,7 +448,125 @@ const data = reactive({
|
||||
})
|
||||
|
||||
const {queryParams, form, rules} = toRefs(data)
|
||||
/** 处理粘贴事件 */
|
||||
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 = ''
|
||||
}
|
||||
|
||||
/** 远程搜索耳号 */
|
||||
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 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
|
||||
@@ -445,6 +682,7 @@ function reset() {
|
||||
diseaseSubtypeId: null,
|
||||
disposalDirection: null,
|
||||
technician: null,
|
||||
allEarNumbers: [], // 🔥 必须添加
|
||||
handler: null,
|
||||
workGroup: null,
|
||||
comment: null,
|
||||
@@ -467,6 +705,9 @@ function handleQuery() {
|
||||
|
||||
/** 重置按钮操作 */
|
||||
function resetQuery() {
|
||||
queryParams.value.allEarNumbers = [] // ✅ 添加这一行
|
||||
earNumberOptions.value = [] // ✅ 添加这一行
|
||||
isExpanded.value = false // ✅ 添加这一行
|
||||
proxy.resetForm("queryRef")
|
||||
handleQuery()
|
||||
}
|
||||
@@ -548,4 +789,44 @@ 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;
|
||||
}
|
||||
|
||||
/* 隐藏 el-select 的下拉箭头(可选) */
|
||||
:deep(.el-select__caret) {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user