Merge branch 'VERSIONS-AnQuanJianCha' into leb-web-dev

src/views/safetyCheck/components/initiateInspect/initiateInspect.vue

@@ -459,7 +459,24 @@
             checkRectifyVoList:[],
           }
           if(response.data){
-            obj.checkRectifyVoList = response.data.checkRectifyVoList?response.data.checkRectifyVoList:[]
+            if(this.initiateInspectData.editType){
+              let rectifyUploadList = [];
+              for(let i=0;i<response.data.checkRectifyVoList[0].rectifyUploadList.length;i++){
+                rectifyUploadList.push({
+                  fileName:response.data.checkRectifyVoList[0].rectifyUploadList[i].fileName,
+                  fileUrl:response.data.checkRectifyVoList[0].rectifyUploadList[i].fileUrl,
+                  fileType:response.data.checkRectifyVoList[0].rectifyUploadList[i].fileType,
+                })
+              }
+              this.$refs['rectificationComponent'].addForm = {
+                rectifyResult:response.data.checkRectifyVoList[0].rectifyResult?1:0,
+                rectifyMeasure:response.data.checkRectifyVoList[0].rectifyMeasure?response.data.checkRectifyVoList[0].rectifyMeasure:'',
+                rectifyUploadList:rectifyUploadList,
+                rectifyMaterialUrl:'',
+              }
+            }else{
+              obj.checkRectifyVoList = response.data.checkRectifyVoList?response.data.checkRectifyVoList:[]
+            }
           }
           this.$set(this,'checkItemData',response.data);
           this.$set(this,'historyRecordsComponentPropsData',obj);

src/views/safetyCheck/components/projectAddPage.vue

@@ -384,6 +384,7 @@
     },
     created(){
       this.initialize();
+      this.securityCheckGroupFindGroupList();
     },
     mounted(){
 

src/views/safetyCheck/dataStatistics/hiddenDangerStatistics.vue

@@ -56,13 +56,41 @@
                     @selection-change="handleSelectionChange" :row-key="getRowKeys" @sort-change="sortChange">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="序号" type="index" width="60"/>
-            <el-table-column label="学院单位" prop="deptName" v-if="identityType == 1"  show-overflow-tooltip/>
-            <el-table-column label="实验室名称" prop="subName" v-if="identityType != 1"   show-overflow-tooltip/>
-            <el-table-column label="检查数" prop="checkNum" width="180" show-overflow-tooltip/>
-            <el-table-column label="隐患数" sortable="custom"  prop="hazardNum" width="180" show-overflow-tooltip/>
-            <el-table-column label="已整改数" prop="rectifyNum" width="180" show-overflow-tooltip/>
-            <el-table-column label="未整改数" prop="notRectifyNum" width="180" show-overflow-tooltip/>
-            <el-table-column label="整改完成率" prop="ratio" width="180" show-overflow-tooltip/>
+            <el-table-column label="学院单位" prop="deptName" v-if="identityType == 1"  show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.deptName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="实验室名称" prop="subName" v-if="identityType != 1"   show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.subName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="检查数" prop="checkNum" width="180" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.checkNum}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="隐患数" sortable="custom"  prop="hazardNum" width="180" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.hazardNum}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="已整改数" prop="rectifyNum" width="180" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.rectifyNum}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="未整改数" prop="notRectifyNum" width="180" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.notRectifyNum}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="整改完成率" prop="ratio" width="180" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.ratio}}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="操作" width="112" show-overflow-tooltip >
               <template slot-scope="scope">
                 <div class="table-button-box">

src/views/safetyCheck/safetyHazard/inspectHazard/index.vue

@@ -144,7 +144,7 @@
               <span>{{ scope.row.examineResult ==1 ?'复查完毕':(scope.row.examineResult ==0 ?'退回整改':'') }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="100" show-overflow-tooltip >
+          <el-table-column label="操作" width="120" show-overflow-tooltip >
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
@@ -153,6 +153,11 @@
                    @click="tableButton(1,scope.row)"
                    v-hasPermiRouter="['security:danger:rectify']"
                 >整改</p>
+                <p class="table-button-p"
+                   v-if="!scope.row.isRectify&&!scope.row.finishRectify"
+                   @click="tableButton(3,scope.row)"
+                   v-hasPermiRouter="['security:danger:rectify']"
+                >编辑</p>
                 <p class="table-button-p"
                    v-if="!scope.row.isRectify"
                    @click="tableButton(2,scope.row)"
@@ -300,6 +305,15 @@
           obj.orderTitle = '整改详情';
           obj.orderType = '4';
           this.$set(this,'initiateInspectData',obj);
+        }else if(type == 3){
+          //编辑
+          this.$set(this,'pageType',2);
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = false;
+          obj.orderTitle = '隐患整改';
+          obj.orderType = '3';
+          obj.editType = true;
+          this.$set(this,'initiateInspectData',obj);
         }else if(type == 6){
           //返回并刷新
           this.$set(this,'pageType',1);

src/views/safetyCheck/safetyHazard/selfInspectionHazard/index.vue

@@ -144,7 +144,7 @@
               <span>{{ scope.row.examineResult ==1 ?'复查完毕':(scope.row.examineResult ==0 ?'退回整改':'') }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="100" show-overflow-tooltip >
+          <el-table-column label="操作" width="120" show-overflow-tooltip >
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
@@ -153,6 +153,11 @@
                    @click="tableButton(1,scope.row)"
                    v-hasPermiRouter="['security:danger:selfRectify']"
                 >整改</p>
+                <p class="table-button-p"
+                   v-if="!scope.row.isRectify&&!scope.row.finishRectify"
+                   @click="tableButton(3,scope.row)"
+                   v-hasPermiRouter="['security:danger:selfRectify']"
+                >编辑</p>
                 <p class="table-button-p"
                    v-if="!scope.row.isRectify"
                    @click="tableButton(2,scope.row)"
@@ -301,6 +306,15 @@
           obj.orderTitle = '整改详情';
           obj.orderType = '4';
           this.$set(this,'initiateInspectData',obj);
+        }else if(type == 3){
+          //编辑
+          this.$set(this,'pageType',2);
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = false;
+          obj.orderTitle = '隐患整改';
+          obj.orderType = '3';
+          obj.editType = true;
+          this.$set(this,'initiateInspectData',obj);
         }else if(type == 6){
           //返回并刷新
           this.$set(this,'pageType',1);