zc

src/views/safetyCheck/collegeInspect/selfInspectionManage/index.vue

@@ -31,7 +31,7 @@
             </div>
             <div class="left-list-box">
               <div class="left-list-for-box" v-if="bigIndex == leftBigCheckType"
-                   @click="leftCheckButton(index)"
+                   @click="leftCheckButton(index,bigIndex)"
                    :class="index == leftCheckType ? 'check-left-list-for-box':''"
                    v-for="(item,index) in bigItem.checkPlanSetVoList" :key="index">
                 <div class="left-list-text-box">
@@ -241,6 +241,7 @@
         leftBigCheckType:"0",
         leftCheckType:"0",
         leftListData:[],
+        checkSetProgress:0,
         //检查组件
         initiateInspectData:{},
       }
@@ -270,13 +271,15 @@
         if(this.leftBigCheckType !== index){
           this.$set(this,'leftBigCheckType',index);
           this.$set(this,'leftCheckType',0);
+          this.$set(this,'checkSetProgress',this.leftListData[index].checkPlanSetVoList[0].checkSetProgress);
           this.resetQuery();
         }
       },
       //左侧计划子级切换
-      leftCheckButton(index){
+      leftCheckButton(index,bigIndex){
         if(this.leftCheckType !== index){
           this.$set(this,'leftCheckType',index);
+          this.$set(this,'checkSetProgress',this.leftListData[bigIndex].checkPlanSetVoList[index].checkSetProgress);
           this.resetQuery();
         }
       },
@@ -318,6 +321,9 @@
           this.$set(this,'leftBigCheckType',0);
           this.$set(this,'leftCheckType',0);
           this.resetQuery();
+          if(response.data.records[0]){
+            this.$set(this,'checkSetProgress',this.leftListData[0].checkPlanSetVoList[0].checkSetProgress);
+          }
         });
       },
       getTitleListTwo(){
@@ -363,6 +369,7 @@
           let obj = JSON.parse(JSON.stringify(row))
           obj.showType = true;
           obj.pageType = 2;
+          obj.checkSetProgress = this.checkSetProgress;
           this.$set(this,'propsData',obj);
         }else if(type == 2){
           //开始检查

src/views/safetyCheck/components/checkItem.vue

@@ -116,23 +116,23 @@
                      @click="tableButton(1,scope.row)"
                      v-hasPermiRouter="['security:checkPlan_1:detail']"
                   >开始检查</p>
-                  <p class="table-button-p"
-                     v-if="scope.row.checkStatus == 1"
-                     @click="tableButton(2,scope.row)"
-
-                  >详情</p>
                   <!-- 校级 -->
                   <p class="table-button-p"
-                     v-if="scope.row.checkStatus == 2 && propsData.pageType == 1"
+                     v-if="((scope.row.checkStatus == 1 && propsData.checkSetProgress < 100)||scope.row.checkStatus == 2) && propsData.pageType == 1"
                      @click="tableButton(3,scope.row)"
                      v-hasPermiRouter="['security:checkPlan:detail']"
                   >编辑</p>
                   <!-- 院级 -->
                   <p class="table-button-p"
-                     v-if="scope.row.checkStatus == 2 && propsData.pageType == 2"
+                     v-if="((scope.row.checkStatus == 1 && propsData.checkSetProgress < 100)||scope.row.checkStatus == 2) && propsData.pageType == 2"
                      @click="tableButton(3,scope.row)"
                      v-hasPermiRouter="['security:checkPlan_1:detail']"
                   >编辑</p>
+                  <p class="table-button-p"
+                     v-if="scope.row.checkStatus == 1"
+                     @click="tableButton(2,scope.row)"
+
+                  >详情</p>
                   <p class="table-button-null"></p>
                 </div>
               </template>
@@ -360,6 +360,7 @@
           let obj = JSON.parse(JSON.stringify(row))
           obj.manageId = this.propsData.manageId;
           obj.showType = false;
+          obj.orderType = '1';
           this.$set(this,'initiateInspectData',obj);
         }else if(type == 6){
           //返回并刷新

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

@@ -7,6 +7,7 @@
       <p class="page-top-title-edit-p" @click="submitForm(1)" v-if="!lookInfoType&&projectData.checkStatus != 1">保存草稿</p>
       <p class="page-top-title-edit-p" @click="submitForm(2)" v-if="!lookInfoType&&projectData.checkStatus != 1">继续检查</p>
       <p class="page-top-title-add-p" @click="submitForm(3)" v-if="!lookInfoType&&projectData.checkStatus != 1">提交查看</p>
+      <p class="page-top-title-add-p" @click="submitForm(3)" v-if="!lookInfoType&&projectData.checkStatus == 1 && projectData.checkSetProgress < 100">编辑</p>
       <p class="page-top-title-out-p" @click="backPage">返回</p>
       <p class="page-top-title-add-p" @click="submitForm(4)" v-if="!lookInfoType&&(initiateData.orderType == 3||initiateData.orderType == 5)">提交</p>
     </div>
@@ -168,7 +169,8 @@
                         style="width:700px;"></el-input>
             </el-form-item>
             <div style="display: flex;">
-              <el-form-item label="检查结果" prop="checkFlag" v-if="!lookInfoType&&projectData.checkStatus != 1">
+              <!--未检查-->
+              <el-form-item label="检查结果" prop="checkFlag" v-if="!lookInfoType&& projectData.checkSetProgress < 100">
                 <div class="check-button-box">
                   <div :class="addForm.checkFlag == 0?'check-button-border':''" @click="checkButton(0)">
                     <p>不符合</p>
@@ -180,12 +182,14 @@
                   </div>
                 </div>
               </el-form-item>
+              <!--查看-已检查-->
               <el-form-item label="检查结果" prop="checkFlag" v-if="lookInfoType&&projectData.checkStatus == 1">
                 <div class="check-button-border-box">
                   <p>{{projectData.checkFlag == 0?'不符合':'符合'}}</p>
                   <img src="@/assets/ZDimages/safetyCheck/icom_xjjc_jcjc@1x.png">
                 </div>
               </el-form-item>
+              <!--查看-未检查-->
               <el-form-item label="检查结果" prop="checkFlag" v-if="lookInfoType&&projectData.checkStatus != 1">
                 <div class="check-button-border-box" style="border:1px solid #999!important;color:#666!important;">
                   <p>待检查</p>
@@ -198,7 +202,7 @@
             隐患信息
             <span :class="itemShowType_3?'el-icon-arrow-down':'el-icon-arrow-up'" @click="itemShowButton(3)"></span>
           </p>
-          <div v-if="addForm.checkFlag == 0 && initiateData.orderType == 1 && itemShowType_3" style="margin-top:20px;">
+          <div v-if="addForm.checkFlag == 0 && initiateData.orderType == 1 && projectData.checkSetProgress < 100 && itemShowType_3" style="margin-top:20px;">
             <el-form-item label="隐患描述" prop="hazardDescribe">
               <el-input placeholder="请输入隐患描述" maxLength='200' type="textarea" style="width:704px;"
                         resize="none" v-model="addForm.hazardDescribe" show-word-limit :rows="3"></el-input>
@@ -230,7 +234,7 @@
           </div>
         </el-form>
         <!--历史记录-->
-        <history-records-component ref="historyRecordsComponent" v-if="projectData.checkStatus == 1 && historyRecordsComponentPropsType"
+        <history-records-component ref="historyRecordsComponent" v-if="projectData.checkStatus == 1 && initiateData.orderType != 1 && historyRecordsComponentPropsType"
                                    :historyRecordsComponentPropsData="historyRecordsComponentPropsData"></history-records-component>
         <!--整改-->
         <rectification-component ref="rectificationComponent" v-if="initiateData.orderType == 3"></rectification-component>
@@ -391,6 +395,11 @@
               if (this.projectData.checkStatus == 1) {
                 //已提交
                 this.securityCheckDangerGetDangerId();
+                if(this.projectData.checkSetProgress < 100){
+                  this.$set(this.addForm, 'uploadDtoList', response.data.photoList?response.data.photoList:[])
+                  this.$set(this.addForm, 'checkFlag', response.data.checkFlag?response.data.checkFlag:0)
+                  this.$set(this.addForm, 'hazardDescribe', response.data.hazardDescribe?response.data.hazardDescribe:'')
+                }
               } else if (this.projectData.checkStatus == 0&&this.initiateData.checkDraftVo) {
                 //草稿
                 this.securityDraftFindBySetOptionId(this.initiateData.setOptionId);

src/views/safetyCheck/schoolInspect/inspectManage/index.vue

@@ -31,7 +31,7 @@
             </div>
             <div class="left-list-box">
               <div class="left-list-for-box" v-if="bigIndex == leftBigCheckType"
-                   @click="leftCheckButton(index)"
+                   @click="leftCheckButton(index,bigIndex)"
                    :class="index == leftCheckType ? 'check-left-list-for-box':''"
                    v-for="(item,index) in bigItem.checkPlanSetVoList" :key="index">
                 <div class="left-list-text-box">
@@ -241,6 +241,7 @@
         leftBigCheckType:"0",
         leftCheckType:"0",
         leftListData:[],
+        checkSetProgress:0,
         //检查组件
         initiateInspectData:{},
       }
@@ -270,6 +271,7 @@
         if(this.leftBigCheckType !== index){
           this.$set(this,'leftBigCheckType',index);
           this.$set(this,'leftCheckType',0);
+          this.$set(this,'checkSetProgress',this.leftListData[index].checkPlanSetVoList[0].checkSetProgress);
           this.resetQuery();
         }
       },
@@ -277,6 +279,7 @@
       leftCheckButton(index){
         if(this.leftCheckType !== index){
           this.$set(this,'leftCheckType',index);
+          this.$set(this,'checkSetProgress',this.leftListData[bigIndex].checkPlanSetVoList[index].checkSetProgress);
           this.resetQuery();
         }
       },
@@ -318,6 +321,9 @@
           this.$set(this,'leftBigCheckType',0);
           this.$set(this,'leftCheckType',0);
           this.resetQuery();
+          if(response.data.records[0]){
+            this.$set(this,'checkSetProgress',this.leftListData[0].checkPlanSetVoList[0].checkSetProgress);
+          }
         });
       },
       getTitleListTwo(){
@@ -363,6 +369,7 @@
           let obj = JSON.parse(JSON.stringify(row))
           obj.showType = true;
           obj.pageType = 1;
+          obj.checkSetProgress = this.checkSetProgress;
           this.$set(this,'propsData',obj);
         }else if(type == 2){
           //开始检查