fix:检测项为空时,不传
This commit is contained in:
parent
51bcaa2dbb
commit
ed526af585
|
|
@ -1390,21 +1390,9 @@ export default {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
let ftestdefects = [],ftestitems = [];
|
let ftestdefects = [],ftestitems = [];
|
||||||
let obj = {};
|
let obj = {};
|
||||||
if(row.ftest!==null){
|
that.qct_testitems.forEach((item) => {
|
||||||
ftestdefects = row.ftest.ftestdefects;
|
console.log('row[item.testitem_name]',row[item.testitem_name]);
|
||||||
ftestdefects.forEach((item) => {
|
if(row[item.testitem_name]!==''&&row[item.testitem_name]!==null){
|
||||||
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 = {};
|
let obj0 = {};
|
||||||
obj0.testitem = item.testitem;
|
obj0.testitem = item.testitem;
|
||||||
obj0.test_user = that.formbw.test_user;
|
obj0.test_user = that.formbw.test_user;
|
||||||
|
|
@ -1412,8 +1400,10 @@ export default {
|
||||||
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);
|
||||||
})
|
}
|
||||||
that.qct_defects.forEach((item1) => {
|
})
|
||||||
|
that.qct_defects.forEach((item1) => {
|
||||||
|
if(row[item1.defect_name]!==''&&row[item1.defect_name]!==null){
|
||||||
let obj1 = {};
|
let obj1 = {};
|
||||||
obj1.defect = item1.defect;
|
obj1.defect = item1.defect;
|
||||||
obj1.test_user = that.formbw.test_user;
|
obj1.test_user = that.formbw.test_user;
|
||||||
|
|
@ -1421,8 +1411,8 @@ export default {
|
||||||
obj1.test_date = that.formbw.test_date;
|
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);
|
||||||
})
|
}
|
||||||
}
|
})
|
||||||
obj.note = row.note;
|
obj.note = row.note;
|
||||||
obj.number = row.number;
|
obj.number = row.number;
|
||||||
obj.mioitem = row.mioitem;
|
obj.mioitem = row.mioitem;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue