Merge branch 'web-v2' into web-v2-pro

src/views/safetyCheck/startInspection/index.vue

@@ -989,7 +989,7 @@
                 dataList[i].lookType=true;
                 for(let b=0;b<dataList[i].checkHazardDtoList.length;b++){
                   //把最外层的code填充到内层
-                  dataList[i].checkHazardDtoList[b].hazardCheckCode=dataList[i].code
+                  dataList[i].checkHazardDtoList[b].hazardCheckCode=dataList[i].hazardCheckCode
                 }
                 //判断新旧数据是否相等,如果相等旧数据填充新数据
                 console.log(this.addForm.checkHazardInfoVoList)
@@ -1064,9 +1064,9 @@
             if(response.data.checkHazardInfoVoList[0]){
               response.data.checkHazardInfoVoList.forEach(function(item) {
                 item.lookType = true;
-                item.checkHazardDtoList.forEach(function(item2) {
-                  item2.hazardCheckCode=item2.code
-                })
+                // item.checkHazardDtoList.forEach(function(item2) {
+                //   item2.hazardCheckCode=item2.code
+                // })
               })
             }
             this.pageType=2