heyang

src/views/comprehensive/laboratoryManagement/subject/associationConfiguration.vue

@@ -141,8 +141,8 @@
         <el-form-item label="" class="form-item" label-width="20px">
           <span class="del-hazard el-icon-error" style="line-height:40px;font-size:24px;" @click="delHazard(index)"></span>
         </el-form-item>
-        <el-form-item label="" class="form-item" v-if="item.xyId">
-          <p class="look-code-p" @click="qrCodeDialogButton(1,item.xyId,item.anotherName+'-'+item.anotherCode)">查看二维码</p>
+        <el-form-item label="" class="form-item" v-if="item.hazardId">
+          <p class="look-code-p" @click="qrCodeDialogButton(1,item.hazardId,item.anotherName+'-'+item.anotherCode)">查看二维码</p>
         </el-form-item>
       </div>
       <div class="bottom-button-box">
@@ -198,8 +198,8 @@
         <el-form-item label="" class="form-item" label-width="20px">
           <span class="del-hazard el-icon-error" style="line-height:40px;font-size:24px;" @click="delHazard(index)"></span>
         </el-form-item>
-        <el-form-item label="" class="form-item" v-if="item.xyId">
-          <p class="look-code-p" @click="qrCodeDialogButton(1,item.xyId,item.anotherName+'-'+item.anotherCode)">查看二维码</p>
+        <el-form-item label="" class="form-item" v-if="item.hazardId">
+          <p class="look-code-p" @click="qrCodeDialogButton(1,item.hazardId,item.anotherName+'-'+item.anotherCode)">查看二维码</p>
         </el-form-item>
       </div>
       <div class="bottom-button-box">

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

@@ -135,7 +135,7 @@
               <el-form-item label="隐患照片" :prop="'checkHazardDtoList.'+index+'.uploadDtoList'" :rules="rules.uploadDtoList" label-width="123px">
                 <div class="for-img-box" v-for="(img,imgIndex) in item.uploadDtoList" :key="imgIndex">
                   <img class="for-img" :src="img.fileUrl" @click="lookImg(item.uploadDtoList,imgIndex)">
-                  <p class="for-del-button el-icon-circle-close" @click="delImg(index,imgIndex)"></p>
+                  <p class="for-del-button el-icon-circle-close" @click="delImg('',index,imgIndex)"></p>
                 </div>
                 <el-upload
                   style="display: inline-block;overflow: hidden"
@@ -215,7 +215,7 @@
               <el-form-item v-if="item2.checkFlag==0" label="隐患照片" :prop="'checkHazardInfoVoList.'+index+'.checkHazardDtoList.'+index2+'.uploadDtoList'" :rules="rules.uploadDtoList" label-width="123px">
                 <div class="for-img-box" v-for="(img,imgIndex) in item2.uploadDtoList" :key="imgIndex">
                   <img class="for-img" :src="img.fileUrl" @click="lookImg(item2.uploadDtoList,imgIndex)">
-                  <p class="for-del-button el-icon-circle-close" @click="delImg(index,imgIndex)"></p>
+                  <p class="for-del-button el-icon-circle-close" @click="delImg(item2,index,imgIndex)"></p>
                 </div>
                 <el-upload
                   v-if="item2.uploadDtoList.length<5"
@@ -406,8 +406,14 @@
         this.$parent.goAddPage(1);
       },
       // 删除图片
-      delImg(index,imgIndex){
-        this.addForm.checkHazardDtoList[index].uploadDtoList.splice(imgIndex,1);
+      delImg(item,index,imgIndex){
+        console.log(item)
+        if(this.addForm.checkCategory==1){//综合检查
+          this.addForm.checkHazardDtoList[index].uploadDtoList.splice(imgIndex,1);
+        }else if(this.addForm.checkCategory==2){//专项检查
+          item.uploadDtoList.splice(imgIndex,1);
+        }
+
       },
       //收起/展开
       dataLookButton(item){

src/views/safetyCheck/startInspection/index.vue

@@ -995,6 +995,7 @@
             label:"实验室自查",
           }]);
           this.pageType=1;
+          this.addForm.checkHazardInfoVoList=[];
         }else if(type == 2){
           this.pageType=0;
           this.$set(this.addForm,'checkType',null);
@@ -1083,8 +1084,7 @@
       },
       //删除检查项
       delCheckHazardDtoList(index,index2){
-        console.log(index)
-        console.log(index2)
+
         let self = this;
         this.$confirm('是否确认删除?', "警告", {
           confirmButtonText: "确定",
@@ -1094,7 +1094,7 @@
           if(self.addForm.checkCategory==1){//综合检查
             self.addForm.checkHazardDtoList.splice(index,1);
           }else if(self.addForm.checkCategory==2){//专项检查
-            if(index2){//小检查项
+            if(index2>=0){//小检查项
               self.addForm.checkHazardInfoVoList[index].checkHazardDtoList.splice(index2,1);
             }else{//检查设备
               self.addForm.checkHazardInfoVoList.splice(index,1);