fix:采购检验时默认值null
This commit is contained in:
parent
fd237101b0
commit
cbb442304d
|
@ -799,7 +799,6 @@
|
||||||
<el-input-number
|
<el-input-number
|
||||||
v-if="item.testitem_field_type=='input-number'"
|
v-if="item.testitem_field_type=='input-number'"
|
||||||
v-model="scope.row[item.testitem_name]"
|
v-model="scope.row[item.testitem_name]"
|
||||||
:min="0"
|
|
||||||
:disabled="!scope.row.isEdit"
|
:disabled="!scope.row.isEdit"
|
||||||
class="width-100"
|
class="width-100"
|
||||||
controls-position="right"
|
controls-position="right"
|
||||||
|
@ -809,7 +808,6 @@
|
||||||
<el-input-number
|
<el-input-number
|
||||||
v-if="item.testitem_field_type=='input-int'"
|
v-if="item.testitem_field_type=='input-int'"
|
||||||
v-model="scope.row[item.testitem_name]"
|
v-model="scope.row[item.testitem_name]"
|
||||||
:min="0"
|
|
||||||
:disabled="!scope.row.isEdit"
|
:disabled="!scope.row.isEdit"
|
||||||
class="width-100"
|
class="width-100"
|
||||||
controls-position="right"
|
controls-position="right"
|
||||||
|
@ -1042,7 +1040,7 @@ export default {
|
||||||
// 初始化表单字段,确保每个字段都有默认值
|
// 初始化表单字段,确保每个字段都有默认值
|
||||||
this.qct_testitems.forEach(item => {
|
this.qct_testitems.forEach(item => {
|
||||||
if (!(item.testitem_name in this.form)) {
|
if (!(item.testitem_name in this.form)) {
|
||||||
this.form[item.testitem_name] = ''
|
this.form[item.testitem_name] = null;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -1090,17 +1088,17 @@ export default {
|
||||||
that.qct_testitems = [];
|
that.qct_testitems = [];
|
||||||
res.qct_testitems.forEach((item2) => {
|
res.qct_testitems.forEach((item2) => {
|
||||||
let obj2 = Object.assign({}, item2);
|
let obj2 = Object.assign({}, item2);
|
||||||
obj2.value = '';
|
obj2.value = null;
|
||||||
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);
|
||||||
})
|
})
|
||||||
|
@ -1123,7 +1121,7 @@ export default {
|
||||||
if(res0.qct_defects.length>0){
|
if(res0.qct_defects.length>0){
|
||||||
res0.qct_defects.forEach((item1) => {
|
res0.qct_defects.forEach((item1) => {
|
||||||
let obj = Object.assign({}, item1);
|
let obj = Object.assign({}, item1);
|
||||||
obj.value = '';
|
obj.value = false;
|
||||||
that.qct_defects.push(obj);
|
that.qct_defects.push(obj);
|
||||||
})
|
})
|
||||||
}else{
|
}else{
|
||||||
|
@ -1132,7 +1130,7 @@ export default {
|
||||||
if(res0.qct_testitems.length>0){
|
if(res0.qct_testitems.length>0){
|
||||||
res0.qct_testitems.forEach((item2) => {
|
res0.qct_testitems.forEach((item2) => {
|
||||||
let obj2 = Object.assign({}, item2);
|
let obj2 = Object.assign({}, item2);
|
||||||
obj2.value = '';
|
obj2.value = null;
|
||||||
if(obj2.testitem_field_type=='select-text'||obj2.testitem_field_type=='selects-text'){
|
if(obj2.testitem_field_type=='select-text'||obj2.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);
|
||||||
|
@ -1186,11 +1184,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] = "";
|
||||||
|
// }
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
that.mioitemwList.push(obj);
|
that.mioitemwList.push(obj);
|
||||||
|
@ -1398,16 +1397,15 @@ export default {
|
||||||
})
|
})
|
||||||
ftestitems = row.ftest.ftestitems;
|
ftestitems = row.ftest.ftestitems;
|
||||||
ftestitems.forEach((item1) => {
|
ftestitems.forEach((item1) => {
|
||||||
item1.test_val_json = row[item1.testitem_name]?row[item1.testitem_name]:"";
|
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 = row.test_user;
|
||||||
obj0.testitem_name = item.testitem_name;
|
obj0.testitem_name = item.testitem_name;
|
||||||
obj0.test_val_json = row[item.testitem_name]?row[item.testitem_name]:"";
|
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) => {
|
||||||
|
|
Loading…
Reference in New Issue