zc

src/components/lookDocumentDialog/lookDocumentDataDialog.vue

@@ -33,15 +33,16 @@
 -->
 <template>
   <el-dialog class="lookDocumentDataDialog" :title="lookDocumentTitle"
+             :class="fullScreenType?'lookDocumentDataDialog-fullScreen':''"
              :visible.sync="lookDocumentType" v-if="lookDocumentType"
              @close="outLook"
-             width="714px" height="645px" append-to-body>
+             width="834px" height="645px" append-to-body>
     <div class="lookDocumentDataDialog-page scrollbar-box">
       <rectificationReportDom v-if="documentType == 1" :propsRectificationReportData="propsRectificationReportData"></rectificationReportDom>
       <noticeDom v-if="documentType == 2" :propsNoticeDomData="propsNoticeDomData"></noticeDom>
       <informDom v-if="documentType == 3" :propsInformDomData="propsInformDomData"></informDom>
-      <!--<p class="positionButton" @click="goPage">全屏</p>-->
     </div>
+    <p class="positionButton" @click="fullScreenButton">{{fullScreenType?'退出':'全屏'}}</p>
     <div slot="footer" class="dialog-footer dialog-footer-box" style="display: flex">
       <p class="dialog-footer-button-null"></p>
       <p class="dialog-footer-button-info" @click="outLook">取消</p>
@@ -52,9 +53,9 @@
 </template>
 
 <script>
-  import rectificationReportDom from './rectificationReportDom.vue'
-  import noticeDom from './noticeDom.vue'
-  import informDom from './informDom.vue'
+  import rectificationReportDom from './components/rectificationReportDom.vue'
+  import noticeDom from './components/noticeDom.vue'
+  import informDom from './components/informDom.vue'
   export default {
     name: 'lookDocumentDataDialog',
     props:{
@@ -67,6 +68,8 @@
     },
     data(){
       return{
+        //全屏状态
+        fullScreenType:false,
         lookDocumentType:true,
         lookDocumentTitle:"",
         lookDocumentSrc:"",
@@ -106,6 +109,9 @@
           this.download('/zd-security/checkRectify/genReport/'+this.propsLookDocumentData.id, {}, this.propsLookDocumentData.name+'(整改报告).docx')
         }
       },
+      fullScreenButton(){
+        this.fullScreenType = !this.fullScreenType
+      },
       //打开新窗口
       goPage(){
         window.open(this.lookDocumentSrc)
@@ -122,19 +128,48 @@
       flex:1;
       height:645px;
       position: relative;
-      .positionButton{
-        position: absolute;
-        top:15px;
-        right: 225px;
-        border:1px solid #0183fa;
-        border-radius:4px;
-        line-height:30px;
-        width:60px;
-        text-align: center;
-        cursor: pointer;
-        color:#0183fa;
-        background-color: #fff;
+    }
+    .positionButton{
+      position: absolute;
+      top:15px;
+      right: 15px;
+      border:1px solid #0183fa;
+      border-radius:4px;
+      line-height:30px;
+      width:60px;
+      text-align: center;
+      cursor: pointer;
+      color:#0183fa;
+      background-color: #fff;
+    }
+    .positionButton:hover{
+      background-color:#0183fa;
+      color:#fff;
+    }
+  }
+  .lookDocumentDataDialog-fullScreen{
+    background-color: #666;
+    .positionButton{
+      top:25px;
+      right: 15px;
+    }
+    ::v-deep .el-dialog{
+      width:100% !important;
+      height:100% !important;
+      box-shadow: none;
+    }
+    ::v-deep .el-dialog__header{
+      display: none;
+    }
+    ::v-deep .el-dialog__body{
+      height:100% !important;
+      background-color: #666;
+      .lookDocumentDataDialog-page{
+        height:100%;
       }
     }
+    ::v-deep .el-dialog__footer{
+      display: none;
+    }
   }
 </style>

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

@@ -312,6 +312,11 @@
       //检查项选中
       cascaderChange(val,index){
         let obj = this.getCascaderDataQuery(val,this.options);
+        if(!obj){
+          this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckPro','');
+          this.msgError('未找到相关项目')
+          return
+        }
         this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckCode',obj.code);
         this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckName',obj.name);
         countHazardNum({subId:this.addForm.subId, hazardCheckPro:val}).then( response => {
@@ -386,10 +391,12 @@
               if(list[i].children[0]){
                 self.getCascaderData(list[i].children)
               }else{
-                delete list[i]
+                list.splice(i,1)
+                i--
               }
             }else{
-              delete list[i]
+              list.splice(i,1)
+              i--
             }
           }else{
             delete list[i].children
@@ -407,12 +414,7 @@
               let obj = self.getCascaderDataQuery(text,list[i].children)
               if(obj){
                 return obj
-              }else{
-                return false
               }
-            }else{
-              console.log('false = 2')
-              return false
             }
           }
         }

src/views/safetyCheck/components/infoDialog/infoDialog.vue

@@ -229,11 +229,6 @@
               <p>{{item.reviewedTime}}</p>
             </div>
           </div>
