xins
/
hwmom-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(wms): 优化库存页面布局和功能

Browse Source 
- 移除物料、库位编码、锁定状态等筛选条件
-调整表格列显示顺序和内容
- 为 InventoryForm 和 InventoryQuery 接口添加新字段- 为 InstockPrint 相关接口添加质检状态字段
master
zangch@mesnac.com 3 months ago
parent 59f094899d
commit 915cb0e8ab
3 changed files with 64 additions and 35 deletions
Show Stats Download Patch File Download Diff File

15
src/api/wms/instockPrint/types.ts
Unescape Escape View File

@ -96,6 +96,11 @@ export interface InstockPrintVO {
*/
inspectionRequest?: string;
/**
* 质检状态(0未发起，1质检中，2合格，3不合格）
*/
inspectionType?: string;
}
export interface InstockPrintForm extends BaseEntity {
@ -196,6 +201,11 @@ export interface InstockPrintForm extends BaseEntity {
*/
inspectionRequest?: string;
/**
* 质检状态(0未发起，1质检中，2合格，3不合格）
*/
inspectionType?: string;
}
@ -299,6 +309,11 @@ export interface InstockPrintQuery extends PageQuery {
*/
inspectionRequest?: string;
/**
* 质检状态(0未发起，1质检中，2合格，3不合格）
*/
inspectionType?: string;
/**
* 日期范围参数

17
src/api/wms/inventory/types.ts
Unescape Escape View File

@ -50,6 +50,8 @@ export interface InventoryVO {
materialName: string;
warehouseName: string;
}
export interface InventoryForm extends BaseEntity {
@ -104,6 +106,12 @@ export interface InventoryForm extends BaseEntity {
materialName?: string;
materialSpec?: string;
materialUnit?: string;
warehouseName?: string;
}
export interface InventoryQuery extends PageQuery {
@ -153,10 +161,19 @@ export interface InventoryQuery extends PageQuery {
*/
storeId?: string | number;
/**
* 仓库ID
*/
warehouseId?: string | number;
materialCode?: string;
materialName?: string;
warehouseName?: string;
materialCategoryName?: string;
/**
* 日期范围参数
*/

67
src/views/wms/inventory/index.vue
Unescape Escape View File

@ -10,7 +10,7 @@
<el-form-item label="批次码" prop="batchCode">
<el-input v-model="queryParams.batchCode" placeholder="请输入批次码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物料" prop="materialId">
<!-- <el-form-item label="物料" prop="materialId">
<el-select v-model="queryParams.materialId" placeholder="请选择物料">
<el-option
v-for="item in materialList"
@ -19,10 +19,10 @@
:value="item.materialId"
/>
</el-select>
</el-form-item>
<el-form-item label="库位编码" prop="locationCode">
</el-form-item> -->
<!-- <el-form-item label="库位编码" prop="locationCode">
<el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
</el-form-item> -->
<!-- <el-form-item label="物料大类" prop="materialCategoryId">-->
<!-- <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >-->
<!-- <el-option v-for="item in mategoryOptions"-->
@ -35,18 +35,18 @@
<!-- <el-form-item label="库存数量" prop="inventoryQty">
<el-input v-model="queryParams.inventoryQty" placeholder="请输入库存数量" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="锁定状态" prop="lockState">
<el-select v-model="queryParams.lockState" placeholder="请选择物料大类" clearable >
<!-- <el-form-item label="锁定状态" prop="lockState">
<el-select v-model="queryParams.lockState" placeholder="请选择" clearable >
<el-option v-for="dict in lock_state" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
</el-form-item> -->
<!-- <el-form-item label="库存状态" prop="inventoryStatus">
<el-select v-model="queryParams.inventoryStatus" placeholder="请选择库存状态" clearable >
<el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item> -->
<el-form-item label="仓库" prop="storeId">
<el-select v-model="form.warehouseId" placeholder="请选择所属仓库">
<el-select v-model="queryParams.storeId" placeholder="请选择所属仓库">
<el-option
v-for="item in baseStoreList"
:key="item.warehouseId"
@ -76,9 +76,9 @@
<!-- <el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:inventory:remove']">删除</el-button>
</el-col> -->
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:inventory:export']">导出</el-button>
</el-col>
</el-col> -->
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
@ -86,25 +86,24 @@
<el-table v-loading="loading" :data="inventoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="表主键" align="center" prop="inventoryId" v-if="columns[0].visible"/> -->
<el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[2].visible"/>
<el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[0].visible"/>
<!-- <el-table-column label="物料id" align="center" prop="materialId" v-if="columns[3].visible"/> -->
<el-table-column label="库位编码" align="center" prop="locationCode" v-if="columns[4].visible"/>
<el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[5].visible">
<!-- -->
</el-table-column>
<el-table-column label="物料" align="center" prop="materialName" v-if="columns[6].visible"/>
<el-table-column label="库存数量" align="center" prop="inventoryQty" v-if="columns[6].visible"/>
<el-table-column label="锁定状态" align="center" prop="lockState" v-if="columns[8].visible">
<el-table-column label="库位编码" align="center" prop="locationCode" v-if="columns[2].visible"/>
<!-- <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[5].visible">
</el-table-column> -->
<el-table-column label="物料" align="center" prop="materialName" v-if="columns[1].visible"/>
<el-table-column label="库存数量" align="center" prop="inventoryQty" v-if="columns[3].visible"/>
<el-table-column label="锁定状态" align="center" prop="lockState" v-if="columns[4].visible">
<template #default="scope">
<dict-tag :options="lock_state" :value="scope.row.lockState"/>
</template>
</el-table-column>
<el-table-column label="库存状态" align="center" prop="inventoryStatus" v-if="columns[9].visible">
<el-table-column label="库存状态" align="center" prop="inventoryStatus" v-if="columns[5].visible">
<template #default="scope">
<dict-tag :options="inventory_status" :value="scope.row.inventoryStatus"/>
</template>
</el-table-column>
<el-table-column label="仓库" align="center" prop="warehouseCode" v-if="columns[10].visible"/>
<el-table-column label="仓库" align="center" prop="warehouseName" v-if="columns[6].visible"/>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -154,7 +153,7 @@
</el-radio-group>
</el-form-item> -->
<el-form-item label="仓库" prop="storeId">
<el-select v-model="form.warehouseId" placeholder="请选择所属仓库">
<el-select v-model="form.storeId" placeholder="请选择所属仓库">
<el-option
v-for="item in baseStoreList"
:key="item.warehouseId"
@ -206,17 +205,13 @@ const dialog = reactive<DialogOption>({
// 列显隐信息
const columns = ref<FieldOption[]>([
{ key: 0, label: `表主键`, visible: true },
{ key: 1, label: `租户号`, visible: true },
{ key: 2, label: `批次码`, visible: true },
{ key: 3, label: `物料`, visible: true },
{ key: 4, label: `库位编码`, visible: true },
{ key: 5, label: `物料大类`, visible: false },
{ key: 6, label: `库存数量`, visible: true },
{ key: 7, label: `更新时间`, visible: true },
{ key: 8, label: `锁定状态`, visible: true },
{ key: 9, label: `库存状态`, visible: true },
{ key: 10, label: `仓库`, visible: true },
{ key: 0, label: `批次码`, visible: true },
{ key: 1, label: `物料`, visible: true },
{ key: 2, label: `库位编码`, visible: true },
{ key: 3, label: `库存数量`, visible: true },
{ key: 4, label: `锁定状态`, visible: true },
{ key: 5, label: `库存状态`, visible: true },
{ key: 6, label: `仓库`, visible: true },
// { key: 11, label: `${comment}`, visible: true },
// { key: 12, label: `${comment}`, visible: true },
// { key: 13, label: `${comment}`, visible: true },
@ -234,6 +229,7 @@ const initFormData: InventoryForm = {
lockState: undefined,
inventoryStatus: undefined,
storeId: undefined,
warehouseName: undefined,
}
const data = reactive<PageData<InventoryForm, InventoryQuery>>({
form: {...initFormData},
@ -251,6 +247,7 @@ const data = reactive<PageData<InventoryForm, InventoryQuery>>({
materialCode: undefined,
inventoryStatus: undefined,
storeId: undefined,
warehouseName: undefined,
params: {
}
},
@ -390,9 +387,9 @@ const getMaterialCategorySelect = async () => {
};
onMounted(() => {
getMaterialList().then(e => {
materialList.value = e.data
})
// getMaterialList().then(e => {
// materialList.value = e.data
// })
getBaseWarehouseListsss();
getList();
getMaterialCategorySelect();

Write Preview
Loading…
Cancel
Save