diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue index b984f63f..abcfd610 100644 --- a/src/views/inm/mioitem_check.vue +++ b/src/views/inm/mioitem_check.vue @@ -1393,17 +1393,22 @@ export default { if(row.ftest!==null){ ftestdefects = row.ftest.ftestdefects; ftestdefects.forEach((item) => { + item.test_user = that.formbw.test_user; + item.test_date = that.formbw.test_date; item.has = row[item.defect_name]?row[item.defect_name]:false; }) ftestitems = row.ftest.ftestitems; ftestitems.forEach((item1) => { + item1.test_user = that.formbw.test_user; + item1.test_date = that.formbw.test_date; item1.test_val_json = row[item1.testitem_name]?row[item1.testitem_name]:null; }) }else{ that.qct_testitems.forEach((item) => { let obj0 = {}; obj0.testitem = item.testitem; - obj0.test_user = row.test_user; + obj0.test_user = that.formbw.test_user; + obj0.test_date = that.formbw.test_date; obj0.testitem_name = item.testitem_name; obj0.test_val_json = row[item.testitem_name]?row[item.testitem_name]:null; ftestitems.push(obj0); @@ -1411,8 +1416,9 @@ export default { that.qct_defects.forEach((item1) => { let obj1 = {}; obj1.defect = item1.defect; - obj1.test_user = row.test_user; + obj1.test_user = that.formbw.test_user; obj1.defect_name = item1.defect_name; + obj1.test_date = that.formbw.test_date; obj1.has = row[item1.defect_name]?row[item1.defect_name]:false; ftestdefects.push(obj1); }) diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue index 6b0927c3..a3d53267 100644 --- a/src/views/wpm_bx/mlogbw_check.vue +++ b/src/views/wpm_bx/mlogbw_check.vue @@ -493,14 +493,14 @@ export default { obj2.addto_wpr = item2.addto_wpr; if(item2.testitem_field_type=='input-number'||item2.testitem_field_type=='input-int'){ - obj2.value = 0; - that.addTemplate[item2.testitem_name] = 0; + obj2.value = null; + that.addTemplate[item2.testitem_name] = null; } if(item2.testitem_field_type=='select-text'||item2.testitem_field_type=='selects-text'){ let str = obj2.testitem_choices.replace(/'/g, '"'); let arr = JSON.parse(str); obj2.testitem_choices = arr; - that.addTemplate[item2.testitem_name] = ''; + that.addTemplate[item2.testitem_name] = null; } that.qct_testitems.push(obj2); }) @@ -552,11 +552,12 @@ export default { obj[item1.defect_name] = false; }) that.qct_testitems.forEach((item2) => { - if(item2.testitem_field_type=='input-number'||item.testitem_field_type=='input-int'){ - obj[item2.testitem_name] = 0; - }else{ - obj[item2.testitem_name] = ""; - } + obj[item2.testitem_name] = null; + // if(item2.testitem_field_type=='input-number'||item.testitem_field_type=='input-int'){ + // obj[item2.testitem_name] = null; + // }else{ + // obj[item2.testitem_name] = ""; + // } }) } } @@ -867,9 +868,6 @@ export default { //执行cd_req_addr,获取检测设备的数据 that.$API.em.cd.req({method:that.setForm.cd_req_addr}).then((res) => { //例:res:[{"ZValue": "-0.18", "machineId": "testMachine","XValue": "-127.5831","YValue": "-12.5523"}] - let x = res.XValue; - let y = res.YValue; - let z = res.ZValue; //遍历检测项,查看是否有cd_expr that.qct_testitems.forEach(item0 => { if(item0.testitem_cd_expr!=null){