diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue index 479b6f1e..ed33a910 100644 --- a/src/views/wpm_gx/mlog_detail.vue +++ b/src/views/wpm_gx/mlog_detail.vue @@ -804,6 +804,7 @@ export default { this.dialog.save = true; this.$nextTick(() => { this.$refs.saveDialog.open(); + this.codeText = ''; }); }, handleSaveSuccess() { diff --git a/src/views/wpm_gx/mlogb_form.vue b/src/views/wpm_gx/mlogb_form.vue index 8cf5cf9e..28c891b2 100644 --- a/src/views/wpm_gx/mlogb_form.vue +++ b/src/views/wpm_gx/mlogb_form.vue @@ -18,6 +18,27 @@ + + + + + + + + + @@ -76,7 +99,7 @@ { that.codeBatch = res.batch; - this.getMaterial(); + that.paramsM.search = that.codeBatch; + that.apiObjM = that.$API.wpm.wmaterial.list; + // this.getMaterial(); }).catch((err) => { - that.getMaterial(); + that.apiObjM = that.$API.wpm.wmaterial.list; + // that.getMaterial(); }) }else{ - that.getMaterial(); + that.apiObjM = that.$API.wpm.wmaterial.list; + // that.getMaterial(); } if(that.is_fix){}else{ this.getdefects(); @@ -292,6 +333,8 @@ export default { let obj = {}; obj.mtaskx =that.form.mtask; obj.mgroup = that.mgroup; + obj.search = that.codeBatch; + // obj.query = "{id,batch,count,material,material_name,defect_name}"; obj.page =0; if(that.is_fix){//来料未完成的返修品&&出料已完成的返修品和不合格品 obj.tag = 'canfix'; @@ -413,6 +456,8 @@ export default { if (valid) { that.isSaveing = true; that.form.mlog = that.mlog; + that.form.batch = that.selectObj.batch; + that.form.count_use = that.selectObj.count_cando; if(that.mgroupMtype==10&&that.cellsList.length>0){ that.form.count_json_from = that.cellsList; } @@ -428,6 +473,8 @@ export default { }) that.form.mlogbdefect = mlogbdefect; that.form.count_pn_jgqbl = count_pn_jgqbl; + console.log(that.form); + console.log(that.selectObj); that.$API.wpm.mlogb.in.req(that.form).then((res) => { that.isSaveing = false; that.$emit("success");