From 6b05f21ce60d72549eeea28cfc1be612e767438a Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 19 Sep 2025 11:27:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=87=E7=AD=BE=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=88=87=E7=89=87=E6=95=B0=E9=87=8F=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlog_detail.vue | 51 +++++++++---------------- src/views/wpm_bx/mlog_form.vue | 23 +++++++++++ src/views/wpm_bx/mlogbw_check_table.vue | 17 ++++++++- 3 files changed, 56 insertions(+), 35 deletions(-) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 931df1af..e13e1379 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -17,35 +17,17 @@ - {{ - mlogItem.mgroup_name - }} - {{ - mlogItem.equipment_name - }} - {{ - mlogItem.belong_dept_name - }} - {{ - mlogItem.handle_user_name - }} + {{mlogItem.mgroup_name}} + {{mlogItem.equipment_name}} + {{mlogItem.belong_dept_name}} + {{mlogItem.handle_user_name}} - {{ - mlogItem.create_time - }} - {{ - mlogItem.handle_date - }} - {{ - mlogItem.work_start_time - }} - {{ - mlogItem.work_end_time - }} + {{mlogItem.create_time}} + {{mlogItem.handle_date}} + {{mlogItem.work_start_time}} + {{mlogItem.work_end_time}} 查看 @@ -367,7 +349,7 @@ :wm = "wm" :dept="deptId" :mgroup="mgroup" - :material_in="mlogItem.material_in" + :cutCount="cutCount" :material_out="mlogItem.material_out" :mgroupName= "mlogItem.mgroup_name" :isSubmit="isSubmit" @@ -566,6 +548,7 @@ export default { }, qct:null, defectlist:[], + cutCount:0, batchNumber:'', hasRoute:false, isSubmit:false, @@ -593,13 +576,9 @@ export default { let that = this; that.$API.wpm.mlog.item.req(that.mlogId).then((res) => { that.mlogItem = res; - that.checkTableShow = true; that.isSubmit = res.submit_time==null?false:true; if(that.processType=='10'&&that.mlogItem.material_out_&&that.mlogItem.material_out_.tracking==20){ that.getMlogbw(); - // if(that.mlogItem.qct!==null){ - // that.getdefects(that.mlogItem.qct); - // } } if(res.route!==null){ that.hasRoute = true; @@ -608,7 +587,12 @@ export default { if(res.oinfo_json_&&res.oinfo_json_!==null){ for(let key in res.oinfo_json_){ let obj = {}; - obj.key = key; + if(key=='cutCount'){ + that.cutCount = res.oinfo_json_[key]; + obj.key = '切分数量'; + }else{ + obj.key = key; + } obj.value = res.oinfo_json_[key]; that.oinfo_json.push(obj); } @@ -621,6 +605,7 @@ export default { } that.materialIn = res.material_in; 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; diff --git a/src/views/wpm_bx/mlog_form.vue b/src/views/wpm_bx/mlog_form.vue index 6215a338..9ed23110 100644 --- a/src/views/wpm_bx/mlog_form.vue +++ b/src/views/wpm_bx/mlog_form.vue @@ -48,6 +48,7 @@ clearable filterable style="width: 100%" + @change="routeChange" > + + + + + + { + if(item.id == that.form.route&&that.route_code=='tuomoceliang'){ + that.form.cutCount = item.div_number; + } + }) + }, changeMtask(){ let that = this; that.mtaskOptions.forEach((item) => { @@ -446,6 +466,9 @@ export default { that.testitems.forEach((item) => { oinfo_json[item.id] = item.value; }) + if(that.route_code=="tuomoceliang"){ + oinfo_json.cutCount = that.form.cutCount; + } that.form.oinfo_json = oinfo_json; if (that.mode === "add") { that.$API.wpm.mlog.init.req(that.form).then((res) => { diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index 4ba7fe9c..f41e3820 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -359,6 +359,10 @@ export default { processType:{ type:String, default:"", + }, + cutCount:{ + type:Number, + default:0, } }, emits: ["success", "closed"], @@ -433,7 +437,7 @@ export default { watch: {}, mounted() { let that = this; - console.log('that.material_out',that.material_out) + console.log('that.cutCount',that.cutCount) if(that.processType=='20'){ that.canMultiple = true; } @@ -510,6 +514,7 @@ export default { }, testdefectss(res){ let that = this; + console.log('res',res) res.qct_defects.forEach((item) => { that.addTemplate[item.defect_name] = false; let obj = Object.assign({}, item); @@ -527,6 +532,9 @@ export default { obj2.addto_wpr = item2.addto_wpr; if(item2.testitem_field_type=='input-number'||item2.testitem_field_type=='input-int'){ obj2.value = null; + if(item2.testitem_name == '切片数'){ + obj2.value = Number(that.cutCount); + } that.addTemplate[item2.testitem_name] = null; } if(item2.testitem_field_type=='select-text'||item2.testitem_field_type=='selects-text'){ @@ -535,6 +543,7 @@ export default { obj2.testitem_choices = arr; that.addTemplate[item2.testitem_name] = null; } + console.log('obj2',obj2) that.qct_testitems.push(obj2); } }) @@ -587,7 +596,11 @@ export default { obj[item1.defect_name] = false; }) that.qct_testitems.forEach((item2) => { - obj[item2.testitem_name] = null; + if(item2.testitem_name == '切片数'){ + obj[item2.testitem_name] = Number(that.cutCount); + }else{ + obj[item2.testitem_name] = null; + } }) } }