feat(mes): 优化物料产品选择器 V2 组件

pull/871/MERGE
YunaiV 2026-04-05 12:39:13 +08:00
parent 1f9380ba90
commit 07cd4c47ed
3 changed files with 76 additions and 13 deletions

View File

@ -52,12 +52,20 @@
:stripe="true" :stripe="true"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
border border
row-key="id"
:highlight-current-row="!multiple" :highlight-current-row="!multiple"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@row-click="handleRowClick"
@row-dblclick="handleRowDblClick" @row-dblclick="handleRowDblClick"
> >
<!-- 多选checkbox --> <!-- 多选checkboxreserve-selection 保证跨页勾选不丢失 -->
<el-table-column v-if="multiple" type="selection" width="50" align="center" /> <el-table-column
v-if="multiple"
type="selection"
:reserve-selection="true"
width="50"
align="center"
/>
<!-- 单选radio --> <!-- 单选radio -->
<el-table-column v-else width="50" align="center"> <el-table-column v-else width="50" align="center">
<template #default="{ row }"> <template #default="{ row }">
@ -151,9 +159,19 @@ const handleRadioChange = (row: MdItemVO) => {
currentRadioRow.value = row currentRadioRow.value = row
} }
/** 双击行:单选模式直接确认 */ /** 单击行:单选模式下点击整行即选中(降低操作成本),多选不处理(避免和 dblclick 冲突) */
const handleRowClick = (row: MdItemVO) => {
if (props.multiple) {
return
}
selectedRadioId.value = row.id
currentRadioRow.value = row
}
/** 双击行:多选模式切换勾选,单选模式直接确认 */
const handleRowDblClick = (row: MdItemVO) => { const handleRowDblClick = (row: MdItemVO) => {
if (props.multiple) { if (props.multiple) {
tableRef.value?.toggleRowSelection(row)
return return
} }
selectedRadioId.value = row.id selectedRadioId.value = row.id
@ -163,9 +181,9 @@ const handleRowDblClick = (row: MdItemVO) => {
// ==================== ==================== // ==================== ====================
/** 点击分类树节点,按分类筛选 */ /** 点击分类树节点,按分类筛选(支持取消选中) */
const handleNodeClick = (data: MdItemTypeVO) => { const handleNodeClick = (data: MdItemTypeVO | undefined) => {
queryParams.itemTypeId = data.id queryParams.itemTypeId = data?.id
handleQuery() handleQuery()
} }
@ -222,11 +240,12 @@ const handleQuery = () => {
getList() getList()
} }
/** 重置查询条件 */ /** 重置查询条件(同步清除左侧树高亮和搜索词) */
const resetQuery = () => { const resetQuery = () => {
queryParams.code = undefined queryParams.code = undefined
queryParams.name = undefined queryParams.name = undefined
queryParams.itemTypeId = undefined queryParams.itemTypeId = undefined
typeTreeRef.value?.reset()
handleQuery() handleQuery()
} }
@ -253,10 +272,21 @@ const confirmSelect = () => {
/** 打开弹窗,可传入已选 ID 用于预选高亮 */ /** 打开弹窗,可传入已选 ID 用于预选高亮 */
const open = async (selectedIds?: number[]) => { const open = async (selectedIds?: number[]) => {
dialogVisible.value = true dialogVisible.value = true
// +
queryParams.code = undefined
queryParams.name = undefined
queryParams.itemTypeId = undefined
queryParams.pageNo = 1
// +
typeTreeRef.value?.reset()
//
selectedRows.value = [] selectedRows.value = []
selectedRadioId.value = undefined selectedRadioId.value = undefined
currentRadioRow.value = undefined currentRadioRow.value = undefined
preSelectedIds.value = selectedIds ?? [] preSelectedIds.value = selectedIds ?? []
//
await nextTick()
tableRef.value?.clearSelection()
await getList() await getList()
} }
defineExpose({ open }) defineExpose({ open })

View File

@ -4,6 +4,7 @@
交互显示为只读 el-input点击打开弹窗单选模式进行选择 交互显示为只读 el-input点击打开弹窗单选模式进行选择
Props: Props:
modelValue 绑定的物料 IDv-model modelValue 绑定的物料 IDv-model
itemName 备用显示名称父组件已有名称时传入可跳过 getItem 请求避免 N+1
disabled 是否禁用 disabled 是否禁用
clearable 是否允许清空鼠标悬停时显示清除图标 clearable 是否允许清空鼠标悬停时显示清除图标
placeholder 占位文字 placeholder 占位文字
@ -13,6 +14,7 @@
--> -->
<template> <template>
<div <div
v-bind="attrs"
class="w-full" class="w-full"
:class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'" :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
@click="handleClick" @click="handleClick"
@ -38,11 +40,14 @@ import { MdItemApi, MdItemVO } from '@/api/mes/md/item'
import { Search, CircleClose } from '@element-plus/icons-vue' import { Search, CircleClose } from '@element-plus/icons-vue'
import MdItemSelectDialogV2 from './MdItemSelectDialogV2.vue' import MdItemSelectDialogV2 from './MdItemSelectDialogV2.vue'
defineOptions({ name: 'MdItemSelectV2' }) const attrs = useAttrs() // TODO @AIattrs
defineOptions({ name: 'MdItemSelectV2', inheritAttrs: false })
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
modelValue?: number // ID modelValue?: number // ID
itemName?: string // getItem
disabled?: boolean // disabled?: boolean //
clearable?: boolean // clearable?: boolean //
placeholder?: string // placeholder?: string //
@ -66,10 +71,18 @@ const hovering = ref(false) // 鼠标是否悬停
// ==================== ==================== // ==================== ====================
const selectedItem = ref<MdItemVO | undefined>() // const selectedItem = ref<MdItemVO | undefined>() //
const resolving = ref(false) // const resolving = ref(false) //
let resolveSeq = 0 //
/** 显示文本:物料名称 */ /** 显示文本:[物料编码] 物料名称 */
const displayLabel = computed(() => { const displayLabel = computed(() => {
return selectedItem.value?.name ?? '' if (selectedItem.value) {
return `[${selectedItem.value.code}] ${selectedItem.value.name}`
}
// itemName selectedItem
if (props.itemName && props.modelValue != null) {
return props.itemName
}
return ''
}) })
/** 是否显示清除图标 */ /** 是否显示清除图标 */
@ -91,11 +104,24 @@ const resolveItemById = async (id: number | undefined) => {
if (selectedItem.value?.id === id) { if (selectedItem.value?.id === id) {
return return
} }
// itemName N+1
if (props.itemName) {
return
}
const seq = ++resolveSeq
resolving.value = true resolving.value = true
try { try {
selectedItem.value = await MdItemApi.getItem(id) const item = await MdItemApi.getItem(id)
//
if (seq !== resolveSeq) return
selectedItem.value = item
} catch (e) {
if (seq !== resolveSeq) return
console.error('[MdItemSelectV2] resolveItemById failed:', e)
} finally { } finally {
resolving.value = false if (seq === resolveSeq) {
resolving.value = false
}
} }
} }

View File

@ -11,6 +11,7 @@
Expose: Expose:
loadTree() 手动刷新分类树 loadTree() 手动刷新分类树
clearCurrent() 清除当前选中节点高亮 clearCurrent() 清除当前选中节点高亮
reset() 重置整个树状态清高亮 + 清搜索词
--> -->
<template> <template>
<el-input <el-input
@ -93,5 +94,11 @@ const clearCurrent = () => {
currentNodeId = undefined currentNodeId = undefined
} }
defineExpose({ loadTree, clearCurrent }) /** 重置整个树状态(清高亮 + 清搜索词) */
const reset = () => {
clearCurrent()
filterText.value = ''
}
defineExpose({ loadTree, clearCurrent, reset })
</script> </script>