✨ feat(mes): 添加发货通知单行选择器组件及相关功能
YunaiV
parent
2f21daecc1
commit
a5122b58c4
|
|
@ -12,7 +12,7 @@ export interface WmSalesNoticeLineVO {
|
|||
batchId: number
|
||||
batchCode: string
|
||||
quantity: number
|
||||
oqcCheck: boolean
|
||||
oqcCheckFlag: boolean
|
||||
remark: string
|
||||
createTime: string
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@
|
|||
<WmSalesNoticeSelect
|
||||
v-model="formData.noticeId"
|
||||
:disabled="isHeaderReadonly"
|
||||
:status="MesWmSalesNoticeStatusEnum.APPROVED"
|
||||
@change="handleNoticeChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -173,7 +174,7 @@
|
|||
<script setup lang="ts">
|
||||
import { WmProductSalesApi, WmProductSalesVO } from '@/api/mes/wm/productsales'
|
||||
import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
|
||||
import { MesAutoCodeRuleCode, MesWmProductSalesStatusEnum } from '@/views/mes/utils/constants'
|
||||
import { MesAutoCodeRuleCode, MesWmProductSalesStatusEnum, MesWmSalesNoticeStatusEnum } from '@/views/mes/utils/constants'
|
||||
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
|
||||
import WmSalesNoticeSelect from '@/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue'
|
||||
import { WmSalesNoticeVO } from '@/api/mes/wm/salesnotice'
|
||||
|
|
|
|||
|
|
@ -1,42 +1,72 @@
|
|||
<!-- MES 发货通知单行选择器：纯下拉，前端过滤（支持 itemCode、itemName），支持按发货通知单筛选 -->
|
||||
<!--
|
||||
MES 发货通知单行选择器：只读输入框 + 点击弹窗选择
|
||||
|
||||
交互：显示为只读 el-input，点击打开弹窗（单选模式）进行选择
|
||||
Props:
|
||||
modelValue — 绑定的发货通知单行 ID（v-model）
|
||||
noticeId — 发货通知单 ID（透传给 Dialog，限制可选范围）
|
||||
disabled — 是否禁用
|
||||
clearable — 是否允许清空（鼠标悬停时显示清除图标）
|
||||
placeholder — 占位文字
|
||||
Events:
|
||||
update:modelValue — v-model 更新
|
||||
change(item) — 选中行变化时触发，传递完整 WmSalesNoticeLineVO（清空时为 undefined）
|
||||
-->
|
||||
<template>
|
||||
<el-select
|
||||
v-model="selectValue"
|
||||
:placeholder="placeholder"
|
||||
:disabled="disabled"
|
||||
:clearable="clearable"
|
||||
filterable
|
||||
:filter-method="handleFilter"
|
||||
class="!w-1/1"
|
||||
@change="handleChange"
|
||||
<div
|
||||
v-bind="attrs"
|
||||
class="w-full"
|
||||
:class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
|
||||
@click="handleClick"
|
||||
@mouseenter="hovering = true"
|
||||
@mouseleave="hovering = false"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in filteredList"
|
||||
:key="item.id"
|
||||
:label="`${item.itemCode} - ${item.itemName}`"
|
||||
:value="item.id"
|
||||
>
|
||||
<div class="flex items-center gap-8px">
|
||||
<span>{{ item.itemCode }}</span>
|
||||
<span class="text-gray-500">{{ item.itemName }}</span>
|
||||
<el-tag size="small" type="info" class="ml-4px">{{ item.quantity }}</el-tag>
|
||||
</div>
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-tooltip :disabled="!selectedItem" placement="top" :show-after="500">
|
||||
<template #content>
|
||||
<div v-if="selectedItem" class="leading-6">
|
||||
<div>物料编码：{{ selectedItem.itemCode }}</div>
|
||||
<div>物料名称：{{ selectedItem.itemName }}</div>
|
||||
<div>规格型号：{{ selectedItem.specification || '-' }}</div>
|
||||
<div>发货数量：{{ selectedItem.quantity }}</div>
|
||||
</div>
|
||||
</template>
|
||||
<el-input
|
||||
:model-value="displayLabel"
|
||||
:placeholder="placeholder"
|
||||
:disabled="disabled"
|
||||
readonly
|
||||
:suffix-icon="suffixIcon"
|
||||
:class="disabled ? 'is-select-disabled' : 'is-select-clickable'"
|
||||
/>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<!-- 弹窗必须放在 div 外部，否则弹窗内的点击事件会冒泡到 div 触发 handleClick -->
|
||||
<WmSalesNoticeLineSelectDialog
|
||||
ref="dialogRef"
|
||||
:multiple="false"
|
||||
:notice-id="noticeId"
|
||||
@selected="handleSelected"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { WmSalesNoticeLineApi, WmSalesNoticeLineVO } from '@/api/mes/wm/salesnotice/line'
|
||||
import { Search, CircleClose } from '@element-plus/icons-vue'
|
||||
import WmSalesNoticeLineSelectDialog from './WmSalesNoticeLineSelectDialog.vue'
|
||||
|
||||
defineOptions({ name: 'WmSalesNoticeLineSelect' })
|
||||
// 组件有两个根节点（div + Dialog），Vue 不会自动继承 attrs；
|
||||
// 手动透传到外层 div，确保父组件传入的 class / style 等生效
|
||||
const attrs = useAttrs()
|
||||
|
||||
defineOptions({ name: 'WmSalesNoticeLineSelect', inheritAttrs: false })
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
modelValue?: number
|
||||
noticeId?: number
|
||||
disabled?: boolean
|
||||
clearable?: boolean
|
||||
placeholder?: string
|
||||
modelValue?: number // 绑定的发货通知单行 ID
|
||||
noticeId?: number // 发货通知单 ID
|
||||
disabled?: boolean // 是否禁用
|
||||
clearable?: boolean // 是否允许清空
|
||||
placeholder?: string // 占位文字
|
||||
}>(),
|
||||
{
|
||||
disabled: false,
|
||||
|
|
@ -50,59 +80,111 @@ const emit = defineEmits<{
|
|||
change: [item: WmSalesNoticeLineVO | undefined]
|
||||
}>()
|
||||
|
||||
const allList = ref<WmSalesNoticeLineVO[]>([])
|
||||
const filteredList = ref<WmSalesNoticeLineVO[]>([])
|
||||
const dialogRef = ref() // 弹窗 Ref
|
||||
const hovering = ref(false) // 鼠标是否悬停
|
||||
|
||||
const selectValue = computed({
|
||||
get: () => props.modelValue,
|
||||
set: (val) => emit('update:modelValue', val)
|
||||
// ==================== 名称回显 ====================
|
||||
const selectedItem = ref<WmSalesNoticeLineVO | undefined>() // 当前选中的行对象
|
||||
|
||||
/** 输入框显示文本：展示 "物料编码 - 物料名称"，保持简洁易读 */
|
||||
const displayLabel = computed(() => {
|
||||
if (!selectedItem.value) {
|
||||
return ''
|
||||
}
|
||||
return `${selectedItem.value.itemCode} - ${selectedItem.value.itemName}`
|
||||
})
|
||||
|
||||
/** 前端过滤（itemCode + itemName） */
|
||||
const handleFilter = (query: string) => {
|
||||
if (!query) {
|
||||
filteredList.value = allList.value
|
||||
/** 是否显示清除图标 */
|
||||
const showClear = computed(() => {
|
||||
return props.clearable && !props.disabled && hovering.value && props.modelValue != null
|
||||
})
|
||||
|
||||
/** 后缀图标：悬停且有值时显示清除，否则显示搜索 */
|
||||
const suffixIcon = computed(() => {
|
||||
return showClear.value ? CircleClose : Search
|
||||
})
|
||||
|
||||
/** 根据 ID 单条查询行信息（用于编辑回显） */
|
||||
const resolveItemById = async (id: number | undefined) => {
|
||||
if (id == null) {
|
||||
selectedItem.value = undefined
|
||||
return
|
||||
}
|
||||
const keyword = query.toLowerCase()
|
||||
filteredList.value = allList.value.filter(
|
||||
(item) =>
|
||||
item.itemCode?.toLowerCase().includes(keyword) ||
|
||||
item.itemName?.toLowerCase().includes(keyword)
|
||||
)
|
||||
}
|
||||
|
||||
/** 选中变化 */
|
||||
const handleChange = (val: number | undefined) => {
|
||||
const item = allList.value.find((o) => o.id === val)
|
||||
emit('change', item)
|
||||
}
|
||||
|
||||
/** 加载列表 */
|
||||
const loadList = async () => {
|
||||
if (!props.noticeId) {
|
||||
allList.value = []
|
||||
filteredList.value = []
|
||||
if (selectedItem.value?.id === id) {
|
||||
return
|
||||
}
|
||||
const data = await WmSalesNoticeLineApi.getSalesNoticeLinePage({
|
||||
pageNo: 1,
|
||||
pageSize: 100,
|
||||
noticeId: props.noticeId
|
||||
})
|
||||
allList.value = data.list
|
||||
filteredList.value = allList.value
|
||||
try {
|
||||
selectedItem.value = await WmSalesNoticeLineApi.getSalesNoticeLine(id)
|
||||
} catch (e) {
|
||||
console.error('[WmSalesNoticeLineSelect] resolveItemById failed:', e)
|
||||
}
|
||||
}
|
||||
|
||||
/** 监听 noticeId 变化重新加载 */
|
||||
/** 监听 modelValue 变化，触发回显 */
|
||||
watch(
|
||||
() => props.modelValue,
|
||||
(val) => {
|
||||
resolveItemById(val)
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
|
||||
/** 监听 noticeId 变化：清空当前选中（关联的行已失效） */
|
||||
watch(
|
||||
() => props.noticeId,
|
||||
() => {
|
||||
loadList()
|
||||
selectedItem.value = undefined
|
||||
emit('update:modelValue', undefined)
|
||||
emit('change', undefined)
|
||||
}
|
||||
)
|
||||
|
||||
onMounted(() => {
|
||||
loadList()
|
||||
})
|
||||
// ==================== 点击交互 ====================
|
||||
|
||||
/** 点击组件：清除或打开弹窗 */
|
||||
const handleClick = (e: MouseEvent) => {
|
||||
if (props.disabled) {
|
||||
return
|
||||
}
|
||||
// 点击清除图标：清空选中
|
||||
const target = e.target as HTMLElement
|
||||
if (showClear.value && target.closest('.el-input__suffix')) {
|
||||
e.stopPropagation()
|
||||
selectedItem.value = undefined
|
||||
emit('update:modelValue', undefined)
|
||||
emit('change', undefined)
|
||||
return
|
||||
}
|
||||
// 打开弹窗，传入当前选中 ID 用于预选高亮
|
||||
const selectedIds = props.modelValue != null ? [props.modelValue] : []
|
||||
dialogRef.value.open(selectedIds)
|
||||
}
|
||||
|
||||
/** 弹窗选中回调 */
|
||||
const handleSelected = (rows: WmSalesNoticeLineVO[]) => {
|
||||
if (!rows || rows.length === 0) {
|
||||
return
|
||||
}
|
||||
const item = rows[0]
|
||||
selectedItem.value = item
|
||||
emit('update:modelValue', item.id)
|
||||
emit('change', item)
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
/* :deep 用于穿透 el-input 内部元素的 cursor 样式，UnoCSS 无法直接处理组件内部 DOM */
|
||||
.is-select-clickable {
|
||||
:deep(.el-input__wrapper),
|
||||
:deep(.el-input__inner) {
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
||||
.is-select-disabled {
|
||||
:deep(.el-input__wrapper),
|
||||
:deep(.el-input__inner) {
|
||||
cursor: not-allowed;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,230 @@
|
|||
<!--
|
||||
MES 发货通知单行弹窗选择器（支持单选/多选）
|
||||
|
||||
Props:
|
||||
multiple — true 多选（checkbox），false 单选（radio）；默认 true
|
||||
noticeId — 发货通知单 ID（必传，行数据按此过滤）
|
||||
Events:
|
||||
selected(rows: WmSalesNoticeLineVO[]) — 确认选择后触发，单选时数组长度为 1
|
||||
Expose:
|
||||
open(selectedIds?: number[]) — 打开弹窗，可传入已选 ID 用于预选高亮
|
||||
-->
|
||||
<template>
|
||||
<Dialog title="发货通知单行选择" v-model="dialogVisible" width="70%">
|
||||
<!-- 数据表格：单选 radio / 多选 checkbox 统一在一个 table 内 -->
|
||||
<ContentWrap>
|
||||
<el-table
|
||||
ref="tableRef"
|
||||
v-loading="loading"
|
||||
:data="list"
|
||||
:stripe="true"
|
||||
:show-overflow-tooltip="true"
|
||||
row-key="id"
|
||||
:highlight-current-row="!multiple"
|
||||
@selection-change="handleSelectionChange"
|
||||
@row-click="handleRowClick"
|
||||
@row-dblclick="handleRowDblClick"
|
||||
>
|
||||
<!-- 多选：checkbox（reserve-selection 保证跨页勾选不丢失） -->
|
||||
<el-table-column
|
||||
v-if="multiple"
|
||||
type="selection"
|
||||
:reserve-selection="true"
|
||||
width="50"
|
||||
align="center"
|
||||
/>
|
||||
<!-- 单选：radio -->
|
||||
<el-table-column v-else width="50" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-radio
|
||||
v-model="selectedRadioId"
|
||||
:value="row.id"
|
||||
class="radio-no-label"
|
||||
@change="handleRadioChange(row)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料编码" align="center" prop="itemCode" width="150" />
|
||||
<el-table-column label="物料名称" align="left" prop="itemName" min-width="200" />
|
||||
<el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
|
||||
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
|
||||
<el-table-column label="批次号" align="center" prop="batchCode" width="130" />
|
||||
<el-table-column label="发货数量" align="center" prop="quantity" width="100" />
|
||||
<el-table-column label="是否检验" align="center" prop="oqcCheckFlag" width="90">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.oqcCheckFlag" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="remark" min-width="120" />
|
||||
</el-table>
|
||||
<Pagination
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</ContentWrap>
|
||||
<template #footer>
|
||||
<el-button type="primary" @click="confirmSelect">确 定</el-button>
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { DICT_TYPE } from '@/utils/dict'
|
||||
import { WmSalesNoticeLineApi, WmSalesNoticeLineVO } from '@/api/mes/wm/salesnotice/line'
|
||||
|
||||
defineOptions({ name: 'WmSalesNoticeLineSelectDialog' })
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
multiple?: boolean // true 多选（checkbox），false 单选（radio）
|
||||
noticeId?: number // 发货通知单 ID（行数据按此过滤）
|
||||
}>(),
|
||||
{
|
||||
multiple: true
|
||||
}
|
||||
)
|
||||
|
||||
const message = useMessage()
|
||||
const emit = defineEmits<{
|
||||
selected: [rows: WmSalesNoticeLineVO[]]
|
||||
}>()
|
||||
|
||||
const dialogVisible = ref(false) // 弹窗是否展示
|
||||
const loading = ref(false) // 列表加载中
|
||||
const list = ref<WmSalesNoticeLineVO[]>([]) // 列表
|
||||
const total = ref(0) // 总条数
|
||||
|
||||
// ==================== 选中状态 ====================
|
||||
const tableRef = ref() // 表格 Ref
|
||||
const selectedRows = ref<WmSalesNoticeLineVO[]>([]) // 多选模式：选中行
|
||||
const selectedRadioId = ref<number>() // 单选模式：选中 ID
|
||||
const currentRadioRow = ref<WmSalesNoticeLineVO>() // 单选模式：选中行对象
|
||||
const preSelectedIds = ref<number[]>([]) // 打开弹窗时传入的已选 ID
|
||||
|
||||
/** 多选：checkbox 变化 */
|
||||
const handleSelectionChange = (rows: WmSalesNoticeLineVO[]) => {
|
||||
if (props.multiple) {
|
||||
selectedRows.value = rows
|
||||
}
|
||||
}
|
||||
|
||||
/** 单选：radio 变化 */
|
||||
const handleRadioChange = (row: WmSalesNoticeLineVO) => {
|
||||
currentRadioRow.value = row
|
||||
}
|
||||
|
||||
/** 单击行：单选模式下点击整行即选中（降低操作成本），多选不处理（避免和 dblclick 冲突） */
|
||||
const handleRowClick = (row: WmSalesNoticeLineVO) => {
|
||||
if (props.multiple) {
|
||||
return
|
||||
}
|
||||
selectedRadioId.value = row.id
|
||||
currentRadioRow.value = row
|
||||
}
|
||||
|
||||
/** 双击行：多选模式切换勾选，单选模式直接确认 */
|
||||
const handleRowDblClick = (row: WmSalesNoticeLineVO) => {
|
||||
if (props.multiple) {
|
||||
tableRef.value?.toggleRowSelection(row)
|
||||
return
|
||||
}
|
||||
selectedRadioId.value = row.id
|
||||
currentRadioRow.value = row
|
||||
confirmSelect()
|
||||
}
|
||||
|
||||
// ==================== 查询 ====================
|
||||
const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
noticeId: undefined as number | undefined
|
||||
})
|
||||
|
||||
/** 查询列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await WmSalesNoticeLineApi.getSalesNoticeLinePage(queryParams)
|
||||
list.value = data.list
|
||||
total.value = data.total
|
||||
await nextTick()
|
||||
applyPreSelection()
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 恢复预选状态（当前页可见范围内） */
|
||||
const applyPreSelection = () => {
|
||||
if (preSelectedIds.value.length === 0) {
|
||||
return
|
||||
}
|
||||
if (props.multiple) {
|
||||
const table = tableRef.value
|
||||
if (!table) {
|
||||
return
|
||||
}
|
||||
list.value.forEach((row) => {
|
||||
if (preSelectedIds.value.includes(row.id)) {
|
||||
table.toggleRowSelection(row, true)
|
||||
}
|
||||
})
|
||||
} else {
|
||||
const match = list.value.find((row) => preSelectedIds.value.includes(row.id))
|
||||
if (match) {
|
||||
selectedRadioId.value = match.id
|
||||
currentRadioRow.value = match
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 确认选择 */
|
||||
const confirmSelect = () => {
|
||||
if (props.multiple) {
|
||||
if (selectedRows.value.length === 0) {
|
||||
message.warning('请至少选择一条数据')
|
||||
return
|
||||
}
|
||||
emit('selected', selectedRows.value)
|
||||
} else {
|
||||
if (!currentRadioRow.value) {
|
||||
message.warning('请选择一条数据')
|
||||
return
|
||||
}
|
||||
emit('selected', [currentRadioRow.value])
|
||||
}
|
||||
dialogVisible.value = false
|
||||
}
|
||||
|
||||
// ==================== 打开弹窗 ====================
|
||||
|
||||
/** 打开弹窗，可传入已选 ID 用于预选高亮 */
|
||||
const open = async (selectedIds?: number[]) => {
|
||||
dialogVisible.value = true
|
||||
// 设置 noticeId 过滤（必须）
|
||||
queryParams.noticeId = props.noticeId
|
||||
queryParams.pageNo = 1
|
||||
// 清空上一次的选中状态
|
||||
selectedRows.value = []
|
||||
selectedRadioId.value = undefined
|
||||
currentRadioRow.value = undefined
|
||||
preSelectedIds.value = selectedIds ?? []
|
||||
// 多选模式清空跨页缓存的勾选
|
||||
await nextTick()
|
||||
tableRef.value?.clearSelection()
|
||||
await getList()
|
||||
}
|
||||
defineExpose({ open })
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
/* 隐藏 radio 的 label 文字，只保留圆圈 */
|
||||
.radio-no-label {
|
||||
:deep(.el-radio__label) {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Loading…
Reference in New Issue