|
@@ -461,6 +461,22 @@
|
|
|
netWeight: null,
|
|
netWeight: null,
|
|
|
qualityTemplateIds: [],
|
|
qualityTemplateIds: [],
|
|
|
dataType: 2
|
|
dataType: 2
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ categoryId: '',
|
|
|
|
|
+ checkDepart: null,
|
|
|
|
|
+ checkFormula: null,
|
|
|
|
|
+ checkPerson: null,
|
|
|
|
|
+ checkProportion: null,
|
|
|
|
|
+ createTime: '',
|
|
|
|
|
+ createUserId: '',
|
|
|
|
|
+ inspectionStandards: null,
|
|
|
|
|
+ isComeCheck: 0,
|
|
|
|
|
+ // level: '',
|
|
|
|
|
+ levelItem: null,
|
|
|
|
|
+ netWeight: null,
|
|
|
|
|
+ qualityTemplateIds: [],
|
|
|
|
|
+ dataType: 3
|
|
|
}
|
|
}
|
|
|
];
|
|
];
|
|
|
|
|
|
|
@@ -1055,9 +1071,20 @@
|
|
|
}
|
|
}
|
|
|
if (!info.categoryQms || !info.categoryQms?.length) {
|
|
if (!info.categoryQms || !info.categoryQms?.length) {
|
|
|
this.categoryQms = [...copyObj(defCategoryQms)];
|
|
this.categoryQms = [...copyObj(defCategoryQms)];
|
|
|
- } else if (info.categoryQms.length == 1) {
|
|
|
|
|
|
|
+ } else if (info.categoryQms.length < defCategoryQms.length) {
|
|
|
//历史数据处理
|
|
//历史数据处理
|
|
|
- this.categoryQms = [info.categoryQms[0], copyObj(defCategoryQms[1])];
|
|
|
|
|
|
|
+ // let num= defCategoryQms.length-info.categoryQms.length
|
|
|
|
|
+
|
|
|
|
|
+ // info.categoryQms.push();
|
|
|
|
|
+ this.categoryQms = [
|
|
|
|
|
+ ...info.categoryQms,
|
|
|
|
|
+ ...copyObj(
|
|
|
|
|
+ defCategoryQms.slice(
|
|
|
|
|
+ info.categoryQms.length,
|
|
|
|
|
+ defCategoryQms.length
|
|
|
|
|
+ )
|
|
|
|
|
+ )
|
|
|
|
|
+ ];
|
|
|
} else {
|
|
} else {
|
|
|
this.categoryQms = info.categoryQms;
|
|
this.categoryQms = info.categoryQms;
|
|
|
}
|
|
}
|