diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 64e2dfa6..7b1ce139 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -552,26 +552,10 @@ export default { that.handle_date=that.mlogItem.handle_date; that.handle_user = that.mlogItem.handle_user; that.dialog.check_single = true; - if(row.qct==null&&!that.mlogItem.is_fix){ - that.$API.qm.qct.list.req({qctmat__material:row.material_out,page:0}).then((res)=>{ - if(res.length>0){ - that.qct = res[0].id; - console.log('that.qct',that.qct); - that.$nextTick(() => { - that.$refs.checkDialogSingle.open(type,that.qct); - }); - }else{ - that.$nextTick(() => { - that.$refs.checkDialogSingle.open(type); - }); - } - }) - }else{ - that.qct = row.qct; - that.$nextTick(() => { - that.$refs.checkDialogSingle.open(type,that.qct); - }); - } + that.qct = row.qct; + that.$nextTick(() => { + that.$refs.checkDialogSingle.open(type,that.qct); + }); }, //表单提交方法 mlogSubmit() { diff --git a/src/views/wpm_bx/mlogb_form.vue b/src/views/wpm_bx/mlogb_form.vue index bab8a033..40d9ed33 100644 --- a/src/views/wpm_bx/mlogb_form.vue +++ b/src/views/wpm_bx/mlogb_form.vue @@ -34,7 +34,24 @@ - + + + + + + + @@ -106,6 +123,7 @@ export default { emits: ["success", "closed"], data() { return { + batchs:"", loading: false, mode: "add", titleMap: { @@ -213,6 +231,16 @@ export default { that.materialOptions = res; }); }, + changeMaterial(){ + let that = this; + that.materialOptions.forEach(item=>{ + if(item.id == that.batchs){ + that.form.batch = item.batch; + that.form.wm_in = item.id; + that.form.count_use = item.count_cando; + } + }) + }, //扫描后处理方法 formWminChange(code){ let that = this,codeId='',arr=[]; diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue index d7102689..480d0299 100644 --- a/src/views/wpm_bx/mlogbw_check.vue +++ b/src/views/wpm_bx/mlogbw_check.vue @@ -452,7 +452,7 @@ export default { } that.$API.mtm.mgroup.item.req(that.mgroup).then((res) => { that.process_type=res.process_type; - if(that.mode == 'outs'){//输入 + if(that.mode == 'outs'&&qct!==''&&qct!==null){//输出 that.getdefects(); }else{ that.getList();