转场,转群,改耳号,改备注,改品种部分bug修复,字段顺序调整
This commit is contained in:
@@ -6,15 +6,49 @@
|
||||
end-placeholder="结束日期" value-format="YYYY-MM-DD" />
|
||||
</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:300px" @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: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.manageTagsList && 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 && queryParams.manageTagsList.length">
|
||||
清空全部
|
||||
</el-button>
|
||||
</div>
|
||||
<!-- 已选耳号展示区(可折叠) -->
|
||||
<div v-if="queryParams.manageTagsList && 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="newTag">
|
||||
<el-input v-model="queryParams.newTag" placeholder="请输入新耳号" clearable @keyup.enter="handleQuery"
|
||||
@@ -24,9 +58,15 @@
|
||||
<el-input v-model="queryParams.oldTag" placeholder="请输入旧耳号" clearable @keyup.enter="handleQuery"
|
||||
style="max-width: 160px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="羊舍" prop="sheepfoldId">
|
||||
<el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
|
||||
<el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
|
||||
<el-form-item label="技术员" prop="technician">
|
||||
<el-input v-model="queryParams.technician" placeholder="请输入技术员" clearable @keyup.enter="handleQuery"
|
||||
style="max-width: 160px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否在群" prop="inGroup">
|
||||
<el-select v-model="queryParams.inGroup" placeholder="全部" clearable style="width:120px">
|
||||
<el-option label="全部" :value="0" />
|
||||
<el-option label="在群" :value="1" />
|
||||
<el-option label="离群" :value="2" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="耳号类型" prop="earType">
|
||||
@@ -37,16 +77,9 @@
|
||||
</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">
|
||||
<el-button type="primary" plain icon="Plus" @click="handleAdd"
|
||||
@@ -70,8 +103,13 @@
|
||||
<el-table v-loading="loading" :data="changeEarList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="耳号" align="center" prop="manageTags" />
|
||||
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
|
||||
<el-table-column label="品种" align="center" prop="varietyName" />
|
||||
<el-table-column label="事件类型" align="center" prop="eventType" />
|
||||
<el-table-column label="事件日期" align="center" prop="eventDate">
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="耳号类型" align="center" prop="earType">
|
||||
<template #default="scope">
|
||||
{{ scope.row.earType === 0 ? '电子耳号' : '管理耳号' }}
|
||||
@@ -79,19 +117,15 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="新耳号" align="center" prop="newTag" />
|
||||
<el-table-column label="旧耳号" align="center" prop="oldTag" />
|
||||
<el-table-column label="事件日期" align="center" prop="eventDate">
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
|
||||
<el-table-column label="技术员" align="center" prop="technician" />
|
||||
<el-table-column label="备注" align="center" prop="comment" />
|
||||
<el-table-column label="创建人" align="center" prop="createBy" />
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="comment" />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template #default="scope">
|
||||
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
||||
@@ -145,8 +179,11 @@
|
||||
</template>
|
||||
|
||||
<script setup name="ChangeEar">
|
||||
import { listChangeEar, getChangeEar, delChangeEar, addChangeEar, updateChangeEar, getSheepByEarNumber, checkTagExists,searchEarNumbers } from "@/api/produce/manage_sheep/changeEar"
|
||||
import { listChangeEar, getChangeEar, delChangeEar, addChangeEar, updateChangeEar, getSheepByEarNumber, checkTagExists, searchEarNumbers } from "@/api/produce/manage_sheep/changeEar"
|
||||
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
|
||||
import dayjs from 'dayjs'
|
||||
import { nextTick } from 'vue'
|
||||
import { Plus, Delete, ArrowUp, ArrowDown } from '@element-plus/icons-vue'
|
||||
const { proxy } = getCurrentInstance()
|
||||
|
||||
const changeEarList = ref([])
|
||||
@@ -161,7 +198,15 @@ const title = ref("")
|
||||
const daterangeCreateTime = ref([])
|
||||
const isAddMode = ref(true);
|
||||
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: {
|
||||
technician: null,
|
||||
@@ -171,12 +216,14 @@ const data = reactive({
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
manageTags: null,
|
||||
sheepfoldId: null,
|
||||
// sheepfoldId: null,
|
||||
technician: null,
|
||||
earType: null,
|
||||
newTag: null,
|
||||
oldTag: null,
|
||||
createTime: null,
|
||||
earType: null,
|
||||
inGroup: 0
|
||||
},
|
||||
rules: {
|
||||
earNumber: [
|
||||
@@ -188,9 +235,6 @@ const data = reactive({
|
||||
newTag: [
|
||||
{ required: true, message: "请输入新耳号", trigger: "blur" }
|
||||
],
|
||||
oldTag: [
|
||||
{ required: true, message: "请输入旧耳号", trigger: "change" }
|
||||
],
|
||||
technician: [
|
||||
{ required: true, message: "请输入技术员", trigger: "blur" }
|
||||
],
|
||||
@@ -213,9 +257,9 @@ async function getList() {
|
||||
if (queryParams.value.manageTags) {
|
||||
queryParams.value.params["manageTags"] = queryParams.value.manageTags;
|
||||
}
|
||||
if (queryParams.value.sheepfoldId) {
|
||||
queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
|
||||
}
|
||||
// if (queryParams.value.sheepfoldId) {
|
||||
// queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
|
||||
// }
|
||||
if (daterangeCreateTime.value && daterangeCreateTime.value.length > 0) {
|
||||
queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0];
|
||||
queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1];
|
||||
@@ -224,6 +268,9 @@ async function getList() {
|
||||
queryParams.value.params["beginEventDate"] = daterangeEventDate.value[0];
|
||||
queryParams.value.params["endEventDate"] = daterangeEventDate.value[1];
|
||||
}
|
||||
if (queryParams.value.technician) { // ✅ 新增
|
||||
queryParams.value.params["technician"] = queryParams.value.technician
|
||||
}
|
||||
const response = await listChangeEar(queryParams.value);
|
||||
|
||||
changeEarList.value = response.rows.map(item => {
|
||||
@@ -267,13 +314,14 @@ function handleQuery() {
|
||||
function resetQuery() {
|
||||
daterangeCreateTime.value = []
|
||||
daterangeEventDate.value = []
|
||||
queryParams.value.sheepfoldName = null
|
||||
// queryParams.value.sheepfoldName = null
|
||||
queryParams.value.technician = null
|
||||
queryParams.value.manageTags = null
|
||||
queryParams.value.newTag = null
|
||||
queryParams.value.oldTag = null
|
||||
queryParams.value.earType = null
|
||||
queryParams.value.manageTagsList = []
|
||||
|
||||
queryParams.value.inGroup = 0
|
||||
proxy.resetForm("queryRef")
|
||||
|
||||
handleQuery()
|
||||
@@ -289,9 +337,10 @@ function handleSelectionChange(selection) {
|
||||
// 新增按钮操作
|
||||
function handleAdd() {
|
||||
reset()
|
||||
isAddMode.value = true;
|
||||
isAddMode.value = true
|
||||
open.value = true
|
||||
title.value = "添加耳号记录"
|
||||
title.value = '添加耳号记录'
|
||||
form.value.eventDate = dayjs().format('YYYY-MM-DD')
|
||||
}
|
||||
|
||||
// 修改按钮操作
|
||||
@@ -430,9 +479,51 @@ function searchEarNumber(query) {
|
||||
earOptions.value = res.data || []
|
||||
}).finally(() => earLoading.value = false)
|
||||
}
|
||||
/* 粘贴事件 */
|
||||
function handlePaste() {
|
||||
nextTick(() => handlePasteSubmit())
|
||||
}
|
||||
|
||||
/* 批量提交 */
|
||||
function handlePasteSubmit() {
|
||||
if (!pasteText.value || !pasteText.value.trim()) return
|
||||
const separators = /[\p{White_Space},,\n\r\t]+/u
|
||||
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} 个耳号,当前共 ${queryParams.value.manageTagsList.length} 个` +
|
||||
(dups.length > 0 ? `,已忽略 ${dups.length} 个重复耳号` : ''))
|
||||
} else if (dups.length > 0) {
|
||||
proxy.$modal.msgWarning('所有耳号均已存在')
|
||||
}
|
||||
pasteText.value = ''
|
||||
}
|
||||
|
||||
/* 切换展开/收起 */
|
||||
function toggleExpand() {
|
||||
isExpanded.value = !isExpanded.value
|
||||
}
|
||||
|
||||
/* 选择器变化时去重 */
|
||||
function handleEarChange(val) {
|
||||
queryParams.value.manageTagsList = [...new Set(val)]
|
||||
}
|
||||
|
||||
/* 一键清空 */
|
||||
function clearEarNumbers() {
|
||||
queryParams.value.manageTagsList = []
|
||||
pasteText.value = ''
|
||||
isExpanded.value = false
|
||||
}
|
||||
|
||||
/* 删除单个耳号 */
|
||||
function removeEarNumber(tag) {
|
||||
const idx = queryParams.value.manageTagsList.indexOf(tag)
|
||||
if (idx > -1) queryParams.value.manageTagsList.splice(idx, 1)
|
||||
@@ -444,7 +535,7 @@ onMounted(() => {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.selected-ear-numbers{
|
||||
.selected-ear-numbers {
|
||||
margin-bottom: 16px;
|
||||
padding: 10px;
|
||||
background: #f5f7fa;
|
||||
|
||||
Reference in New Issue
Block a user