kelvin/wms-dj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
汤锦科 2024-12-03 17:24:44 +08:00
commit 4d5c3ea548
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/mes/wm/inPlan/index.vue
View File

@ -70,7 +70,7 @@
<el-table-column label="计划编码" align="center" prop="planCode"/>
<el-table-column label="入库类型" align="center" prop="planTypeId">
<template slot-scope="scope">
{{ filterInPlanType(scope.row.planTypeId) }}
{{ filterInPlanType(scope.row.planTypeCode) }}
</template>
</el-table-column>
<el-table-column label="计划类型" align="center" prop="sourceType">
@ -408,15 +408,15 @@ export default {
},
/**
* 过滤出入库类型
* @param id 出入库类型ID
* @param code 出入库类型 编码
* @returns {*}
*/
filterInPlanType(id) {
const filter = this.inPlanTypeList.filter(item => item.typeId === id);
filterInPlanType(code) {
const filter = this.inPlanTypeList.filter(item => item.code === code);
if (filter.length) {
return filter[0].name
}
return id
return code
},
/** 入库类型选择器回调 */
handlePlanTypeSelectChange(typeId) {

12
src/views/mes/wm/wmsInTask/index.vue
View File

@ -32,7 +32,7 @@
<el-table-column label="目标库位" align="center" prop="cellName"/>
<el-table-column label="出入库类型" align="center" prop="planTypeId">
<template slot-scope="scope">
{{ filterInPlanType(scope.row.planTypeId) }}
{{ filterInPlanType(scope.row.planTypeCode) }}
</template>
</el-table-column>
<el-table-column label="物料" align="center" prop="materialName"/>
@ -224,15 +224,15 @@ export default {
},
/**
* 过滤出入库类型
* @param id 出入库类型ID
* @param code 出入库类型 编码
* @returns {*}
*/
filterInPlanType(id) {
const filter = this.inPlanTypeList.filter(item => item.typeId === id);
filterInPlanType(code) {
const filter = this.inPlanTypeList.filter(item => item.code === code);
if (filter.length) {
return filter[0].name
}
return id
return code
},
/**
* 下发任务至 WCS
@ -280,6 +280,8 @@ export default {
issueInTaskWcsDJ(param).then(res => {
this.$modal.msgSuccess("下发成功");
})
} else {
console.error("入库类型不匹配: " + task.planTypeCode)
}
},
/**