Merge remote-tracking branch 'origin/main'
This commit is contained in:
zyk
10
src/api/common/sheep.js
Normal file
10
src/api/common/sheep.js
Normal file
@@ -0,0 +1,10 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 模糊查询母羊耳号列表
|
||||
export function searchEarNumbers(query) {
|
||||
return request({
|
||||
url: '/sheep/sheep/earNumbers',
|
||||
method: 'get',
|
||||
params: { query }
|
||||
})
|
||||
}
|
||||
10
src/api/common/user.js
Normal file
10
src/api/common/user.js
Normal file
@@ -0,0 +1,10 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 根据岗位查询用户信息
|
||||
export function getUserByPost(query) {
|
||||
return request({
|
||||
url: '/userPost/getUser',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
@@ -2,15 +2,81 @@
|
||||
<div class="app-container">
|
||||
<!-- 1. 搜索 -->
|
||||
<el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="羊只耳号" prop="sheepNo">
|
||||
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
|
||||
<el-form-item 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="sheepNo">
|
||||
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
|
||||
</el-form-item> -->
|
||||
<el-form-item label="驱虫日期">
|
||||
<el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期" />
|
||||
</el-form-item>
|
||||
<el-form-item label="技术员" prop="technical">
|
||||
<el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
|
||||
<el-select v-model="queryParams.technical" 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>
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
@@ -106,7 +172,12 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="技术员">
|
||||
<el-input v-model="addForm.technical" placeholder="请输入技术员姓名" />
|
||||
<el-select v-model="addForm.technical" 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-col>
|
||||
</el-row>
|
||||
@@ -210,7 +281,12 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="技术员">
|
||||
<el-input v-model="editForm.technical" placeholder="请输入技术员姓名" />
|
||||
<el-select v-model="editForm.technical" 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-col>
|
||||
</el-row>
|
||||
@@ -261,8 +337,6 @@
|
||||
</el-table>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<el-form-item label="备注">
|
||||
<el-input type="textarea" :rows="3" v-model="editForm.comment" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
@@ -283,8 +357,10 @@
|
||||
import { listUnit } from '@/api/biosafety/unit'
|
||||
import { listUsage } from '@/api/biosafety/usage'
|
||||
import { listMedicine } from '@/api/biosafety/medicine'
|
||||
import { searchEarNumbers } from '@/api/common/sheep'
|
||||
import request from '@/utils/request'
|
||||
import { parseTime } from '@/utils/ruoyi'
|
||||
import { getUserByPost } from '@/api/common/user'
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
const { sheep_gender } = proxy.useDict('sheep_gender')
|
||||
@@ -295,16 +371,159 @@
|
||||
const total = ref(0)
|
||||
const dewormList = ref([])
|
||||
const daterangeDatetime = ref([])
|
||||
const technicalOptions = ref([])
|
||||
|
||||
|
||||
const queryParams = reactive({
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
sheepNo: null,
|
||||
technical: null,
|
||||
|
||||
orderByColumn: null, // 新增
|
||||
isAsc: null // 新增
|
||||
})
|
||||
|
||||
// 响应式数据
|
||||
const pasteInput = ref('') // 批量粘贴输入框
|
||||
const earNumberOptions = ref([]) // 耳号下拉选项
|
||||
const earNumberLoading = ref(false) // 耳号加载状态
|
||||
const isExpanded = ref(false) // 控制耳号展开/折叠状态
|
||||
const defaultShowCount = 2 // 默认显示的耳号数量
|
||||
|
||||
// 计算属性：控制显示的耳号列表
|
||||
const displayedEarNumbers = computed(() => {
|
||||
if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
|
||||
return []
|
||||
}
|
||||
|
||||
// 如果展开或总数<=2，显示全部；否则只显示前2个
|
||||
if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
|
||||
return queryParams.allEarNumbers
|
||||
} else {
|
||||
return queryParams.allEarNumbers.slice(0, defaultShowCount)
|
||||
}
|
||||
})
|
||||
/** 处理粘贴事件 */
|
||||
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(() => { })
|
||||
}
|
||||
|
||||
const ids = ref([])
|
||||
const single = ref(true)
|
||||
const multiple = ref(true)
|
||||
@@ -528,6 +747,27 @@
|
||||
function handleAddDetail() {
|
||||
usageDetails.value.push({ mediId: null, dosage: 0, unit: null, usageId: null,manufacturer:null,batchNumber:null })
|
||||
}
|
||||
// 获取技术员列表
|
||||
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(() => {
|
||||
@@ -546,5 +786,49 @@
|
||||
listMedicine().then(res => {
|
||||
medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
|
||||
})
|
||||
fetchTechnicalList()
|
||||
|
||||
})
|
||||
</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>
|
||||
|
||||
@@ -2,9 +2,72 @@
|
||||
<div class="app-container">
|
||||
<!-- 查询区域 -->
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
|
||||
<el-form-item label="羊只" prop="sheepId">
|
||||
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable />
|
||||
|
||||
<el-form-item 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="sheepId">
|
||||
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable />
|
||||
</el-form-item> -->
|
||||
<el-form-item label="事件日期" style="width: 308px">
|
||||
<el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期" />
|
||||
@@ -210,6 +273,34 @@ import {
|
||||
import { listSheepfold_management } from '@/api/fileManagement/sheepfold_management'
|
||||
import { listDisease } from '@/api/biosafety/disease'
|
||||
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
|
||||
import { searchEarNumbers } from '@/api/common/sheep'
|
||||
import { getUserByPost } from '@/api/common/user'
|
||||
|
||||
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 || '获取技术员列表失败')
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* ---------- 基础依赖 ---------- */
|
||||
const { proxy } = getCurrentInstance()
|
||||
@@ -230,6 +321,7 @@ const queryParams = ref({
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
sheepNo: null,
|
||||
allEarNumbers: null,
|
||||
datetime: null,
|
||||
diseasePid: null,
|
||||
diseaseId: null,
|
||||
@@ -273,6 +365,146 @@ const rules = {
|
||||
],
|
||||
}
|
||||
|
||||
// 响应式数据
|
||||
const pasteInput = ref('') // 批量粘贴输入框
|
||||
const earNumberOptions = ref([]) // 耳号下拉选项
|
||||
const earNumberLoading = ref(false) // 耳号加载状态
|
||||
const isExpanded = ref(false) // 控制耳号展开/折叠状态
|
||||
const defaultShowCount = 2 // 默认显示的耳号数量
|
||||
|
||||
// 计算属性：控制显示的耳号列表
|
||||
const displayedEarNumbers = computed(() => {
|
||||
if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
|
||||
return []
|
||||
}
|
||||
|
||||
// 如果展开或总数<=2，显示全部；否则只显示前2个
|
||||
if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
|
||||
return queryParams.allEarNumbers
|
||||
} else {
|
||||
return queryParams.allEarNumbers.slice(0, defaultShowCount)
|
||||
}
|
||||
})
|
||||
/** 处理粘贴事件 */
|
||||
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(() => { })
|
||||
}
|
||||
|
||||
/* ---------- 下拉数据源 ---------- */
|
||||
const pDiseaseOptions = ref([])
|
||||
const cDiseaseOptions = ref([])
|
||||
@@ -449,5 +681,49 @@ onMounted(() => {
|
||||
label: i.sheepfoldName,
|
||||
}))
|
||||
})
|
||||
fetchTechnicalList() // 获取技术员列表
|
||||
})
|
||||
</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>
|
||||
|
||||
@@ -18,7 +18,14 @@
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="技术员" prop="technician">
|
||||
<el-input v-model="queryParams.technician" placeholder="请输入技术员" clearable />
|
||||
<el-form-item label="技术员">
|
||||
<el-select v-model="queryParams.technical" 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>
|
||||
<el-form-item label="消毒方式" prop="way">
|
||||
<el-select v-model="queryParams.way" clearable placeholder="请选择消毒方式" filterable style="width: 200px">
|
||||
@@ -101,7 +108,14 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="技术员" prop="technician">
|
||||
<el-input v-model="form.technician" placeholder="请输入技术员姓名" />
|
||||
<el-form-item label="技术员">
|
||||
<el-select v-model="form.technical" 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>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -199,7 +213,14 @@
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="技术员">
|
||||
<el-input v-model="editForm.technician" placeholder="请输入技术员姓名" />
|
||||
<el-form-item label="技术员">
|
||||
<el-select v-model="editForm.technical" 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>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -289,6 +310,33 @@ import { listMedicine } from '@/api/biosafety/medicine'
|
||||
import request from '@/utils/request'
|
||||
import { parseTime } from '@/utils/ruoyi'
|
||||
|
||||
import { getUserByPost } from '@/api/common/user'
|
||||
|
||||
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 || '获取技术员列表失败')
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
const { disinfect_type } = proxy.useDict('disinfect_type')
|
||||
|
||||
@@ -538,5 +586,6 @@ onMounted(() => {
|
||||
listMedicine().then(res => {
|
||||
medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
|
||||
})
|
||||
fetchTechnicalList() // 获取技术员列表
|
||||
})
|
||||
</script>
|
||||
@@ -2,16 +2,84 @@
|
||||
<div class="app-container">
|
||||
<!-- 1. 搜索 -->
|
||||
<el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="羊只耳号" prop="sheepNo">
|
||||
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
|
||||
|
||||
<el-form-item 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="sheepNo">
|
||||
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
|
||||
</el-form-item> -->
|
||||
<el-form-item label="保健日期">
|
||||
<el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="技术员" prop="technical">
|
||||
<el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
|
||||
<el-select v-model="queryParams.technical" 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>
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
@@ -109,7 +177,14 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="技术员">
|
||||
<el-input v-model="addForm.technical" placeholder="请输入技术员姓名" />
|
||||
<el-form-item label="技术员">
|
||||
<el-select v-model="addForm.technical" 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>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -213,7 +288,12 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="技术员">
|
||||
<el-input v-model="editForm.technical" placeholder="请输入技术员姓名" />
|
||||
<el-select v-model="editForm.technical" 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-col>
|
||||
</el-row>
|
||||
@@ -288,6 +368,33 @@ import { listUsage } from '@/api/biosafety/usage'
|
||||
import { listMedicine } from '@/api/biosafety/medicine'
|
||||
import request from '@/utils/request'
|
||||
import { parseTime } from '@/utils/ruoyi'
|
||||
import { searchEarNumbers } from '@/api/common/sheep'
|
||||
import { getUserByPost } from '@/api/common/user'
|
||||
|
||||
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 || '获取技术员列表失败')
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
const { sheep_gender } = proxy.useDict('sheep_gender')
|
||||
@@ -303,11 +410,152 @@ const queryParams = reactive({
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
sheepNo: null,
|
||||
allEarNumbers: [], // 修改：改为数组，支持多耳号
|
||||
technical: null,
|
||||
orderByColumn: null, // 新增
|
||||
isAsc: null // 新增
|
||||
})
|
||||
|
||||
// 响应式数据
|
||||
const pasteInput = ref('') // 批量粘贴输入框
|
||||
const earNumberOptions = ref([]) // 耳号下拉选项
|
||||
const earNumberLoading = ref(false) // 耳号加载状态
|
||||
const isExpanded = ref(false) // 控制耳号展开/折叠状态
|
||||
const defaultShowCount = 2 // 默认显示的耳号数量
|
||||
|
||||
// 计算属性：控制显示的耳号列表
|
||||
const displayedEarNumbers = computed(() => {
|
||||
if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
|
||||
return []
|
||||
}
|
||||
|
||||
// 如果展开或总数<=2，显示全部；否则只显示前2个
|
||||
if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
|
||||
return queryParams.allEarNumbers
|
||||
} else {
|
||||
return queryParams.allEarNumbers.slice(0, defaultShowCount)
|
||||
}
|
||||
})
|
||||
/** 处理粘贴事件 */
|
||||
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(() => { })
|
||||
}
|
||||
|
||||
const ids = ref([])
|
||||
const single = ref(true)
|
||||
const multiple = ref(true)
|
||||
@@ -549,5 +797,48 @@ onMounted(() => {
|
||||
listMedicine().then(res => {
|
||||
medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
|
||||
})
|
||||
fetchTechnicalList() // 获取技术员列表
|
||||
})
|
||||
</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>
|
||||
|
||||
@@ -2,15 +2,82 @@
|
||||
<div class="app-container">
|
||||
<!-- 1. 搜索 -->
|
||||
<el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
|
||||
<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="免疫日期">
|
||||
<el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期" />
|
||||
</el-form-item>
|
||||
<el-form-item label="羊只耳号" prop="sheepNo">
|
||||
<!-- <el-form-item label="羊只耳号" prop="sheepNo">
|
||||
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="技术员" prop="technical">
|
||||
<el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
|
||||
<el-select v-model="queryParams.technical" 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>
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
@@ -107,7 +174,14 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="技术员">
|
||||
<el-input v-model="addForm.technical" placeholder="请输入技术员姓名" />
|
||||
<el-form-item label="技术员">
|
||||
<el-select v-model="addForm.technical" 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>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -211,7 +285,12 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="技术员">
|
||||
<el-input v-model="editForm.technical" placeholder="请输入技术员姓名" />
|
||||
<el-select v-model="editForm.technical" 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-col>
|
||||
</el-row>
|
||||
@@ -286,6 +365,32 @@ import { listUsage } from '@/api/biosafety/usage'
|
||||
import { listMedicine } from '@/api/biosafety/medicine'
|
||||
import request from '@/utils/request'
|
||||
import { parseTime } from '@/utils/ruoyi'
|
||||
import { searchEarNumbers } from '@/api/common/sheep'
|
||||
import { getUserByPost } from '@/api/common/user'
|
||||
|
||||
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 || '获取技术员列表失败')
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
const { sheep_gender } = proxy.useDict('sheep_gender')
|
||||
@@ -301,11 +406,153 @@ const queryParams = reactive({
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
sheepNo: null,
|
||||
allEarNumbers: [], // 修改：改为数组，支持多耳号
|
||||
technical: null,
|
||||
orderByColumn: null, // 新增
|
||||
isAsc: null // 新增
|
||||
})
|
||||
|
||||
// 响应式数据
|
||||
const pasteInput = ref('') // 批量粘贴输入框
|
||||
const earNumberOptions = ref([]) // 耳号下拉选项
|
||||
const earNumberLoading = ref(false) // 耳号加载状态
|
||||
const isExpanded = ref(false) // 控制耳号展开/折叠状态
|
||||
const defaultShowCount = 2 // 默认显示的耳号数量
|
||||
|
||||
// 计算属性：控制显示的耳号列表
|
||||
const displayedEarNumbers = computed(() => {
|
||||
if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
|
||||
return []
|
||||
}
|
||||
|
||||
// 如果展开或总数<=2，显示全部；否则只显示前2个
|
||||
if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
|
||||
return queryParams.allEarNumbers
|
||||
} else {
|
||||
return queryParams.allEarNumbers.slice(0, defaultShowCount)
|
||||
}
|
||||
})
|
||||
/** 处理粘贴事件 */
|
||||
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(() => { })
|
||||
}
|
||||
|
||||
|
||||
const ids = ref([])
|
||||
const single = ref(true)
|
||||
const multiple = ref(true)
|
||||
@@ -547,5 +794,49 @@ onMounted(() => {
|
||||
listMedicine().then(res => {
|
||||
medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
|
||||
})
|
||||
fetchTechnicalList() // 获取技术员列表
|
||||
})
|
||||
</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>
|
||||
|
||||
@@ -2,9 +2,71 @@
|
||||
<div class="app-container">
|
||||
<!-- 查询表单 -->
|
||||
<el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="羊只耳号" prop="sheepNo">
|
||||
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
|
||||
<el-form-item 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="sheepNo">
|
||||
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
|
||||
</el-form-item> -->
|
||||
<el-form-item label="检疫日期">
|
||||
<el-date-picker v-model="daterangeDatetime" type="daterange" range-separator="-" start-placeholder="开始日期"
|
||||
end-placeholder="结束日期" value-format="YYYY-MM-DD" />
|
||||
@@ -17,11 +79,21 @@
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="采样员" prop="sampler">
|
||||
<el-input v-model="queryParams.sampler" placeholder="请输入采样员名字" clearable @keyup.enter="getList" />
|
||||
<el-select v-model="queryParams.sampler" 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="quarOfficer">
|
||||
<el-input v-model="queryParams.quarOfficer" placeholder="请输入检疫员名字" clearable @keyup.enter="getList" />
|
||||
<el-select v-model="queryParams.quarOfficer" 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>
|
||||
|
||||
|
||||
@@ -163,12 +235,22 @@
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="采样员" prop="sampler">
|
||||
<el-input v-model="addForm.sampler" />
|
||||
<el-select v-model="addForm.sampler" 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-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="检疫员" prop="quarOfficer">
|
||||
<el-input v-model="addForm.quarOfficer" />
|
||||
<el-select v-model="addForm.quarOfficer" 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-col>
|
||||
</el-row>
|
||||
@@ -254,13 +336,23 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="采样员">
|
||||
<el-input v-model="editForm.sampler" />
|
||||
<el-select v-model="editForm.sampleOfficer" 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-col>
|
||||
|
||||
<el-col :span="12">
|
||||
<el-form-item label="检疫员">
|
||||
<el-input v-model="editForm.quarOfficer" />
|
||||
<el-select v-model="editForm.quarOfficer" 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-col>
|
||||
<el-col :span="12">
|
||||
@@ -300,6 +392,8 @@ import { listSample } from '@/api/biosafety/sample'
|
||||
import request from '@/utils/request'
|
||||
import { parseTime } from '@/utils/ruoyi'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { searchEarNumbers } from '@/api/common/sheep'
|
||||
import { getUserByPost } from '@/api/common/user'
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
const { quar_result, quar_status, sheep_gender } = proxy.useDict(
|
||||
@@ -309,6 +403,33 @@ const { quar_result, quar_status, sheep_gender } = proxy.useDict(
|
||||
)
|
||||
const router = useRouter()
|
||||
|
||||
|
||||
|
||||
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 || '获取技术员列表失败')
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* 基础数据 */
|
||||
const loading = ref(true)
|
||||
const showSearch = ref(true)
|
||||
@@ -321,10 +442,152 @@ const queryParams = reactive({
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
sheepId: null,
|
||||
allEarNumbers: [], // 修改：改为数组，支持多耳号
|
||||
orderByColumn: null, // 新增
|
||||
isAsc: null // 新增
|
||||
})
|
||||
|
||||
|
||||
// 响应式数据
|
||||
const pasteInput = ref('') // 批量粘贴输入框
|
||||
const earNumberOptions = ref([]) // 耳号下拉选项
|
||||
const earNumberLoading = ref(false) // 耳号加载状态
|
||||
const isExpanded = ref(false) // 控制耳号展开/折叠状态
|
||||
const defaultShowCount = 2 // 默认显示的耳号数量
|
||||
|
||||
// 计算属性：控制显示的耳号列表
|
||||
const displayedEarNumbers = computed(() => {
|
||||
if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
|
||||
return []
|
||||
}
|
||||
|
||||
// 如果展开或总数<=2，显示全部；否则只显示前2个
|
||||
if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
|
||||
return queryParams.allEarNumbers
|
||||
} else {
|
||||
return queryParams.allEarNumbers.slice(0, defaultShowCount)
|
||||
}
|
||||
})
|
||||
/** 处理粘贴事件 */
|
||||
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(() => { })
|
||||
}
|
||||
|
||||
/* 多选 */
|
||||
const ids = ref([])
|
||||
const single = ref(true)
|
||||
@@ -569,4 +832,48 @@ getItems()
|
||||
getSample()
|
||||
getBarns()
|
||||
getSheepType()
|
||||
getTechnicalList()
|
||||
</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>
|
||||
|
||||
@@ -2,9 +2,71 @@
|
||||
<div class="app-container">
|
||||
<!-- 搜索栏 -->
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="羊只耳号" prop="sheepNo">
|
||||
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
|
||||
<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="sheepNo">
|
||||
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
|
||||
</el-form-item> -->
|
||||
<el-form-item label="治疗日期" style="width: 308px">
|
||||
<el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期" />
|
||||
@@ -16,7 +78,12 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="兽医" prop="veterinary">
|
||||
<el-input v-model="queryParams.veterinary" placeholder="请输入兽医" clearable />
|
||||
<el-select v-model="editForm.veterinary" 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>
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
@@ -201,7 +268,12 @@
|
||||
<el-row :gutter="20" style="margin-top:20px;">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="兽医">
|
||||
<el-input v-model="addForm.veterinarian" placeholder="请输入兽医姓名" />
|
||||
<el-select v-model="addForm.veterinarian" 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-col>
|
||||
<el-col :span="12">
|
||||
@@ -380,6 +452,12 @@
|
||||
<el-col :span="12">
|
||||
<el-form-item label="兽医">
|
||||
<el-input v-model="editForm.veterinarian" placeholder="请输入兽医姓名" />
|
||||
<el-select v-model="editForm.veterinarian" 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-col>
|
||||
<el-col :span="12">
|
||||
@@ -445,6 +523,32 @@ import { listUsage } from '@/api/biosafety/usage'
|
||||
import { listMedicine } from '@/api/biosafety/medicine'
|
||||
import request from '@/utils/request'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { searchEarNumbers } from '@/api/common/sheep'
|
||||
import { getUserByPost } from '@/api/common/user'
|
||||
|
||||
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 || '获取技术员列表失败')
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
const router = useRouter()
|
||||
|
||||
@@ -467,11 +571,153 @@ const queryParams = reactive({
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
sheepNo: null,
|
||||
allEarNumbers: [],
|
||||
veterinary: null,
|
||||
orderByColumn: null, // 新增
|
||||
isAsc: null
|
||||
})
|
||||
|
||||
// 响应式数据
|
||||
const pasteInput = ref('') // 批量粘贴输入框
|
||||
const earNumberOptions = ref([]) // 耳号下拉选项
|
||||
const earNumberLoading = ref(false) // 耳号加载状态
|
||||
const isExpanded = ref(false) // 控制耳号展开/折叠状态
|
||||
const defaultShowCount = 2 // 默认显示的耳号数量
|
||||
|
||||
// 计算属性：控制显示的耳号列表
|
||||
const displayedEarNumbers = computed(() => {
|
||||
if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
|
||||
return []
|
||||
}
|
||||
|
||||
// 如果展开或总数<=2，显示全部；否则只显示前2个
|
||||
if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
|
||||
return queryParams.allEarNumbers
|
||||
} else {
|
||||
return queryParams.allEarNumbers.slice(0, defaultShowCount)
|
||||
}
|
||||
})
|
||||
/** 处理粘贴事件 */
|
||||
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(() => { })
|
||||
}
|
||||
|
||||
|
||||
/* ---------- 弹窗控制 ---------- */
|
||||
const addDialog = ref(false)
|
||||
const editDialog = ref(false)
|
||||
@@ -802,5 +1048,50 @@ onMounted(() => {
|
||||
listSheepfold_management().then(res => {
|
||||
sheepfolds.value = res.rows.map(item => ({ id: item.id, name: item.sheepfoldName }))
|
||||
})
|
||||
fetchTechnicalList() // 获取技术员列表
|
||||
})
|
||||
|
||||
</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>
|
||||
|
||||
@@ -2,9 +2,72 @@
|
||||
<div class="app-container">
|
||||
<!-- 搜索表单 -->
|
||||
<el-form ref="queryRef" :model="queryParams" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="羊只耳号" prop="sheepNo">
|
||||
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
|
||||
|
||||
<el-form-item 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="sheepNo">
|
||||
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
|
||||
</el-form-item> -->
|
||||
<!-- 使用日期（新增） -->
|
||||
<el-form-item label="使用日期" style="width: 308px">
|
||||
<el-date-picker v-model="daterangeUseTime" type="daterange" range-separator="-" start-placeholder="开始日期"
|
||||
@@ -142,6 +205,7 @@ import { listUsageInfo, getUsageInfo } from '@/api/biosafety/usageInfo'
|
||||
import { listUnit } from '@/api/biosafety/unit'
|
||||
import { listUsage } from '@/api/biosafety/usage'
|
||||
import { getCurrentInstance, reactive, ref, toRefs } from 'vue'
|
||||
import { searchEarNumbers } from '@/api/common/sheep'
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
const { pres_type } = proxy.useDict('pres_type')
|
||||
@@ -161,12 +225,156 @@ const data = reactive({
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
allEarNumbers: [],
|
||||
name: null,
|
||||
useType: null,
|
||||
createTime: null
|
||||
},
|
||||
rules: {}
|
||||
})
|
||||
|
||||
// 响应式数据
|
||||
const pasteInput = ref('') // 批量粘贴输入框
|
||||
const earNumberOptions = ref([]) // 耳号下拉选项
|
||||
const earNumberLoading = ref(false) // 耳号加载状态
|
||||
const isExpanded = ref(false) // 控制耳号展开/折叠状态
|
||||
const defaultShowCount = 2 // 默认显示的耳号数量
|
||||
|
||||
// 计算属性：控制显示的耳号列表
|
||||
const displayedEarNumbers = computed(() => {
|
||||
if (!queryParams.allEarNumbers || queryParams.allEarNumbers.length === 0) {
|
||||
return []
|
||||
}
|
||||
|
||||
// 如果展开或总数<=2，显示全部；否则只显示前2个
|
||||
if (isExpanded.value || queryParams.allEarNumbers.length <= defaultShowCount) {
|
||||
return queryParams.allEarNumbers
|
||||
} else {
|
||||
return queryParams.allEarNumbers.slice(0, defaultShowCount)
|
||||
}
|
||||
})
|
||||
/** 处理粘贴事件 */
|
||||
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(() => { })
|
||||
}
|
||||
|
||||
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data)
|
||||
|
||||
const units = ref([])
|
||||
@@ -294,3 +502,45 @@ getUsageOptions()
|
||||
margin-right: 6px;
|
||||
}
|
||||
</style>
|
||||
<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>
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -282,8 +282,8 @@
|
||||
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 { fa } from "element-plus/es/locales.mjs"
|
||||
import { listMaterial } from "@/api/feed/Material"
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
const { pres_status } = proxy.useDict('pres_status')
|
||||
// Data and refs
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -334,21 +334,6 @@
|
||||
<span>{{ parseTime(scope.row.weaningDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="columns['statusId'].visible"
|
||||
label="羊只状态"
|
||||
align="center"
|
||||
prop="statusId"
|
||||
width="120"
|
||||
sortable
|
||||
>
|
||||
<template #header>
|
||||
<span style="font-weight: bold; color: #333;">羊只状态</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<dict-tag :options="sheep_status" :value="scope.row.statusId"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="columns['weaningWeight'].visible"
|
||||
label="断奶体重"
|
||||
@@ -491,18 +476,6 @@
|
||||
<span style="font-weight: bold; color: #333;">受体id</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column
|
||||
v-if="columns['receptorManageTags'].visible"
|
||||
label="受体耳号"
|
||||
align="center"
|
||||
prop="receptorManageTags"
|
||||
width="120"
|
||||
sortable
|
||||
>
|
||||
<template #header>
|
||||
<span style="font-weight: bold; color: #333;">受体耳号</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column
|
||||
v-if="columns['fatherFatherId'].visible"
|
||||
label="祖父号id"
|
||||
@@ -599,6 +572,18 @@
|
||||
<span style="font-weight: bold; color: #333;">外祖母耳号</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="columns['receptorManageTags'].visible"
|
||||
label="受体耳号"
|
||||
align="center"
|
||||
prop="receptorManageTags"
|
||||
width="120"
|
||||
sortable
|
||||
>
|
||||
<template #header>
|
||||
<span style="font-weight: bold; color: #333;">受体耳号</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="columns['matingDate'].visible"
|
||||
label="配种日期"
|
||||
@@ -608,7 +593,7 @@
|
||||
sortable
|
||||
>
|
||||
<template #header>
|
||||
<span style="font-weight: bold; color: #333;">配种日期</span>
|
||||
<span style="font-weight: bold; color: #333;">最近配种日期</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.matingDate, '{y}-{m}-{d}') }}</span>
|
||||
@@ -623,7 +608,7 @@
|
||||
sortable
|
||||
>
|
||||
<template #header>
|
||||
<span style="font-weight: bold; color: #333;">配种类型</span>
|
||||
<span style="font-weight: bold; color: #333;">最近配种类型</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<dict-tag :options="breed_type" :value="scope.row.matingTypeId"/>
|
||||
@@ -638,7 +623,7 @@
|
||||
sortable
|
||||
>
|
||||
<template #header>
|
||||
<span style="font-weight: bold; color: #333;">孕检日期</span>
|
||||
<span style="font-weight: bold; color: #333;">最近孕检日期</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.pregDate, '{y}-{m}-{d}') }}</span>
|
||||
@@ -653,7 +638,7 @@
|
||||
sortable
|
||||
>
|
||||
<template #header>
|
||||
<span style="font-weight: bold; color: #333;">产羔日期</span>
|
||||
<span style="font-weight: bold; color: #333;">最近产羔日期</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.lambingDate, '{y}-{m}-{d}') }}</span>
|
||||
@@ -894,7 +879,7 @@
|
||||
<span style="font-weight: bold; color: #333;">来源牧场</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
<!-- <el-table-column
|
||||
v-if="columns['updateBy'].visible"
|
||||
label="修改人"
|
||||
align="center"
|
||||
@@ -947,6 +932,21 @@
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column
|
||||
v-if="columns['statusId'].visible"
|
||||
label="羊只状态"
|
||||
align="center"
|
||||
prop="statusId"
|
||||
width="120"
|
||||
sortable
|
||||
>
|
||||
<template #header>
|
||||
<span style="font-weight: bold; color: #333;">羊只状态</span>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<dict-tag :options="sheep_status" :value="scope.row.statusId"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column
|
||||
label="操作"
|
||||
@@ -995,7 +995,6 @@
|
||||
<el-checkbox label="parity">胎次</el-checkbox>
|
||||
<el-checkbox label="birthWeight">出生体重</el-checkbox>
|
||||
<el-checkbox label="weaningDate">断奶日期</el-checkbox>
|
||||
<el-checkbox label="statusId">羊只状态</el-checkbox>
|
||||
<el-checkbox label="weaningWeight">断奶体重</el-checkbox>
|
||||
<el-checkbox label="currentWeight">当前体重</el-checkbox>\
|
||||
<el-checkbox label="weaningDayAge">断奶日龄</el-checkbox>
|
||||
@@ -1007,7 +1006,6 @@
|
||||
<!-- <el-checkbox label="bsMotherId">母号id</el-checkbox> -->
|
||||
<el-checkbox label="motherManageTags">母亲耳号</el-checkbox>
|
||||
<!-- <el-checkbox label="receptorId">受体id</el-checkbox> -->
|
||||
<el-checkbox label="receptorManageTags">受体耳号</el-checkbox>
|
||||
<!-- <el-checkbox label="fatherFatherId">祖父号id</el-checkbox> -->
|
||||
<el-checkbox label="grandfatherManageTags">祖父耳号</el-checkbox>
|
||||
<!-- <el-checkbox label="fatherMotherId">祖母号id</el-checkbox> -->
|
||||
@@ -1016,6 +1014,7 @@
|
||||
<el-checkbox label="maternalGrandfatherManageTags">外祖父耳号</el-checkbox>
|
||||
<!-- <el-checkbox label="motherId">外祖母号id</el-checkbox> -->
|
||||
<el-checkbox label="maternalGrandmotherManageTags">外祖母耳号</el-checkbox>
|
||||
<el-checkbox label="receptorManageTags">受体耳号</el-checkbox>
|
||||
<el-checkbox label="matingDate">配种日期</el-checkbox>
|
||||
<el-checkbox label="matingTypeId">配种类型</el-checkbox>
|
||||
<el-checkbox label="pregDate">孕检日期</el-checkbox>
|
||||
@@ -1038,10 +1037,11 @@
|
||||
<el-checkbox label="sourceDate">入群日期</el-checkbox>
|
||||
<!-- <el-checkbox label="sourceRanchId">来源牧场id</el-checkbox> -->
|
||||
<el-checkbox label="sourceRanch">来源牧场</el-checkbox>
|
||||
<el-checkbox label="updateBy">修改人</el-checkbox>
|
||||
<!-- <el-checkbox label="updateBy">修改人</el-checkbox>
|
||||
<el-checkbox label="updateTime">修改日期</el-checkbox>
|
||||
<el-checkbox label="createBy">创建人</el-checkbox>
|
||||
<el-checkbox label="createTime">创建日期</el-checkbox>
|
||||
<el-checkbox label="createTime">创建日期</el-checkbox> -->
|
||||
<el-checkbox label="statusId">羊只状态</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</div>
|
||||
<div style="margin-top: 20px; display: flex; justify-content: space-between; align-items: center;">
|
||||
@@ -1085,8 +1085,36 @@ const multiple = ref(true)
|
||||
const total = ref(0)
|
||||
const title = ref("")
|
||||
const columnDialogVisible = ref(false)
|
||||
// const selectedColumns = ref([
|
||||
// 'id', 'bsManageTags', 'ranchId', 'drRanch', 'sheepfoldId', 'sheepfoldName', 'electronicTags', 'varietyId', 'variety', 'family', 'name', 'gender', 'birthday', 'dayAge', 'monthAge', 'parity', 'birthWeight', 'weaningDate', 'statusId', 'weaningWeight', 'currentWeight','weaningDayAge', 'weaningDailyGain','breedStatusId', 'breed', 'bsFatherId', 'fatherManageTags', 'bsMotherId', 'motherManageTags', 'receptorId', 'receptorManageTags', 'fatherFatherId', 'grandfatherManageTags', 'fatherMotherId', 'grandmotherManageTags', 'fatherId', 'maternalGrandfatherManageTags', 'motherId', 'maternalGrandmotherManageTags', 'matingDate', 'matingTypeId', 'pregDate', 'lambingDate', 'lambingDay', 'matingDay', 'gestationDay', 'expectedDate', 'postLambingDay', 'lactationDay', 'anestrousDay', 'matingCounts', 'matingTotal', 'miscarriageCounts', 'comment', 'controlled', 'body', 'breast', 'source', 'sourceDate', 'sourceRanchId', 'sourceRanch', 'updateBy', 'updateTime', 'createBy', 'createTime'
|
||||
// ])
|
||||
|
||||
// 在 setup 中修改 selectedColumns 的默认值
|
||||
const selectedColumns = ref([
|
||||
'id', 'bsManageTags', 'ranchId', 'drRanch', 'sheepfoldId', 'sheepfoldName', 'electronicTags', 'varietyId', 'variety', 'family', 'name', 'gender', 'birthday', 'dayAge', 'monthAge', 'parity', 'birthWeight', 'weaningDate', 'statusId', 'weaningWeight', 'currentWeight','weaningDayAge', 'weaningDailyGain','breedStatusId', 'breed', 'bsFatherId', 'fatherManageTags', 'bsMotherId', 'motherManageTags', 'receptorId', 'receptorManageTags', 'fatherFatherId', 'grandfatherManageTags', 'fatherMotherId', 'grandmotherManageTags', 'fatherId', 'maternalGrandfatherManageTags', 'motherId', 'maternalGrandmotherManageTags', 'matingDate', 'matingTypeId', 'pregDate', 'lambingDate', 'lambingDay', 'matingDay', 'gestationDay', 'expectedDate', 'postLambingDay', 'lactationDay', 'anestrousDay', 'matingCounts', 'matingTotal', 'miscarriageCounts', 'comment', 'controlled', 'body', 'breast', 'source', 'sourceDate', 'sourceRanchId', 'sourceRanch', 'updateBy', 'updateTime', 'createBy', 'createTime'
|
||||
'bsManageTags', // 耳号
|
||||
'drRanch', // 牧场名称
|
||||
'sheepfoldName', // 羊舍名称
|
||||
'electronicTags', // 电子耳号
|
||||
'variety', // 品种
|
||||
'family', //家系
|
||||
'name', // 羊只类型
|
||||
'gender', // 性别
|
||||
'birthday', // 出生日期
|
||||
'dayAge', // 日龄
|
||||
'monthAge', //月龄
|
||||
'parity', //胎次
|
||||
'birthWeight', //出生体重
|
||||
'weaningDate', //断奶日期
|
||||
'weaningWeight',//断奶体重
|
||||
'currentWeight', // 当前体重
|
||||
'breed', // 繁殖状态
|
||||
'fatherManageTags', // 父亲耳号
|
||||
'motherManageTags', // 母亲耳号
|
||||
'grandfatherManageTags',//祖父
|
||||
'grandmotherManageTags',//祖母
|
||||
'maternalGrandfatherManageTags',//外祖父
|
||||
'maternalGrandmotherManageTags',//外祖母
|
||||
'comment'//备注
|
||||
])
|
||||
const isAllSelected = ref(false)
|
||||
const columns = reactive({
|
||||
@@ -1380,10 +1408,38 @@ function confirmColumnSettings() {
|
||||
columnDialogVisible.value = false
|
||||
}
|
||||
|
||||
// 重置列设置
|
||||
// 修改重置函数
|
||||
function resetColumnSettings() {
|
||||
// 只重置为默认的核心字段
|
||||
selectedColumns.value = [
|
||||
'id', 'bsManageTags', 'ranchId', 'drRanch', 'sheepfoldId', 'sheepfoldName', 'electronicTags', 'varietyId', 'variety', 'family', 'name', 'gender', 'birthday', 'dayAge', 'monthAge', 'parity', 'birthWeight', 'weaningDate', 'statusId', 'weaningWeight', 'currentWeight','weaningDayAge', 'weaningDailyGain','breedStatusId', 'breed', 'bsFatherId', 'fatherManageTags', 'bsMotherId', 'motherManageTags', 'receptorId', 'receptorManageTags', 'fatherFatherId', 'grandfatherManageTags', 'fatherMotherId', 'grandmotherManageTags', 'fatherId', 'maternalGrandfatherManageTags', 'motherId', 'maternalGrandmotherManageTags', 'matingDate', 'matingTypeId', 'pregDate', 'lambingDate', 'lambingDay', 'matingDay', 'gestationDay', 'expectedDate', 'postLambingDay', 'lactationDay', 'anestrousDay', 'matingCounts', 'matingTotal', 'miscarriageCounts', 'comment', 'controlled', 'body', 'breast', 'source', 'sourceDate', 'sourceRanchId', 'sourceRanch', 'updateBy', 'updateTime', 'createBy', 'createTime'
|
||||
'bsManageTags', // 耳号
|
||||
'drRanch', // 牧场名称
|
||||
'sheepfoldName', // 羊舍名称
|
||||
'electronicTags', // 电子耳号
|
||||
'variety', // 品种
|
||||
'family', //家系
|
||||
'name', // 羊只类型
|
||||
'gender', // 性别
|
||||
'birthday', // 出生日期
|
||||
'dayAge', // 日龄
|
||||
'monthAge', //月龄
|
||||
'parity', //胎次
|
||||
'birthWeight', //出生体重
|
||||
'weaningDate', //断奶日期
|
||||
'weaningWeight',//断奶体重
|
||||
'currentWeight', // 当前体重
|
||||
'breed', // 繁殖状态
|
||||
'fatherManageTags', // 父亲耳号
|
||||
'motherManageTags', // 母亲耳号
|
||||
'grandfatherManageTags',//祖父
|
||||
'grandmotherManageTags',//祖母
|
||||
'maternalGrandfatherManageTags',//外祖父
|
||||
'maternalGrandmotherManageTags',//外祖母
|
||||
'comment'//备注
|
||||
|
||||
|
||||
|
||||
|
||||
]
|
||||
updateColumnVisibility()
|
||||
localStorage.setItem('selectedColumns', JSON.stringify(selectedColumns.value))
|
||||
|
||||
@@ -2,22 +2,13 @@
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
|
||||
<el-form-item label="部门名称" prop="deptName">
|
||||
<el-input
|
||||
v-model="queryParams.deptName"
|
||||
placeholder="请输入部门名称"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable style="width: 200px"
|
||||
@keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-select v-model="queryParams.status" placeholder="部门状态" clearable style="width: 200px">
|
||||
<el-option
|
||||
v-for="dict in sys_normal_disable"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
<el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
@@ -28,50 +19,33 @@
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Plus"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['system:dept:add']"
|
||||
>新增</el-button>
|
||||
<el-button type="primary" plain icon="Plus" @click="handleAdd"
|
||||
v-hasPermi="['system:dept:add']">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="info"
|
||||
plain
|
||||
icon="Sort"
|
||||
@click="toggleExpandAll"
|
||||
>展开/折叠</el-button>
|
||||
<el-button type="info" plain icon="Sort" @click="toggleExpandAll">展开/折叠</el-button>
|
||||
</el-col>
|
||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
v-if="refreshTable"
|
||||
v-loading="loading"
|
||||
:data="deptList"
|
||||
row-key="deptId"
|
||||
:default-expand-all="isExpandAll"
|
||||
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
|
||||
>
|
||||
<el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
|
||||
<el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
|
||||
<el-table-column prop="status" label="状态" width="100">
|
||||
<el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId"
|
||||
:default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
|
||||
<el-table-column prop="deptName" label="部门名称" ></el-table-column>
|
||||
<el-table-column prop="ranchName" label="牧场名称"></el-table-column>
|
||||
<el-table-column prop="orderNum" label="排序"></el-table-column>
|
||||
<el-table-column prop="status" label="状态">
|
||||
<template #default="scope">
|
||||
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="200">
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']">修改</el-button>
|
||||
<el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
|
||||
<el-button v-if="scope.row.parentId != 0" link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
|
||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['system:dept:edit']">修改</el-button>
|
||||
<el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)"
|
||||
v-hasPermi="['system:dept:add']">新增</el-button>
|
||||
<el-button v-if="scope.row.parentId != 0" link type="primary" icon="Delete"
|
||||
@click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -82,14 +56,15 @@
|
||||
<el-row>
|
||||
<el-col :span="24" v-if="form.parentId !== 0">
|
||||
<el-form-item label="上级部门" prop="parentId">
|
||||
<el-tree-select
|
||||
v-model="form.parentId"
|
||||
:data="deptOptions"
|
||||
:props="{ value: 'deptId', label: 'deptName', children: 'children' }"
|
||||
value-key="deptId"
|
||||
placeholder="选择上级部门"
|
||||
check-strictly
|
||||
/>
|
||||
<el-tree-select v-model="form.parentId" :data="deptOptions"
|
||||
:props="{ value: 'deptId', label: 'deptName', children: 'children' }" value-key="deptId"
|
||||
placeholder="选择上级部门" check-strictly />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- 修改：当新增且上级部门为根部门时显示 -->
|
||||
<el-col :span="24" v-if="showRanchNameInput">
|
||||
<el-form-item label="羊场名称" prop="ranchName">
|
||||
<el-input v-model="form.ranchName" placeholder="请输入羊场名称" maxlength="50" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
@@ -120,11 +95,8 @@
|
||||
<el-col :span="12">
|
||||
<el-form-item label="部门状态">
|
||||
<el-radio-group v-model="form.status">
|
||||
<el-radio
|
||||
v-for="dict in sys_normal_disable"
|
||||
:key="dict.value"
|
||||
:value="dict.value"
|
||||
>{{ dict.label }}</el-radio>
|
||||
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
|
||||
}}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -166,12 +138,43 @@ const data = reactive({
|
||||
deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
|
||||
orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
|
||||
email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
|
||||
phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
|
||||
phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
|
||||
// 羊场名称非必填，如需必填添加规则
|
||||
ranchName: [{ required: false, message: "请输入羊场名称", trigger: "blur" }]
|
||||
},
|
||||
})
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data)
|
||||
|
||||
// 计算属性：是否显示羊场名称输入框
|
||||
// 条件：1. 新增模式（无deptId） 2. 上级部门为根部门（所选部门的parentId为0）
|
||||
const showRanchNameInput = computed(() => {
|
||||
// 编辑模式不显示
|
||||
if (form.value.deptId !== undefined) return false
|
||||
|
||||
// 新增模式：如果没有选择上级（parentId为undefined或0），或者是根部门的直接上级
|
||||
if (!form.value.parentId) {
|
||||
// 未选择上级或上级为0（根），通常这种情况视为添加根部门，显示羊场名称
|
||||
return true
|
||||
}
|
||||
|
||||
// 从部门树中查找所选上级部门的信息
|
||||
const findNode = (tree, id) => {
|
||||
for (let node of tree) {
|
||||
if (node.deptId === id) return node
|
||||
if (node.children && node.children.length > 0) {
|
||||
const found = findNode(node.children, id)
|
||||
if (found) return found
|
||||
}
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
const parentNode = findNode(deptOptions.value, form.value.parentId)
|
||||
// 如果找到父节点，且其父ID为0，说明选择的是根部门（一级部门）
|
||||
return parentNode && parentNode.parentId === 0
|
||||
})
|
||||
|
||||
/** 查询部门列表 */
|
||||
function getList() {
|
||||
loading.value = true
|
||||
@@ -197,7 +200,8 @@ function reset() {
|
||||
leader: undefined,
|
||||
phone: undefined,
|
||||
email: undefined,
|
||||
status: "0"
|
||||
status: "0",
|
||||
ranchName: undefined // 重置羊场名称
|
||||
}
|
||||
proxy.resetForm("deptRef")
|
||||
}
|
||||
@@ -271,12 +275,12 @@ function submitForm() {
|
||||
|
||||
/** 删除按钮操作 */
|
||||
function handleDelete(row) {
|
||||
proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() {
|
||||
proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function () {
|
||||
return delDept(row.deptId)
|
||||
}).then(() => {
|
||||
getList()
|
||||
proxy.$modal.msgSuccess("删除成功")
|
||||
}).catch(() => {})
|
||||
}).catch(() => { })
|
||||
}
|
||||
|
||||
getList()
|
||||
|
||||
Reference in New Issue
Block a user