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

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

@ -11,7 +11,7 @@
<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"
@ -20,7 +20,7 @@
: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>
@ -173,7 +173,7 @@ watch(
); );
onMounted(async () => { onMounted(async () => {
await getMaterialCategorySelect(); // await getMaterialCategorySelect();
await getList(); await getList();
}); });

@ -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"
@ -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