✨ feat(mes): 增加库位编号和相关查询功能

在库存物资选择对话框中新增库位编号字段,更新查询参数以支持库位的选择和过滤。调整相关组件以确保库位信息的正确显示和交互。
pull/871/MERGE
YunaiV 2026-04-06 11:28:35 +08:00
parent a29ea8e4e4
commit 5f61294aad
1 changed files with 145 additions and 99 deletions

View File

@ -11,16 +11,23 @@
--> -->
<template> <template>
<Dialog title="库存物资选择" v-model="dialogVisible" width="80%"> <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 --> <el-row :gutter="20">
<!-- 左侧:分类树 -->
<el-col :span="4" :xs="24">
<ContentWrap class="h-1/1">
<MdItemTypeTree ref="typeTreeRef" @node-click="handleNodeClick" />
</ContentWrap>
</el-col>
<!-- 右侧:搜索 + 表格 -->
<el-col :span="20" :xs="24">
<!-- 搜索 --> <!-- 搜索 -->
<ContentWrap> <ContentWrap>
<el-form :inline="true" :model="queryParams" label-width="80px"> <el-form :inline="true" :model="queryParams" label-width="68px">
<el-form-item label="物料"> <el-form-item label="物料">
<MdItemSelect v-model="queryParams.itemId" class="!w-240px" /> <MdItemSelect v-model="queryParams.itemId" class="!w-220px" />
</el-form-item> </el-form-item>
<el-form-item label="供应商"> <el-form-item label="供应商">
<MdVendorSelect v-model="queryParams.vendorId" class="!w-240px" /> <MdVendorSelect v-model="queryParams.vendorId" class="!w-220px" />
</el-form-item> </el-form-item>
<el-form-item label="批次号"> <el-form-item label="批次号">
<el-input <el-input
@ -28,27 +35,35 @@
placeholder="请输入批次号" placeholder="请输入批次号"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-220px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="仓库"> <el-form-item label="仓库">
<WmWarehouseSelect <WmWarehouseSelect
v-model="queryParams.warehouseId" v-model="queryParams.warehouseId"
@change="handleWarehouseChange" @change="handleWarehouseChange"
class="!w-240px" class="!w-220px"
/> />
</el-form-item> </el-form-item>
<!-- TODO @AI:areaId 增加一个; --> <!-- DONE @AI:areaId 增加一个 -->
<el-form-item label="库区"> <el-form-item label="库区">
<WmWarehouseLocationSelect <WmWarehouseLocationSelect
v-model="queryParams.locationId" v-model="queryParams.locationId"
:warehouse-id="queryParams.warehouseId" :warehouse-id="queryParams.warehouseId"
class="!w-240px" @change="handleLocationChange"
class="!w-220px"
/>
</el-form-item>
<el-form-item label="库位">
<WmWarehouseAreaSelect
v-model="queryParams.areaId"
:location-id="queryParams.locationId"
class="!w-220px"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" />搜索</el-button> <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button> <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</ContentWrap> </ContentWrap>
@ -60,6 +75,7 @@
:data="list" :data="list"
:stripe="true" :stripe="true"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
border
row-key="id" row-key="id"
:highlight-current-row="!multiple" :highlight-current-row="!multiple"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@ -102,6 +118,7 @@
width="180px" width="180px"
/> />
</el-table> </el-table>
<!-- 分页 -->
<Pagination <Pagination
:total="total" :total="total"
v-model:page="queryParams.pageNo" v-model:page="queryParams.pageNo"
@ -109,6 +126,8 @@
@pagination="getList" @pagination="getList"
/> />
</ContentWrap> </ContentWrap>
</el-col>
</el-row>
<template #footer> <template #footer>
<el-button type="primary" @click="confirmSelect">确 定</el-button> <el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
@ -119,10 +138,13 @@
<script setup lang="ts"> <script setup lang="ts">
import { dateFormatter2 } from '@/utils/formatTime' import { dateFormatter2 } from '@/utils/formatTime'
import { WmMaterialStockApi, WmMaterialStockVO } from '@/api/mes/wm/materialstock' import { WmMaterialStockApi, WmMaterialStockVO } from '@/api/mes/wm/materialstock'
import { MdItemTypeVO } from '@/api/mes/md/item/type'
import MdItemTypeTree from '@/views/mes/md/item/type/components/MdItemTypeTree.vue'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue' import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue' import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue'
import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue' import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue'
import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue' import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue'
import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehouseAreaSelect.vue'
defineOptions({ name: 'WmMaterialStockSelectDialog' }) defineOptions({ name: 'WmMaterialStockSelectDialog' })
@ -148,6 +170,7 @@ const total = ref(0) // 总条数
// ==================== 选中状态 ==================== // ==================== 选中状态 ====================
const tableRef = ref() // 表格 Ref const tableRef = ref() // 表格 Ref
const typeTreeRef = ref() // 分类树 Ref
const selectedRows = ref<WmMaterialStockVO[]>([]) // 多选模式:选中行 const selectedRows = ref<WmMaterialStockVO[]>([]) // 多选模式:选中行
const selectedRadioId = ref<number>() // 单选模式:选中 ID const selectedRadioId = ref<number>() // 单选模式:选中 ID
const currentRadioRow = ref<WmMaterialStockVO>() // 单选模式:选中行对象 const currentRadioRow = ref<WmMaterialStockVO>() // 单选模式:选中行对象
@ -185,21 +208,37 @@ const handleRowDblClick = (row: WmMaterialStockVO) => {
confirmSelect() confirmSelect()
} }
// ==================== 分类树 ====================
/** 点击分类树节点,按分类筛选(支持取消选中) */
const handleNodeClick = (data: MdItemTypeVO | undefined) => {
queryParams.itemTypeId = data?.id
handleQuery()
}
// ==================== 库存查询 ==================== // ==================== 库存查询 ====================
const queryParams = reactive({ const queryParams = reactive({
pageNo: 1, // 页码 pageNo: 1, // 页码
pageSize: 10, // 每页条数 pageSize: 10, // 每页条数
itemTypeId: undefined as number | undefined, // 物料分类编号
itemId: undefined as number | undefined, // 物料编号 itemId: undefined as number | undefined, // 物料编号
vendorId: undefined as number | undefined, // 供应商编号 vendorId: undefined as number | undefined, // 供应商编号
batchCode: undefined as string | undefined, // 批次号 batchCode: undefined as string | undefined, // 批次号
warehouseId: undefined as number | undefined, // 仓库编号 warehouseId: undefined as number | undefined, // 仓库编号
locationId: undefined as number | undefined, // 库区编号 locationId: undefined as number | undefined, // 库区编号
areaId: undefined as number | undefined, // 库位编号
frozen: false as boolean | undefined // 默认只查未冻结 frozen: false as boolean | undefined // 默认只查未冻结
}) })
/** 仓库切换时清空库区 */ /** 仓库切换时清空库区、库位 */
const handleWarehouseChange = () => { const handleWarehouseChange = () => {
queryParams.locationId = undefined queryParams.locationId = undefined
queryParams.areaId = undefined
}
/** 库区切换时清空库位 */
const handleLocationChange = () => {
queryParams.areaId = undefined
} }
/** 查询库存列表 */ /** 查询库存列表 */
@ -246,13 +285,16 @@ const handleQuery = () => {
getList() getList()
} }
/** 重置查询条件 */ /** 重置查询条件(同步清除左侧树高亮和搜索词) */
const resetQuery = () => { const resetQuery = () => {
queryParams.itemTypeId = undefined
queryParams.itemId = props.itemId // 保持 props 传入的物料过滤 queryParams.itemId = props.itemId // 保持 props 传入的物料过滤
queryParams.vendorId = undefined queryParams.vendorId = undefined
queryParams.batchCode = undefined queryParams.batchCode = undefined
queryParams.warehouseId = undefined queryParams.warehouseId = undefined
queryParams.locationId = undefined queryParams.locationId = undefined
queryParams.areaId = undefined
typeTreeRef.value?.reset()
handleQuery() handleQuery()
} }
@ -280,15 +322,19 @@ const confirmSelect = () => {
const open = async (selectedIds?: number[]) => { const open = async (selectedIds?: number[]) => {
dialogVisible.value = true dialogVisible.value = true
// 重置查询条件 + 页码,避免二次打开继承上次过滤上下文 // 重置查询条件 + 页码,避免二次打开继承上次过滤上下文
queryParams.itemTypeId = undefined
queryParams.vendorId = undefined queryParams.vendorId = undefined
queryParams.batchCode = undefined queryParams.batchCode = undefined
queryParams.warehouseId = undefined queryParams.warehouseId = undefined
queryParams.locationId = undefined queryParams.locationId = undefined
queryParams.areaId = undefined
queryParams.pageNo = 1 queryParams.pageNo = 1
// 固定 itemId 过滤条件(从 props 传入) // 固定 itemId 过滤条件(从 props 传入)
queryParams.itemId = props.itemId queryParams.itemId = props.itemId
// 默认只查未冻结 // 默认只查未冻结
queryParams.frozen = false queryParams.frozen = false
// 重置分类树(清高亮 + 清搜索词)
typeTreeRef.value?.reset()
// 清空上一次的选中状态 // 清空上一次的选中状态
selectedRows.value = [] selectedRows.value = []
selectedRadioId.value = undefined selectedRadioId.value = undefined