|
|
@@ -1250,6 +1250,8 @@
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
+ console.log(selectedData,'selectedData')
|
|
|
+
|
|
|
|
|
|
this.$refs.detailRef.openDia(
|
|
|
index,
|
|
|
@@ -1261,7 +1263,9 @@
|
|
|
);
|
|
|
},
|
|
|
sampleListChange(sampleList) {
|
|
|
- this.sampleList = sampleList;
|
|
|
+ this.$set(this, 'sampleList', sampleList);
|
|
|
+
|
|
|
+ // this.sampleList = sampleList;
|
|
|
},
|
|
|
inputWeight(row, index) {
|
|
|
// 计算所有样本的总重量
|
|
|
@@ -1434,8 +1438,10 @@
|
|
|
return;
|
|
|
}
|
|
|
} else {
|
|
|
- // this.$set(this.sampleList, null, list);
|
|
|
- this.sampleList = list;
|
|
|
+ this.$set(this, 'sampleList', list);
|
|
|
+ // console.log(this.sampleList, 'this.sampleList');
|
|
|
+ // return
|
|
|
+ // this.sampleList = list;
|
|
|
this.calculate(this.sampleList);
|
|
|
}
|
|
|
this.activeName = '2';
|
|
|
@@ -1462,12 +1468,20 @@
|
|
|
}
|
|
|
|
|
|
if (this.schemeList.length != 0) {
|
|
|
- this.sampleList.forEach((item) => {
|
|
|
+ // alert(1)
|
|
|
+
|
|
|
+ this.sampleList.forEach((item, index) => {
|
|
|
if (item.qualitySampleTemplateList.length == 0) {
|
|
|
- item.qualitySampleTemplateList.push(...this.schemeList);
|
|
|
+ let arr=JSON.parse(JSON.stringify(this.schemeList))
|
|
|
+ arr.forEach((el) => {
|
|
|
+ el.qualityResults = item.qualityResults;
|
|
|
+ });
|
|
|
+ console.log(arr,'aaa')
|
|
|
+ this.$set(this.sampleList[index], 'qualitySampleTemplateList', arr);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
+
|
|
|
this.$refs.detailRef.openDia(
|
|
|
null,
|
|
|
null,
|