zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:采购检验和玻纤日志检验时默认值null

This commit is contained in:
shijing 2025-04-08 13:29:49 +08:00
parent cbb442304d
commit a53c098ecc
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/inm/mioitem_check.vue
View File

@ -1393,17 +1393,22 @@ export default {
if(row.ftest!==null){ if(row.ftest!==null){
ftestdefects = row.ftest.ftestdefects; ftestdefects = row.ftest.ftestdefects;
ftestdefects.forEach((item) => { 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; item.has = row[item.defect_name]?row[item.defect_name]:false;
}) })
ftestitems = row.ftest.ftestitems; ftestitems = row.ftest.ftestitems;
ftestitems.forEach((item1) => { 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; item1.test_val_json = row[item1.testitem_name]?row[item1.testitem_name]:null;
}) })
}else{ }else{
that.qct_testitems.forEach((item) => { that.qct_testitems.forEach((item) => {
let obj0 = {}; let obj0 = {};
obj0.testitem = item.testitem; 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.testitem_name = item.testitem_name;
obj0.test_val_json = row[item.testitem_name]?row[item.testitem_name]:null; obj0.test_val_json = row[item.testitem_name]?row[item.testitem_name]:null;
ftestitems.push(obj0); ftestitems.push(obj0);
@ -1411,8 +1416,9 @@ export default {
that.qct_defects.forEach((item1) => { that.qct_defects.forEach((item1) => {
let obj1 = {}; let obj1 = {};
obj1.defect = item1.defect; obj1.defect = item1.defect;
obj1.test_user = row.test_user; obj1.test_user = that.formbw.test_user;
obj1.defect_name = item1.defect_name; obj1.defect_name = item1.defect_name;
obj1.test_date = that.formbw.test_date;
obj1.has = row[item1.defect_name]?row[item1.defect_name]:false; obj1.has = row[item1.defect_name]?row[item1.defect_name]:false;
ftestdefects.push(obj1); ftestdefects.push(obj1);
}) })

20
src/views/wpm_bx/mlogbw_check.vue
View File

@ -493,14 +493,14 @@ export default {
obj2.addto_wpr = item2.addto_wpr; obj2.addto_wpr = item2.addto_wpr;
if(item2.testitem_field_type=='input-number'||item2.testitem_field_type=='input-int'){ if(item2.testitem_field_type=='input-number'||item2.testitem_field_type=='input-int'){
obj2.value = 0; obj2.value = null;
that.addTemplate[item2.testitem_name] = 0; that.addTemplate[item2.testitem_name] = null;
} }
if(item2.testitem_field_type=='select-text'||item2.testitem_field_type=='selects-text'){ if(item2.testitem_field_type=='select-text'||item2.testitem_field_type=='selects-text'){
let str = obj2.testitem_choices.replace(/'/g, '"'); let str = obj2.testitem_choices.replace(/'/g, '"');
let arr = JSON.parse(str); let arr = JSON.parse(str);
obj2.testitem_choices = arr; obj2.testitem_choices = arr;
that.addTemplate[item2.testitem_name] = ''; that.addTemplate[item2.testitem_name] = null;
} }
that.qct_testitems.push(obj2); that.qct_testitems.push(obj2);
}) })
@ -552,11 +552,12 @@ export default {
obj[item1.defect_name] = false; obj[item1.defect_name] = false;
}) })
that.qct_testitems.forEach((item2) => { that.qct_testitems.forEach((item2) => {
if(item2.testitem_field_type=='input-number'||item.testitem_field_type=='input-int'){ obj[item2.testitem_name] = null;
obj[item2.testitem_name] = 0; // if(item2.testitem_field_type=='input-number'||item.testitem_field_type=='input-int'){
}else{ // obj[item2.testitem_name] = null;
obj[item2.testitem_name] = ""; // }else{
} // obj[item2.testitem_name] = "";
// }
}) })
} }
} }
@ -867,9 +868,6 @@ export default {
//执行cd_req_addr,获取检测设备的数据 //执行cd_req_addr,获取检测设备的数据
that.$API.em.cd.req({method:that.setForm.cd_req_addr}).then((res) => { 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"}] //例：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 //遍历检测项，查看是否有cd_expr
that.qct_testitems.forEach(item0 => { that.qct_testitems.forEach(item0 => {
if(item0.testitem_cd_expr!=null){ if(item0.testitem_cd_expr!=null){