Merge branch '3.3.7-scxjy' into web-v2

src/views/safetyCheck/components/addPage/addPage.vue

@@ -448,7 +448,7 @@
               response.data.checkHazardInfoVoList.forEach(function(item) {
                 item.lookType = true;
                 item.checkHazardDtoList.forEach(function(item2) {
-                  item2.hazardCheckCode=item2.code
+                  //item2.hazardCheckCode=item2.code
                   item2.voiceRemark=item2.voiceRemark?JSON.parse(item2.voiceRemark):[];
                 })
               })

src/views/safetyCheck/startInspection/index.vue

@@ -987,10 +987,10 @@
               let dataList=JSON.parse(JSON.stringify(response.data))
               for(let i=0;i<dataList.length;i++){
                 dataList[i].lookType=true;
-                for(let b=0;b<dataList[i].checkHazardDtoList.length;b++){
-                  //把最外层的code填充到内层
-                  dataList[i].checkHazardDtoList[b].hazardCheckCode=dataList[i].hazardCheckCode
-                }
+                // for(let b=0;b<dataList[i].checkHazardDtoList.length;b++){
+                //   //把最外层的code填充到内层
+                //   dataList[i].checkHazardDtoList[b].hazardCheckCode=dataList[i].hazardCheckCode
+                // }
                 //判断新旧数据是否相等,如果相等旧数据填充新数据
                 console.log(this.addForm.checkHazardInfoVoList)
                 if(this.addForm.checkHazardInfoVoList[0]){