转场,转群,改耳号,改备注,改品种部分bug修复,字段顺序调整
This commit is contained in:
@@ -7,15 +7,39 @@
|
||||
start-placeholder="开始日期" end-placeholder="结束日期" />
|
||||
</el-form-item>
|
||||
<el-form-item label="管理耳号" prop="manageTagsList">
|
||||
<el-select v-model="queryParams.manageTagsList" multiple filterable remote reserve-keyword
|
||||
placeholder="请输入耳号,支持多选" :remote-method="searchEarNumber" :loading="earLoading" allow-create
|
||||
default-first-option style="width: 260px">
|
||||
<el-option v-for="item in earOptions" :key="item" :label="item" :value="item" />
|
||||
</el-select>
|
||||
<el-button type="text" @click="clearEarNumbers"
|
||||
v-if="queryParams.manageTagsList && queryParams.manageTagsList.length > 0" style="margin-left: 8px">
|
||||
清空
|
||||
</el-button>
|
||||
<div style="display:flex;align-items:center;gap:8px;flex-wrap:wrap;">
|
||||
<el-select v-model="queryParams.manageTagsList" multiple filterable remote reserve-keyword
|
||||
placeholder="输入耳号搜索" :remote-method="searchEarNumber" :loading="earLoading" allow-create
|
||||
default-first-option collapse-tags :max-collapse-tags="0" style="width:260px" @change="handleEarChange">
|
||||
<el-option v-for="item in earOptions" :key="item" :label="item" :value="item" />
|
||||
</el-select>
|
||||
<el-input v-model="pasteText" placeholder="或粘贴多个耳号(空格/换行/逗号分隔)" style="width:260px" @paste="handlePaste"
|
||||
@keyup.enter="handlePasteSubmit" clearable>
|
||||
<template #append>
|
||||
<el-button @click="handlePasteSubmit" :icon="Plus">添加</el-button>
|
||||
</template>
|
||||
</el-input>
|
||||
<el-tag v-if="queryParams.manageTagsList.length" type="info" effect="plain" size="large">
|
||||
已选: {{ queryParams.manageTagsList.length }} 个
|
||||
</el-tag>
|
||||
<el-button type="danger" plain :icon="Delete" @click="clearEarNumbers"
|
||||
v-if="queryParams.manageTagsList.length">
|
||||
清空全部
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-if="queryParams.manageTagsList.length" class="selected-ear-numbers">
|
||||
<el-tag v-for="tag in displayedEarTags" :key="tag" closable @close="removeEarNumber(tag)" style="margin:4px"
|
||||
type="success">
|
||||
{{ tag }}
|
||||
</el-tag>
|
||||
<el-button v-if="queryParams.manageTagsList.length > defaultShowCount" type="primary" link
|
||||
@click="toggleExpand">
|
||||
{{ isExpanded ? '收起' : `展开剩余 ${queryParams.manageTagsList.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="sheepfold">
|
||||
<el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
|
||||
@@ -27,18 +51,18 @@
|
||||
<el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否在群" prop="isDelete">
|
||||
<el-select v-model="queryParams.isDelete" placeholder="全部" clearable style="min-width:120px">
|
||||
<el-option label="全部" value="" />
|
||||
<el-option label="在群" :value="0" />
|
||||
<el-option label="离群" :value="1" />
|
||||
</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-button icon="Refresh" @click="resetQuery">重置</el-button> -->
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div v-if="queryParams.manageTagsList && queryParams.manageTagsList.length > 0" class="selected-ear-numbers">
|
||||
<span style="margin-right: 10px; color: #606266;">已选耳号:</span>
|
||||
<el-tag v-for="tag in queryParams.manageTagsList" :key="tag" closable @close="removeEarNumber(tag)"
|
||||
style="margin-right: 8px;">
|
||||
{{ tag }}
|
||||
</el-tag>
|
||||
</div>
|
||||
<!-- 按钮区域 -->
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
@@ -136,7 +160,9 @@
|
||||
import { listCastrate, getCastrate, delCastrate, addCastrate, searchEarNumbers } from '@/api/produce/other/castrate'
|
||||
import { checkSheepByManageTags, getVarietyOptions, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
|
||||
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
|
||||
|
||||
import { Plus, Delete, ArrowUp, ArrowDown } from '@element-plus/icons-vue'
|
||||
import { nextTick } from 'vue'
|
||||
import dayjs from 'dayjs'
|
||||
const { proxy } = getCurrentInstance()
|
||||
|
||||
const castrateList = ref([])
|
||||
@@ -152,7 +178,14 @@ const daterangeCreateTime = ref([])
|
||||
const sheepOptions = ref([])
|
||||
const varietyOptions = ref([])
|
||||
const daterangeEventDate = ref([])
|
||||
|
||||
const pasteText = ref('')
|
||||
const isExpanded = ref(false)
|
||||
const defaultShowCount = 2
|
||||
const displayedEarTags = computed(() => {
|
||||
const list = queryParams.value.manageTagsList
|
||||
if (isExpanded.value || list.length <= defaultShowCount) return list
|
||||
return list.slice(0, defaultShowCount)
|
||||
})
|
||||
const data = reactive({
|
||||
form: {
|
||||
manageTags: [],
|
||||
@@ -173,6 +206,8 @@ const data = reactive({
|
||||
createTime: null,
|
||||
beginEventDate: null,
|
||||
endEventDate: null,
|
||||
manageTagsList: [],
|
||||
isDelete: null
|
||||
},
|
||||
rules: {
|
||||
manageTags: [
|
||||
@@ -327,6 +362,7 @@ function resetQuery() {
|
||||
daterangeCreateTime.value = []
|
||||
daterangeEventDate.value = []
|
||||
queryParams.value.manageTagsList = []
|
||||
queryParams.value.isDelete = null
|
||||
proxy.resetForm('queryRef')
|
||||
handleQuery()
|
||||
}
|
||||
@@ -342,6 +378,7 @@ function handleAdd() {
|
||||
reset()
|
||||
open.value = true
|
||||
title.value = '添加去势'
|
||||
form.value.eventDate = dayjs().format('YYYY-MM-DD')
|
||||
}
|
||||
|
||||
//修改
|
||||
@@ -469,10 +506,43 @@ function searchEarNumber(query) {
|
||||
function clearEarNumbers() {
|
||||
queryParams.value.manageTagsList = []
|
||||
}
|
||||
|
||||
function removeEarNumber(tag) {
|
||||
const idx = queryParams.value.manageTagsList.indexOf(tag)
|
||||
if (idx > -1) queryParams.value.manageTagsList.splice(idx, 1)
|
||||
}
|
||||
|
||||
function handlePaste() {
|
||||
nextTick(() => handlePasteSubmit())
|
||||
}
|
||||
|
||||
function handlePasteSubmit() {
|
||||
if (!pasteText.value.trim()) return
|
||||
const separators = /[\s,,\n\r\t]+/
|
||||
const raw = pasteText.value.trim().split(separators).filter(v => v)
|
||||
const exist = new Set(queryParams.value.manageTagsList)
|
||||
const adds = []
|
||||
const dups = []
|
||||
raw.forEach(v => {
|
||||
if (!exist.has(v)) { adds.push(v); exist.add(v) }
|
||||
else dups.push(v)
|
||||
})
|
||||
if (adds.length) {
|
||||
queryParams.value.manageTagsList = [...queryParams.value.manageTagsList, ...adds]
|
||||
proxy.$modal.msgSuccess(`成功添加 ${adds.length} 个耳号${dups.length ? `,已忽略 ${dups.length} 个重复` : ''}`)
|
||||
} else if (dups.length) {
|
||||
proxy.$modal.msgWarning('所有耳号均已存在')
|
||||
}
|
||||
pasteText.value = ''
|
||||
}
|
||||
|
||||
function toggleExpand() {
|
||||
isExpanded.value = !isExpanded.value
|
||||
}
|
||||
|
||||
function handleEarChange(val) {
|
||||
queryParams.value.manageTagsList = [...new Set(val)]
|
||||
}
|
||||
onMounted(() => {
|
||||
getSheepfoldOptions()
|
||||
getVarietyOptions()
|
||||
@@ -488,10 +558,25 @@ onMounted(() => {
|
||||
border-radius: 12px;
|
||||
font-size: 12px;
|
||||
}
|
||||
.selected-ear-numbers{
|
||||
margin-bottom: 16px;
|
||||
padding: 10px;
|
||||
|
||||
.selected-ear-numbers {
|
||||
max-height: 150px;
|
||||
overflow-y: auto;
|
||||
padding: 8px;
|
||||
background: #f5f7fa;
|
||||
border-radius: 4px;
|
||||
border: 1px dashed #dcdfe6;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.selected-ear-numbers::-webkit-scrollbar {
|
||||
width: 6px;
|
||||
}
|
||||
|
||||
.selected-ear-numbers::-webkit-scrollbar-thumb {
|
||||
background-color: #dcdfe6;
|
||||
border-radius: 3px;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user