diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 94e296b9..3b64422b 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -677,11 +677,18 @@ export default { } that.materialIn = res.material_in!==null?res.material_in:res.mlogb_full[0]?res.mlogb_full[0].material_in:null; that.deptId = res.belong_dept; - that.checkTableShow = true; that.apiObjWm = that.$API.wpm.wmaterial.list; - that.$API.wpm.mlogb.list.req(that.paramsOut).then((res) => { - that.tableData2 = res; - }) + if(res.qct!==null){ + that.checkTableShow = true; + }else{ + that.$API.wpm.mlogb.list.req(that.paramsOut).then((res_out) => { + that.tableData2 = res_out; + if(res.is_fix&&res_out[0].qct!==null){ + that.mlogItem.qct = res_out[0].qct; + } + that.checkTableShow = true; + }) + } if(!res.is_fix){ that.getcutCount(res.material_in); that.$API.mtm.routepack.list.req({page:0,search:res.routepack_name}).then((res) => { diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index d63ff6f6..7a189570 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -536,6 +536,8 @@ export default { }).catch(()=>{ that.getList(); }) + }else{ + that.getList(); } } that.visible = true;