feat(stock): 添加供应商编号并移除库存精简列表接口

pull/871/MERGE
YunaiV 2026-04-06 11:16:21 +08:00
parent c4507c6f1f
commit a29ea8e4e4
3 changed files with 463 additions and 83 deletions

View File

@ -46,12 +46,4 @@ export const WmMaterialStockApi = {
exportMaterialStock: async (params: any) => {
return await request.download({ url: '/mes/wm/material-stock/export-excel', params })
},
// 获取库存精简列表(主要用于前端下拉,可按 itemId 过滤)
getMaterialStockSimpleList: async (itemId?: number) => {
return await request.get({
url: '/mes/wm/material-stock/simple-list',
params: { itemId }
})
}
}

View File

@ -1,46 +1,74 @@
<!-- MES 库存选择器一次加载前端过滤支持按 itemId 检索 -->
<!--
MES 库存选择器只读输入框 + 点击弹窗选择
交互显示为只读 el-input点击打开弹窗单选模式进行选择
Props:
modelValue 绑定的库存 IDv-model
itemId 按物料 ID 过滤库存可选透传给弹窗
disabled 是否禁用
clearable 是否允许清空鼠标悬停时显示清除图标
placeholder 占位文字
Events:
update:modelValue v-model 更新
change(item) 选中库存变化时触发传递完整 WmMaterialStockVO清空时为 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.warehouseName} / ${item.batchCode || '-'} / 数量:${item.quantity}`"
:value="item.id"
>
<div class="flex items-center gap-8px">
<span
>{{ item.warehouseName }} / {{ item.locationName || '-' }} /
{{ item.areaName || '-' }}</span
>
<el-tag size="small" type="info" class="ml-4px">
{{ item.batchCode || '无批次' }} | {{ 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.itemName || '-' }}</div>
<div>批次{{ selectedItem.batchCode || '-' }}</div>
<div>数量{{ selectedItem.quantity ?? '-' }}</div>
<div>仓库{{ selectedItem.warehouseName || '-' }}</div>
<div>库区{{ selectedItem.locationName || '-' }}</div>
<div>库位{{ selectedItem.areaName || '-' }}</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 -->
<WmMaterialStockSelectDialog
ref="dialogRef"
:multiple="false"
:item-id="itemId"
@selected="handleSelected"
/>
</template>
<script setup lang="ts">
import { WmMaterialStockApi, WmMaterialStockVO } from '@/api/mes/wm/materialstock'
import { Search, CircleClose } from '@element-plus/icons-vue'
import WmMaterialStockSelectDialog from './WmMaterialStockSelectDialog.vue'
defineOptions({ name: 'WmMaterialStockSelect' })
// div + DialogVue attrs
// div class / style
const attrs = useAttrs()
defineOptions({ name: 'WmMaterialStockSelect', inheritAttrs: false })
const props = withDefaults(
defineProps<{
modelValue?: number
itemId?: number
disabled?: boolean
clearable?: boolean
placeholder?: string
modelValue?: number // ID
itemId?: number // ID
disabled?: boolean //
clearable?: boolean //
placeholder?: string //
}>(),
{
disabled: false,
@ -54,54 +82,102 @@ const emit = defineEmits<{
change: [item: WmMaterialStockVO | undefined]
}>()
const allList = ref<WmMaterialStockVO[]>([])
const filteredList = ref<WmMaterialStockVO[]>([])
const dialogRef = ref() // Ref
const hovering = ref(false) //
const selectValue = computed({
get: () => props.modelValue,
set: (val) => emit('update:modelValue', val)
// ==================== ====================
const selectedItem = ref<WmMaterialStockVO | undefined>() //
/** 输入框显示文本:展示 仓库 / 批次 / 数量,保持简洁 */
const displayLabel = computed(() => {
const item = selectedItem.value
if (!item) {
return ''
}
return `${item.warehouseName || '-'} / ${item.batchCode || '-'} / 数量:${item.quantity}`
})
/** 前端过滤(仓库名 + 批次号) */
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.warehouseName?.toLowerCase().includes(keyword) ||
item.batchCode?.toLowerCase().includes(keyword) ||
item.areaName?.toLowerCase().includes(keyword)
)
}
/** 选中变化 */
const handleChange = (val: number | undefined) => {
const item = allList.value.find((o) => o.id === val)
emit('change', item)
}
/** 加载库存列表 */
const loadData = async () => {
const list: WmMaterialStockVO[] = await WmMaterialStockApi.getMaterialStockSimpleList(
props.itemId
)
//
allList.value = list.filter((item) => !item.frozen && item.quantity > 0)
filteredList.value = allList.value
}
/** 监听 itemId 变化重新加载 */
watch(
() => props.itemId,
() => {
loadData()
if (selectedItem.value?.id === id) {
return
}
try {
selectedItem.value = await WmMaterialStockApi.getMaterialStock(id)
} catch (e) {
console.error('[WmMaterialStockSelect] resolveItemById failed:', e)
}
}
/** 监听 modelValue 变化,触发回显 */
watch(
() => props.modelValue,
(val) => {
resolveItemById(val)
},
{ immediate: true }
)
onMounted(() => {
loadData()
})
// ==================== ====================
/** 点击组件:清除或打开弹窗 */
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: WmMaterialStockVO[]) => {
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>

View File

@ -0,0 +1,312 @@
<!--
MES 库存弹窗选择器支持单选/多选
Props:
multiple true 多选checkboxfalse 单选radio默认 true
itemId 按物料 ID 过滤库存可选
Events:
selected(rows: WmMaterialStockVO[]) 确认选择后触发单选时数组长度为 1
Expose:
open(selectedIds?: number[]) 打开弹窗可传入已选 ID 用于预选高亮
-->
<template>
<Dialog title="库存物资选择" v-model="dialogVisible" width="80%">
<!-- TODO @AI增加 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/md/item/type/components/MdItemTypeSelect.vue -->
<!-- 搜索 -->
<ContentWrap>
<el-form :inline="true" :model="queryParams" label-width="80px">
<el-form-item label="物料">
<MdItemSelect v-model="queryParams.itemId" class="!w-240px" />
</el-form-item>
<el-form-item label="供应商">
<MdVendorSelect v-model="queryParams.vendorId" class="!w-240px" />
</el-form-item>
<el-form-item label="批次号">
<el-input
v-model="queryParams.batchCode"
placeholder="请输入批次号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="仓库">
<WmWarehouseSelect
v-model="queryParams.warehouseId"
@change="handleWarehouseChange"
class="!w-240px"
/>
</el-form-item>
<!-- TODO @AIareaId 增加一个 -->
<el-form-item label="库区">
<WmWarehouseLocationSelect
v-model="queryParams.locationId"
:warehouse-id="queryParams.warehouseId"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" />搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<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"
>
<!-- 多选checkboxreserve-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" min-width="120" />
<el-table-column label="产品物料名称" align="center" prop="itemName" min-width="140" />
<el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
<el-table-column label="单位" align="center" prop="unitMeasureName" min-width="80" />
<el-table-column label="入库批次号" align="center" prop="batchCode" min-width="120" />
<el-table-column label="仓库" align="center" prop="warehouseName" min-width="100" />
<el-table-column label="库区" align="center" prop="locationName" min-width="100" />
<el-table-column label="库位" align="center" prop="areaName" min-width="100" />
<el-table-column label="在库数量" align="center" prop="quantity" min-width="100" />
<el-table-column
label="入库日期"
align="center"
prop="receiptTime"
:formatter="dateFormatter2"
width="180px"
/>
</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 { dateFormatter2 } from '@/utils/formatTime'
import { WmMaterialStockApi, WmMaterialStockVO } from '@/api/mes/wm/materialstock'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue'
import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue'
import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue'
defineOptions({ name: 'WmMaterialStockSelectDialog' })
const props = withDefaults(
defineProps<{
multiple?: boolean // true checkboxfalse radio
itemId?: number // ID
}>(),
{
multiple: true
}
)
const message = useMessage()
const emit = defineEmits<{
selected: [rows: WmMaterialStockVO[]]
}>()
const dialogVisible = ref(false) //
const loading = ref(false) //
const list = ref<WmMaterialStockVO[]>([]) //
const total = ref(0) //
// ==================== ====================
const tableRef = ref() // Ref
const selectedRows = ref<WmMaterialStockVO[]>([]) //
const selectedRadioId = ref<number>() // ID
const currentRadioRow = ref<WmMaterialStockVO>() //
const preSelectedIds = ref<number[]>([]) // ID
/** 多选checkbox 变化 */
const handleSelectionChange = (rows: WmMaterialStockVO[]) => {
if (props.multiple) {
selectedRows.value = rows
}
}
/** 单选radio 变化 */
const handleRadioChange = (row: WmMaterialStockVO) => {
currentRadioRow.value = row
}
/** 单击行:单选模式下点击整行即选中(降低操作成本),多选不处理(避免和 dblclick 冲突) */
const handleRowClick = (row: WmMaterialStockVO) => {
if (props.multiple) {
return
}
selectedRadioId.value = row.id
currentRadioRow.value = row
}
/** 双击行:多选模式切换勾选,单选模式直接确认 */
const handleRowDblClick = (row: WmMaterialStockVO) => {
if (props.multiple) {
tableRef.value?.toggleRowSelection(row)
return
}
selectedRadioId.value = row.id
currentRadioRow.value = row
confirmSelect()
}
// ==================== ====================
const queryParams = reactive({
pageNo: 1, //
pageSize: 10, //
itemId: undefined as number | undefined, //
vendorId: undefined as number | undefined, //
batchCode: undefined as string | undefined, //
warehouseId: undefined as number | undefined, //
locationId: undefined as number | undefined, //
frozen: false as boolean | undefined //
})
/** 仓库切换时清空库区 */
const handleWarehouseChange = () => {
queryParams.locationId = undefined
}
/** 查询库存列表 */
const getList = async () => {
loading.value = true
try {
const data = await WmMaterialStockApi.getMaterialStockPage(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 handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置查询条件 */
const resetQuery = () => {
queryParams.itemId = props.itemId // props
queryParams.vendorId = undefined
queryParams.batchCode = undefined
queryParams.warehouseId = undefined
queryParams.locationId = undefined
handleQuery()
}
/** 确认选择 */
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
// +
queryParams.vendorId = undefined
queryParams.batchCode = undefined
queryParams.warehouseId = undefined
queryParams.locationId = undefined
queryParams.pageNo = 1
// itemId props
queryParams.itemId = props.itemId
//
queryParams.frozen = false
//
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>