refactor(wms): 优化联动单和库存选择界面

-调整联动单审批按钮显示逻辑
- 修复库存选择界面物料大类筛选功能
-优化代码格式和注释
master
zangch@mesnac.com 4 months ago
parent 4d0a0bdfa4
commit 21df05fe66

@ -11,16 +11,16 @@
<el-form-item label="库位编码" prop="locationCode"> <el-form-item label="库位编码" prop="locationCode">
<el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="物料大类" prop="materialCategoryId"> <!-- <el-form-item label="物料大类" prop="materialCategoryId">
<el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable> <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable>
<el-option <el-option
v-for="item in mategoryOptions" v-for="item in mategoryOptions"
:key="item.materialCategoryId" :key="item.materialCategoryId"
:label="item.materialCategoryName" :label="item.materialCategoryName"
:value="item.materialCategoryId" :value="item.materialCategoryId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
@ -29,9 +29,9 @@
</el-card> </el-card>
<el-card style="margin-top: 8px" shadow="never"> <el-card style="margin-top: 8px" shadow="never">
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="inventoryList" :data="inventoryList"
@row-click="handleRowClick" @row-click="handleRowClick"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
ref="tableRef" ref="tableRef"
@ -57,12 +57,12 @@
<el-table-column label="仓库编码" align="center" prop="warehouseCode" /> <el-table-column label="仓库编码" align="center" prop="warehouseCode" />
</el-table> </el-table>
<pagination <pagination
v-show="total > 0" v-show="total > 0"
:total="total" :total="total"
v-model:page="queryParams.pageNum" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</el-card> </el-card>
</div> </div>
@ -80,7 +80,7 @@ const props = defineProps({
default: undefined default: undefined
}, },
warehouseId: { warehouseId: {
type: [String, Number], type: [String, Number],
default: undefined default: undefined
} }
}); });
@ -123,7 +123,7 @@ const getList = async () => {
loading.value = true; loading.value = true;
try { try {
const res = await listInventory(queryParams.value); const res = await listInventory(queryParams.value);
inventoryList.value = res.rows.filter(item => inventoryList.value = res.rows.filter(item =>
item.inventoryQty > 0 && // item.inventoryQty > 0 && //
(item.lockState === '0' || item.lockState === null || item.lockState === undefined || item.lockState === '') && // (item.lockState === '0' || item.lockState === null || item.lockState === undefined || item.lockState === '') && //
item.inventoryStatus === '1' // item.inventoryStatus === '1' //
@ -173,7 +173,7 @@ watch(
); );
onMounted(async () => { onMounted(async () => {
await getMaterialCategorySelect(); // await getMaterialCategorySelect();
await getList(); await getList();
}); });
@ -187,4 +187,4 @@ defineExpose({
.p-2 { .p-2 {
padding: 8px; padding: 8px;
} }
</style> </style>

@ -85,7 +85,7 @@
<!-- <el-button size="small" @click.stop="parentTableUpdate(scope.row)"> <!-- <el-button size="small" @click.stop="parentTableUpdate(scope.row)">
修改 修改
</el-button>--> </el-button>-->
<el-button size="small" @click.stop="parentTableApprove(scope.row)" v-if="scope.row.auditStatus==0&&scope.row.auditBy!=''"> <el-button size="small" @click.stop="parentTableApprove(scope.row)" v-if="scope.row.auditStatus == '0' ">
</el-button> </el-button>
<el-button <el-button
size="small" size="small"
@ -376,13 +376,13 @@
</el-form-item> </el-form-item>
<!-- <el-form-item label="审核人" prop="auditBy"> <!-- <el-form-item label="审核人" prop="auditBy">
<el-select v-model="parentTableInfoForm.auditBy" placeholder="请选择审核人"> <el-select v-model="parentTableInfoForm.auditBy" placeholder="请选择审核人">
<el-option <el-option
v-for="item in userList" v-for="item in userList"
:key="item.userId" :key="item.userId"
:label="item.userName" :label="item.userName"
:value="item.userName" :value="item.userName"
/> />
</el-select> </el-select>
</el-form-item>--> </el-form-item>-->
</el-form> </el-form>
<template #footer> <template #footer>
@ -1174,7 +1174,7 @@ const loadAllTasks = async () => {
const childrenTablePrint = async (row) => { const childrenTablePrint = async (row) => {
try { try {
// //
const result = await validatePrintable(row.aoDId); const result = await validatePrintable({aoDId: row.aoDId});
if (!result.data) { if (!result.data) {
ElMessage.warning('该调拨明细已经打印过,不允许重复打印'); ElMessage.warning('该调拨明细已经打印过,不允许重复打印');
return; return;

Loading…
Cancel
Save