diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 70098762..b7643e8f 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -564,7 +564,6 @@ export default { this.paramsOut.mlog = this.mlogId; this.apiObj = this.$API.wpm.mlogb.list; let userInfo = that.$TOOL.data.get("USER_INFO"); - that.addTemplate.mlog = that.mlogItem.id; that.addTemplate.equipment = ""; that.addTemplate.handle_user = userInfo.id; that.addTemplate.handle_user_name = userInfo.name; @@ -586,6 +585,7 @@ export default { let that = this; that.$API.wpm.mlog.item.req(that.mlogId).then((res) => { that.mlogItem = res; + that.addTemplate.mlog = that.mlogItem.id; that.isSubmit = res.submit_time==null?false:true; if(that.processType=='10'&&that.mlogItem.material_out_&&that.mlogItem.material_out_.tracking==20){ that.getMlogbw(); diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index dba0bcd8..d1fb701f 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -408,13 +408,22 @@ export default { if(that.qct!==''&&that.qct!==null){//输出 that.getdefects(); }else{ - if(that.route_code=='chengpingfanxiu'&&that.material_in!==''&&that.material_in!==null){//输入 - that.$API.qm.qct.getQct.req({ material: that.material_in,type:'out',tag:'fix' }).then((res) => { - that.qctId = res.id; - that.testdefectss(res); - }).catch(()=>{ - that.getList(); - }) + if(that.material_in!==''&&that.material_in!==null){//输入 + if(that.route_code=='chengpingfanxiu'){ + that.$API.qm.qct.getQct.req({ material: that.material_in,type:'out',tag:'fix' }).then((res) => { + that.qctId = res.id; + that.testdefectss(res); + }).catch(()=>{ + that.getList(); + }) + }else{ + that.$API.qm.qct.getQct.req({ material: that.material_in,type:'out',tag:'process' }).then((res) => { + that.qctId = res.id; + that.testdefectss(res); + }).catch(()=>{ + that.getList(); + }) + } }else if(that.material_out!==''&&that.material_out!==null){//输入 that.$API.qm.qct.getQct.req({ material: that.material_out,type:'out',tag:'process' }).then((res) => { that.qctId = res.id;