diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue index 8389b718..d05f77dd 100644 --- a/src/views/wpm_gx/f_mlogs_form.vue +++ b/src/views/wpm_gx/f_mlogs_form.vue @@ -21,8 +21,9 @@ { + let params = {}; + params.mtaskx = that.mtask; + params.mgroup = that.mgroup; + params.tag = 'todo'; + params.page = 0; + if(that.is_fix){ + params.state = 30; + }else{ + params.state = 10; + params.material = that.material_in; + } + that.$API.wpm.wmaterial.list.req(params).then((res) => { that.materialOptions = res; if(that.codeText!==''){ res.forEach(item=>{ diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue index 54c29816..cc2fbe3d 100644 --- a/src/views/wpm_gx/fmlog_detail.vue +++ b/src/views/wpm_gx/fmlog_detail.vue @@ -123,6 +123,7 @@ :fmlog="fmlogId" :mgroup="mgroup" :route="route" + :is_fix="is_fix" :process="processId" @success="handleSaveSuccess" @closed="dialog.save = false" @@ -210,6 +211,7 @@ export default { batchContains:[], test_file:'', deptId: "", + is_fix:false, visible: false, isSaveing: false, printVisible:false, @@ -250,6 +252,7 @@ export default { that.$API.wpm.fmlog.item.req(that.fmlogId).then((res) => { that.fmlogItem = res; that.route = res.route; + that.is_fix = res.is_fix; that.paramsWm.mgroup = res.mgroup; that.apiObjWm = that.$API.wpm.wmaterial.list; that.getMlogs();