-          <div class="button-box" v-if="item.examineResult == 1">
-            <p>整改报告书</p>
-            <p class="inquire-button-one" @click="lookDocument(2,item.dataL)">查看</p>
-            <p class="add-button-one-90" @click="downloadButton(infoDialogData)">下载</p>
-          </div>
         </div>
       </div>
       <div class="info-dialog-content-add" v-if="infoDialogCheckIndex == 'add' && imgDocumentType == 0">

src/views/safetyCheck/components/infoPage/infoPage.vue

@@ -244,9 +244,10 @@
       lookDocumentButton(type){
         if(type==1){
           this.$set(this,'propsLookDocumentData',{
-            title:"整改报告",
-            name:this.addForm.data7[0].name,
-            url:this.addForm.data7[0].url
+            title:this.addForm.rectifyNotice == 1?'整改告知书':'整改通知书',
+            type:this.addForm.rectifyNotice == 1?3:2,
+            id:this.addForm.id,
+            name:this.addForm.title
           });
           this.$set(this,'lookDocumentType',true);
         }else{

src/views/safetyCheck/laboratorySelfTest/selfInspectionManagement/index.vue

@@ -109,7 +109,7 @@
                    v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_1:query','safety:checkManage_1:edit']"
                    style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
+                <p class="table-button-p" v-if="scope.row.isEndProcess==1" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
               </div>
@@ -281,7 +281,7 @@
       //查看多个文档
       lookDocumentListButton(type,row){
         if(type==1){
-          getFindByCheckPlanId({checkPlanId:row.id}).then(response => {
+          getFindByCheckPlanId({checkPlanId:row.checkPlanId}).then(response => {
             let list = [];
             for(let i=0;i<response.data.length;i++){
               let obj = {

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/listPage.vue

@@ -102,7 +102,7 @@
                    v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p"
                    style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
+                <p class="table-button-p" v-if="scope.row.isEndProcess==1" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
               </div>
@@ -272,7 +272,7 @@
       //查看多个文档
       lookDocumentListButton(type,row){
         if(type==1){
-          getFindByCheckPlanId({checkPlanId:row.id}).then(response => {
+          getFindByCheckPlanId({checkPlanId:row.checkPlanId}).then(response => {
             let list = [];
             for(let i=0;i<response.data.length;i++){
               let obj = {

src/views/safetyCheck/rectificationReport/listPage.vue

@@ -179,19 +179,6 @@
         });
         this.handleQuery();
       },
-      //查看单个文档
-      lookDocumentButton(type,row){
-        if(type==1){
-          this.$set(this,'propsLookDocumentData',{
-            title:"整改报告",
-            name:row.name,
-            url:row.url
-          });
-          this.$set(this,'lookDocumentType',true);
-        }else{
-          this.$set(this,'lookDocumentType',false);
-        }
-      },
     },
   }
 </script>

src/views/safetyCheck/schoolInspection/inspectionManagement/index.vue

@@ -107,7 +107,7 @@
                    v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p" v-hasPermiAnd="['safety:checkManage:query','safety:checkManage:edit']"
                    style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
+                <p class="table-button-p" v-if="scope.row.isEndProcess==1" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
               </div>
@@ -279,7 +279,7 @@
       //查看多个文档
       lookDocumentListButton(type,row){
         if(type==1){
-          getFindByCheckPlanId({checkPlanId:row.id}).then(response => {
+          getFindByCheckPlanId({checkPlanId:row.checkPlanId}).then(response => {
             let list = [];
             for(let i=0;i<response.data.length;i++){
               let obj = {

src/views/safetyCheck/schoolInspection/inspectionPlan/listPage.vue

@@ -102,7 +102,7 @@
                    v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_2:query','safety:checkManage_2:edit']"
                    style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
+                <p class="table-button-p" v-if="scope.row.isEndProcess==1" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
               </div>
@@ -272,7 +272,7 @@
       //查看多个文档
       lookDocumentListButton(type,row){
         if(type==1){
-          getFindByCheckPlanId({checkPlanId:row.id}).then(response => {
+          getFindByCheckPlanId({checkPlanId:row.checkPlanId}).then(response => {
             let list = [];
             for(let i=0;i<response.data.length;i++){
               let obj = {

src/views/safetyCheck/startInspection/index.vue

@@ -471,10 +471,12 @@
               if(list[i].children[0]){
                 self.getCascaderData(list[i].children)
               }else{
-                delete list[i]
+                list.splice(i,1)
+                i--
               }
             }else{
-              delete list[i]
+              list.splice(i,1)
+              i--
             }
           }else{
             delete list[i].children
@@ -639,6 +641,11 @@
       //检查项选中
       cascaderChange(val,index){
         let obj = this.getCascaderDataQuery(val,this.options);
+        if(!obj){
+          this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckPro','');
+          this.msgError('未找到相关项目')
+          return
+        }
         this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckCode',obj.code);
         this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckName',obj.name);
         countHazardNum({subId:this.addForm.subId, hazardCheckPro:val}).then( response => {
@@ -656,12 +663,7 @@
               let obj = self.getCascaderDataQuery(text,list[i].children)
               if(obj){
                 return obj
-              }else{
-                return false
               }
-            }else{
-              console.log('false = 2')
-              return false
             }
           }
         }