|
@@ -511,7 +511,6 @@
|
|
|
if(doType=='startBtn'){//开始检查
|
|
|
let joinHazardIds=[];
|
|
|
if(this.multipleSelection[0]){
|
|
|
- this.pageType=2;
|
|
|
this.checkOptionList();
|
|
|
this.dialogVisible=false;
|
|
|
for(let i=0;i<this.multipleSelection.length;i++){
|
|
@@ -978,14 +977,17 @@
|
|
|
dataList[i].checkHazardDtoList[b].hazardCheckCode=dataList[i].code
|
|
|
}
|
|
|
//判断新旧数据是否相等,如果相等旧数据填充新数据
|
|
|
- for(let k=0;k<this.addForm.checkHazardInfoVoList.length;k++){
|
|
|
- if(dataList[i].joinHazardId==this.addForm.checkHazardInfoVoList[k].joinHazardId){
|
|
|
- dataList[i]=this.addForm.checkHazardInfoVoList[k]
|
|
|
+ console.log(this.addForm.checkHazardInfoVoList)
|
|
|
+ if(this.addForm.checkHazardInfoVoList[0]){
|
|
|
+ for(let k=0;k<this.addForm.checkHazardInfoVoList.length;k++){
|
|
|
+ if(dataList[i].joinHazardId==this.addForm.checkHazardInfoVoList[k].joinHazardId){
|
|
|
+ dataList[i]=this.addForm.checkHazardInfoVoList[k]
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
- this.addForm.checkHazardInfoVoList=dataList
|
|
|
+ this.$set(this.addForm,'checkHazardInfoVoList',dataList);
|
|
|
+ this.pageType=2;
|
|
|
}
|
|
|
|
|
|
});
|