zc

src/api/safetyCheck/indexDemoOne.js

@@ -350,13 +350,38 @@ export function securityRecordCheckCommit(data) {
   })
 }
 //检查管理/自查管理-流程详情
-export function securityCheckDangerDetailList(query) {
+export function securityCheckDangerGetDangerId(query) {
   return request({
-    url: '/security/checkDanger/getDangerId/'+query.managerId+'/'+query.setOptionId,
+    url: '/security/checkDanger/getDangerId',
     method: 'get',
+    params: query
+  })
+}
+/**************************** 安全隐患 ****************************/
+// 检查隐患/自查隐患-列表
+export function securityCheckDangerList (data) {
+  return request({
+    url: '/security/checkDanger/list',
+    method: 'post',
+    data: data
+  })
+}
+// 检查隐患/自查隐患-详情
+export function securityCheckDangerDetail (data) {
+  return request({
+    url: '/security/checkDanger/detail',
+    method: 'post',
+    data: data
+  })
+}
+// 检查隐患/自查隐患-整改提交
+export function securityCheckDangerCheckRectify (data) {
+  return request({
+    url: '/security/checkDanger/checkRectify',
+    method: 'post',
+    data: data
   })
 }
-
 /**************************** 安全检查-数据统计 ****************************/
 // 数据统计列表
 export function securityDataStatisticsList(data) {
@@ -592,15 +617,6 @@ export function reportHazardReportOneItemsScatterCollegeTop (data) {
     data: data
   })
 }
-/**************************** 安全隐患 ****************************/
-// 检查隐患/自查隐患-列表
-export function securityCheckDangerList (data) {
-  return request({
-    url: '/security/checkDanger/list',
-    method: 'post',
-    data: data
-  })
-}
 /**************************** 安全检查-公共部分 ****************************/
 // 查询用户身份-校级管理员/院级管理员/督导组成员
 export function securityDataStatisticsGetUserIdentity(query) {

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

@@ -87,15 +87,6 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <!--与我相关-->
-          <div class="form-button-max-big-box-me">
-            <div class="form-button-big-box-me">
-              <div :class="queryParams.myRelated==1?'checkDiv-me':''" @click="topRightClickType">
-                <p class="text-p-me">与我相关</p>
-                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
-              </div>
-            </div>
-          </div>
           <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
           <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
           <p class="page-save-common-style-button" style="display: inline-block;margin-left:10px;" @click="searchToggle">{{advancedType?'普通搜索':'高级搜索'}}</p>
@@ -129,13 +120,13 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
-                   @click="tableButton(2,scope.row)"
+                   @click="tableButton(1,scope.row)"
 
                 >复查</p>
                 <p class="table-button-p"
-                   @click="tableButton(3,scope.row)"
+                   @click="tableButton(2,scope.row)"
 
-                >编辑</p>
+                >详情</p>
                 <p class="table-button-p"
                    @click="tableButton(4,scope.row)"
 
@@ -184,19 +175,19 @@
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>
-    <!--<add-page :propsData="propsData" v-if="pageType === 2"></add-page>-->
+    <initiateInspect v-if="pageType == 2" :initiateInspectData="initiateInspectData"></initiateInspect>
   </div>
 </template>
 <script>
   //import { getDicts } from "@/api/commonality/noPermission";
   //import { systemUserSelect } from "@/api/commonality/permission";
   //import { getInfo } from "@/api/basicsModules/index";
-  //import addPage from "./addPage.vue";
+  import initiateInspect from "@/views/safetyCheck/components/initiateInspect/initiateInspect.vue";
   export default {
     name: 'index',
-    //components: {
-    //  addPage
-    //},
+    components: {
+      initiateInspect
+    },
     data () {
       return {
         tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
@@ -212,7 +203,6 @@
         queryParams:{
           page:1,
           pageSize:20,
-          myRelated:1,
           queryParamsData1:"",
           queryParamsData2 :null,
         },
@@ -225,7 +215,7 @@
         //数据数量
         total:0,
         //组件传参
-        propsData:{},
+        initiateInspectData:{},
         //复查转移
         dialogData:{
           dialogData1:'督导组名称',
@@ -268,11 +258,6 @@
       searchToggle(){
         this.$set(this,'advancedType',!this.advancedType);
       },
-      //与我相关按钮
-      topRightClickType(){
-        this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
-        this.handleQuery();
-      },
       //查询按钮
       handleQuery(){
         this.$set(this.queryParams,'page',1);
@@ -284,7 +269,6 @@
         this.$set(this,'queryParams',{
           page:1,
           pageSize:20,
-          myRelated:1,
           queryParamsData1:"",
           queryParamsData2 :null,
         });
@@ -311,38 +295,24 @@
       tableButton(type,row){
         let self = this;
         if(type == 1){
-          //新增
+          //整改
           this.$set(this,'pageType',2);
-          this.$set(this,'propsData',{});
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = false;
+          obj.orderTitle = '隐患整改';
+          obj.orderType = '3';
+          this.$set(this,'initiateInspectData',obj);
         }else if(type == 2){
           //详情
           this.$set(this,'pageType',2);
           let obj = JSON.parse(JSON.stringify(row))
           obj.showType = true;
-          this.$set(this,'propsData',obj);
-        }else if(type == 3){
-          //编辑
-          this.$set(this,'pageType',2);
-          let obj = JSON.parse(JSON.stringify(row))
-          obj.showType = false;
-          this.$set(this,'propsData',obj);
+          obj.orderTitle = '整改详情';
+          obj.orderType = '4';
+          this.$set(this,'initiateInspectData',obj);
         }else if(type == 4){
           //转移
           this.dialogOpen();
-        }else if(type == 5){
-          //启用&停用
-          let text = row.state  ? "停用" : "启用";
-          this.$confirm('是否确认' + text + '?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-          }).then(() => {
-            stateFunction({id:row.id,state:!row.state,}).then(response => {
-              self.msgSuccess(response.message)
-              self.getList();
-            });
-          }).catch(() => {});
         }else if(type == 6){
           //返回并刷新
           this.$set(this,'pageType',1);

src/views/safetyCheck/components/checkItem.vue

@@ -316,6 +316,8 @@
           obj.manageId = this.propsData.manageId;
           obj.processType = 'inspect';
           obj.showType = false;
+          obj.orderTitle = '开始检查';
+          obj.orderType = '1';
           this.$set(this,'initiateInspectData',obj);
         }else if(type == 2){
           //详情
@@ -323,6 +325,8 @@
           let obj = JSON.parse(JSON.stringify(row))
           obj.manageId = this.propsData.manageId;
           obj.showType = true;
+          obj.orderTitle = '检查详情';
+          obj.orderType = '2';
           this.$set(this,'initiateInspectData',obj);
         }else if(type == 3){
           //编辑

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

@@ -1,33 +1,117 @@
 <!--历史记录-->
 <template>
   <div class="page-container initiateInspect-historyRecordsComponent">
-    <!--详情/整改展示/复核展示-->
-    <div v-for="(item,index) in dataList" :key="index">
+    <!--检查信息-->
+    <div>
       <p class="content-right-title-min-p">
-        {{item.dataList1Data1 == 1?'隐患信息':(item.dataList1Data1 == 2?'隐患整改':(item.dataList1Data1 == 3?'复查验证':''))}}
-        <span :class="item.itemShowType?'el-icon-arrow-down':'el-icon-arrow-up'" @click="itemShowButton(index)"></span>
+        隐患信息
+        <span :class="newData.showType?'el-icon-arrow-down':'el-icon-arrow-up'" @click="infoShowButton"></span>
       </p>
-      <div v-if="item.itemShowType" style="margin-top:20px;">
-        <div class="right-text-box" v-if="item.dataList1Data1 == 2 || item.dataList1Data1 == 3">
-          <p class="right-text-name-p">{{item.dataList1Data1 == 2?'整改结果':(item.dataList1Data1 == 3?'复查结果':'')}}</p>
-          <div class="right-check-box">
-            <div class="right-min-check-title-box">
-              <p></p>
-            </div>
-            <p class="right-check-title-p" v-if="item.dataList1Data1 == 2">{{newData.rectifyStatus == 1?'已整改':'暂无法整改'}}</p>
-            <p class="right-check-title-p" v-if="item.dataList1Data1 == 3">{{newData.rectifyStatus == 1?'复查完毕':'退回整改'}}</p>
-          </div>
-        </div>
+      <div v-if="newData.showType" style="margin-top:20px;">
         <div class="right-text-box">
-          <p class="right-text-name-p">{{item.dataList1Data1 == 1?'隐患描述':(item.dataList1Data1 == 2?'整改措施':(item.dataList1Data1 == 3?'验证情况':''))}}</p>
+          <p class="right-text-name-p">隐患描述</p>
           <div class="right-text-text-box" style="width:704px;">
-            <p style="min-height:80px;">{{item.dataList1Data2}}</p>
+            <p style="min-height:80px;">{{newData.hazardDescribe}}</p>
           </div>
         </div>
         <div class="right-text-box">
           <p class="right-text-name-p">现场照片</p>
-          <img :src="imgItem" @click="fullScreenViewClick(item.dataList1Data3,imgIndex)"
-               v-for="(imgItem,imgIndex) in item.dataList1Data3" :key="imgIndex">
+          <img class="for-img" :src="imgItem.fileUrl" @click="lookImg(newData.uploadDtoList,imgIndex)"
+               v-for="(imgItem,imgIndex) in newData.uploadDtoList" :key="imgIndex">
+        </div>
+      </div>
+    </div>
+    <!--整改展示/复核展示-->
+    <div v-for="(item,index) in dataList" :key="index">
+      <div>
+        <p class="content-right-title-min-p">
+          隐患整改
+          <span :class="item.topShowType?'el-icon-arrow-down':'el-icon-arrow-up'" @click="topShowButton(index)"></span>
+        </p>
+        <div v-if="item.topShowType" style="margin-top:20px;">
+          <div class="right-text-box">
+            <p class="right-text-name-p">整改结果</p>
+            <div class="right-check-box">
+              <div class="right-min-check-title-box">
+                <p></p>
+              </div>
+              <p class="right-check-title-p">{{item.rectifyResult?'已整改':'暂无法整改'}}</p>
+            </div>
+          </div>
+          <div class="right-text-box">
+            <p class="right-text-name-p">整改措施</p>
+            <div class="right-text-text-box" style="width:704px;">
+              <p style="min-height:80px;">{{item.rectifyMeasure}}</p>
+            </div>
+          </div>
+          <div class="right-text-box">
+            <p class="right-text-name-p">现场照片</p>
+            <img class="for-img" :src="imgItem.fileUrl" @click="lookImg(item.rectifyUploadList,imgIndex)"
+                 v-for="(imgItem,imgIndex) in item.rectifyUploadList" :key="imgIndex">
+          </div>
+          <div class="right-text-box">
+            <p class="right-text-name-p">整改方案</p>
+            <div class="up-file-box">
+              <img src="@/assets/ZDimages/safetyCheck/icon_dr_wj.png">
+              <p @click="lookFile(item)">{{item.rectifyMaterialName}}</p>
+            </div>
+          </div>
+          <div class="right-text-box" style="display: flex;">
+            <div class="right-text-box">
+              <p class="right-text-name-p">整改人</p>
+              <div class="right-text-text-box" style="height:40px;width:300px;">
+                <p>{{item.rectifyName}}</p>
+              </div>
+            </div>
+            <div class="right-text-box">
+              <p class="right-text-name-p">处理时间</p>
+              <div class="right-text-text-box" style="height:40px;width:300px;">
+                <p>{{item.rectifyTime}}</p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-if="item.examineResult !== null">
+        <p class="content-right-title-min-p">
+          复查验证
+          <span :class="item.bottomShowType?'el-icon-arrow-down':'el-icon-arrow-up'" @click="bottomShowButton(index)"></span>
+        </p>
+        <div v-if="item.bottomShowType" style="margin-top:20px;">
+          <div class="right-text-box">
+            <p class="right-text-name-p">复查结果</p>
+            <div class="right-check-box">
+              <div class="right-min-check-title-box">
+                <p></p>
+              </div>
+              <p class="right-check-title-p">{{item.examineResult?'复查完毕':'退回整改'}}</p>
+            </div>
+          </div>
+          <div class="right-text-box">
+            <p class="right-text-name-p">验证情况</p>
+            <div class="right-text-text-box" style="width:704px;">
+              <p style="min-height:80px;">{{item.examineOpinion}}</p>
+            </div>
+          </div>
+          <div class="right-text-box">
+            <p class="right-text-name-p">现场照片</p>
+            <img class="for-img" :src="imgItem.fileUrl" @click="lookImg(item.examineUploadList,imgIndex)"
+                 v-for="(imgItem,imgIndex) in item.examineUploadList" :key="imgIndex">
+          </div>
+          <div class="right-text-box" style="display: flex;">
+            <div class="right-text-box">
+              <p class="right-text-name-p">整改人</p>
+              <div class="right-text-text-box" style="height:40px;width:300px;">
+                <p>{{item.reviewName}}</p>
+              </div>
+            </div>
+            <div class="right-text-box">
+              <p class="right-text-name-p">处理时间</p>
+              <div class="right-text-text-box" style="height:40px;width:300px;">
+                <p>{{item.reviewTime}}</p>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -43,61 +127,48 @@
     data(){
       return{
         newData:{
-          rectifyStatus:1,
+          showType:true,
+          hazardDescribe:"",
+          uploadDtoList:[],
         },
-        dataList:[
-          {
-            dataList1Data1:'1',
-            dataList1Data2:'现场隐患信息描述内容',
-            dataList1Data3:[
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-            ],
-            itemShowType:true,
-          },
-          {
-            dataList1Data1:'2',
-            dataList1Data2:'整改措施整改措施整改措施整改措施',
-            dataList1Data3:[
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-            ],
-            itemShowType:true,
-          },
-          {
-            dataList1Data1:'3',
-            dataList1Data2:'验证情况验证情况验证情况验证情况验证情况验证情况验证情况验证情况验证情况验证情况验证情况验证情况验证情况验证情况验证情况',
-            dataList1Data3:[
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-              'https://inews.gtimg.com/news_bt/ObxBXJWswEC7oTRhEqLPmyZOq_o2q_HYFD0L4tt-vzEFYAA/641',
-            ],
-            itemShowType:true,
-          },
-        ],
+        dataList:[],
       }
     },
     created(){
-
+      let obj = JSON.parse(JSON.stringify(this.historyRecordsComponentPropsData))
+      for(let i=0;i<obj.checkRectifyVoList.length;i++){
+        obj.checkRectifyVoList[i].topShowType = true;
+        obj.checkRectifyVoList[i].bottomShowType = true;
+      }
+      this.$set(this,'newData',obj.orderInfo);
+      this.$set(this,'dataList',obj.checkRectifyVoList);
     },
     mounted(){
-
     },
     methods:{
-      //子项展开隐藏按钮
-      itemShowButton(index){
-        this.$set(this.dataList[index],'itemShowType',!this.dataList[index].itemShowType);
+      //整改展开隐藏按钮
+      infoShowButton(){
+        this.$set(this.newData,'showType',!this.newData.showType);
+      },
+      //整改展开隐藏按钮
+      topShowButton(index){
+        this.$set(this.dataList[index],'topShowType',!this.dataList[index].topShowType);
+      },
+      //复查展开隐藏按钮
+      bottomShowButton(index){
+        this.$set(this.dataList[index],'bottomShowType',!this.dataList[index].bottomShowType);
+      },
+      //照片预览
+      lookImg(list,index){
+        this.$parent.fullScreenViewClick(list,index);
+      },
+      //文件预览
+      lookFile(item){
+        let obj = {
+          fileName:item.rectifyMaterialName,
+          fileUrl:item.rectifyMaterialUrl,
+        };
+        this.$parent.fullScreenFileLookClick(obj);
       },
     },
   }
@@ -213,13 +284,39 @@
           font-size:16px;
         }
       }
-      img{
+      .for-img{
         cursor: pointer;
         display: block;
         width:100px;
         height:100px;
         margin-right:20px;
       }
+      .up-file-box{
+        display: flex;
+        height:40px;
+        img{
+          margin-top:12px;
+          width:16px;
+          height:16px;
+          display: block;
+        }
+        p:nth-child(2){
+          line-height:40px;
+          font-size:14px;
+          margin:0 30px 0 15px;
+          cursor: pointer;
+        }
+        p:nth-child(3){
+          cursor: pointer;
+          color:red;
+          font-size:16px;
+          height:16px;
+          width:16px;
+          line-height:16px;
+          margin-top:12px;
+          text-align: center
+        }
+      }
     }
   }
 </style>

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

@@ -2,12 +2,13 @@
 <template>
   <div class="page-container initiateInspect" v-show="loadType">
     <div class="page-top-title-box">
-      <p class="page-top-title-name-p">开展检查/编辑检查/检查详情/整改/复核</p>
+      <!--开始检查/检查详情/隐患整改/整改详情/复查验证/复查详情-->
+      <p class="page-top-title-name-p">{{initiateInspectData.orderTitle}}</p>
       <p class="page-top-title-edit-p" @click="submitForm(1)" v-if="projectData.checkStatus != 1">保存草稿</p>
       <p class="page-top-title-edit-p" @click="submitForm(2)" v-if="projectData.checkStatus != 1">继续检查</p>
       <p class="page-top-title-add-p" @click="submitForm(3)" v-if="projectData.checkStatus != 1">提交查看</p>
       <p class="page-top-title-out-p" @click="backPage">返回</p>
-      <p class="page-top-title-add-p" @click="submitForm(4)">提交</p>
+      <p class="page-top-title-add-p" @click="submitForm(4)" v-if="initiateInspectData.orderType == 3||initiateInspectData.orderType == 5">提交</p>
     </div>
     <div class="content-box">
       <!--校级角标-->
@@ -115,17 +116,17 @@
               </div>
             </div>
           </div>
-          <div class="content-right-flex-border-box">
+          <div class="content-right-flex-border-box" v-if="projectData.checkStatus == 1">
             <div class="right-text-box">
               <p class="right-text-name-p">检查人</p>
               <div class="right-text-title-box">
-                <p>{{checkItemData.data13}}</p>
+                <p>{{checkItemData.checkUserName}}-{{checkItemData.checkUserNumber}}</p>
               </div>
             </div>
             <div class="right-text-box">
               <p class="right-text-name-p" style="width:138px;">检查时间</p>
               <div class="right-text-title-box">
-                <p>{{checkItemData.data14}}</p>
+                <p>{{checkItemData.checkTime}}</p>
               </div>
             </div>
           </div>
@@ -155,7 +156,7 @@
                         style="width:700px;"></el-input>
             </el-form-item>
             <div style="display: flex;">
-              <el-form-item label="检查结果" prop="checkFlag" v-if="!lookInfoType">
+              <el-form-item label="检查结果" prop="checkFlag" v-if="!lookInfoType&&projectData.checkStatus != 1">
                 <div class="check-button-box">
                   <div :class="addForm.checkFlag == 0?'check-button-border':''" @click="checkButton(0)">
                     <p>不符合</p>
@@ -167,7 +168,7 @@
                   </div>
                 </div>
               </el-form-item>
-              <el-form-item label="检查结果" prop="checkFlag" v-if="lookInfoType">
+              <el-form-item label="检查结果" prop="checkFlag" v-if="lookInfoType||projectData.checkStatus == 1">
                 <div class="check-button-border-box">
                   <p>{{addForm.checkFlag == 0?'不符合':'符合'}}</p>
                   <img src="@/assets/ZDimages/safetyCheck/icom_xjjc_jcjc@1x.png">
@@ -176,11 +177,11 @@
             </div>
           </div>
           <!--第一次检查时选择不符合时展示-->
-          <p class="content-right-title-min-p" v-if="processType == 'inspect' && addForm.checkFlag == 0 && projectData.checkStatus != 1">
+          <p class="content-right-title-min-p" v-if="addForm.checkFlag == 0 && initiateInspectData.orderType == 1">
             隐患信息
             <span :class="itemShowType_3?'el-icon-arrow-down':'el-icon-arrow-up'" @click="itemShowButton(3)"></span>
           </p>
-          <div v-if="processType == 'inspect' && addForm.checkFlag == 0 && projectData.checkStatus != 1 && itemShowType_3" style="margin-top:20px;">
+          <div v-if="addForm.checkFlag == 0 && initiateInspectData.orderType == 1 && 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>
@@ -212,14 +213,12 @@
           </div>
         </el-form>
         <!--历史记录-->
-        <history-records-component ref="historyRecordsComponent"
+        <history-records-component v-if="projectData.checkStatus == 1 && historyRecordsComponentPropsType"
                                    :historyRecordsComponentPropsData="historyRecordsComponentPropsData"></history-records-component>
         <!--整改-->
-        <rectification-component ref="rectificationComponent"
-                                 :recheckComponentPropsData="recheckComponentPropsData"></rectification-component>
+        <rectification-component ref="rectificationComponent" v-if="initiateInspectData.orderType == 3"></rectification-component>
         <!--复核-->
-        <recheck-component ref="recheckComponent"
-                           :rectificationComponentPropsData="rectificationComponentPropsData"></recheck-component>
+        <recheck-component ref="recheckComponent" v-if="initiateInspectData.orderType == 5"></recheck-component>
       </div>
     </div>
     <fullScreenView :fullScreenViewProps="fullScreenViewProps" ref="fullScreenView"></fullScreenView>
@@ -243,7 +242,8 @@
     securityCheckOptionList,
     securityRecordCheckCommit,
     securityCheckSetOptionUnCheckList,
-    securityCheckDangerDetailList,
+    securityCheckDangerGetDangerId,
+    securityCheckDangerCheckRectify,
   } from '@/api/safetyCheck/indexDemoOne'
 
   export default {
@@ -268,8 +268,6 @@
         },
         //页面加载状态
         loadType:false,
-        //流程状态-用于区分父级入口
-        processType:null,
         //图片组件数据
         fullScreenViewProps: [],
         //查看详情状态
@@ -283,10 +281,7 @@
           uploadDtoList: []
         },
         //检查项详情
-        checkItemData: {
-          data13: '姓名-工号',
-          data14: '2024-09-06'
-        },
+        checkItemData: {},
         //检查项
         cascaderData: [],
         dangerLevel: [],
@@ -322,12 +317,7 @@
         },
         //历史记录组件数据
         historyRecordsComponentPropsData: {},
-        //开始检查组件数据
-        inspectComponentPropsData: {},
-        //整改组件数据
-        rectificationComponentPropsData: {},
-        //复核组件数据
-        recheckComponentPropsData: {}
+        historyRecordsComponentPropsType:false,
       }
     },
     created() {
@@ -344,10 +334,10 @@
         // 上级页面检查项状态 指定时false,未指定true
         if (this.initiateInspectData.freeChoiceType) {
           this.$set(this, 'freeChoiceType', true)
-          //未执行过的检查项列表
+          //开始检查/未指定检查项-获取未执行过的检查项列表
           this.securityCheckSetOptionUnCheckList();
         }else{
-          //全部检查项列表
+          //开始检查/开始整改/开始复查-获取所有检查项列表
           this.securityCheckOptionList();
         }
         // 是否是详情进入
@@ -362,7 +352,7 @@
         let self = this
         securityCheckPlanCheckInfo({
           manageId: this.initiateInspectData.manageId,
-          dangerId: this.initiateInspectData.dangerId ? this.initiateInspectData.dangerId : '',
+          // dangerId: this.initiateInspectData.dangerId ? this.initiateInspectData.dangerId : '',
           setOptionId: this.initiateInspectData.setOptionId ? this.initiateInspectData.setOptionId : ''
         }).then(response => {
           this.$set(this, 'projectData', response.data)
@@ -373,7 +363,7 @@
             this.securityCheckPhotoGetCheckNumBySub()
             if (this.projectData.checkStatus == 1) {
               //已提交
-              this.securityCheckDangerDetailList();
+              this.securityCheckDangerGetDangerId();
             } else if (this.projectData.checkStatus == 2) {
               //草稿
               this.$set(this.addForm, 'uploadDtoList', this.projectData.photoList?this.projectData.photoList:[])
@@ -393,12 +383,22 @@
         })
       },
       //查询检查项流程详情
-      securityCheckDangerDetailList(){
-        securityCheckDangerDetailList({
-          managerId: this.initiateInspectData.manageId,
+      securityCheckDangerGetDangerId(){
+        securityCheckDangerGetDangerId({
+          manageId: this.initiateInspectData.manageId,
           setOptionId: this.initiateInspectData.setOptionId
         }).then(response => {
-
+          let obj = {
+            orderInfo:{
+              hazardDescribe:response.data.hazardDescribe,
+              uploadDtoList:response.data.uploadDtoList,
+              showType:true,
+            },
+            checkRectifyVoList:response.data.checkRectifyVoList?response.data.checkRectifyVoList:[]
+          }
+          this.$set(this,'checkItemData',response.data);
+          this.$set(this,'historyRecordsComponentPropsData',obj);
+          this.$set(this,'historyRecordsComponentPropsType',true);
         })
       },
       //查询隐患发生次数
@@ -428,7 +428,29 @@
             }
           })
         } else if (type == 4) {
-          //提交
+          if(this.initiateInspectData.orderType == 3){
+            //整改提交
+            this.$refs['rectificationComponent'].submitData().then(data => {
+              let obj = {
+                checkCategory:this.projectData.checkCategory,
+                dangerId:this.checkItemData.dangerId,
+                rectifyMeasure:data.rectifyMeasure,
+                rectifyMaterialName:data.rectifyMaterialName,
+                rectifyMaterialUrl:data.rectifyMaterialUrl,
+                rectifyResult:data.rectifyResult,
+                rectifyUploadList:data.rectifyUploadList,
+              };
+              securityCheckDangerCheckRectify(obj).then(response => {
+                this.msgSuccess(response.message)
+                this.$parent.tableButton(6)
+              })
+            });
+          }else if(this.initiateInspectData.orderType == 5){
+            //复查提交
+            this.$refs['recheckComponent'].submitData().then(data => {
+              console.log('data',data)
+            });
+          }
         }
       },
       //检查提交

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

@@ -8,15 +8,15 @@
         <span :class="itemShowType?'el-icon-arrow-down':'el-icon-arrow-up'" @click="itemShowButton()"></span>
       </p>
       <div v-if="itemShowType" style="margin-top:20px;">
-        <el-form-item label="整改结果" prop="rectifyStatus">
+        <el-form-item label="整改结果" prop="rectifyResult">
           <div class="right-text-box">
-            <div :class="addForm.rectifyStatus == 1?'right-check-box':'right-no-check-box'" @click="checkButton(1)">
+            <div :class="addForm.rectifyResult == 1?'right-check-box':'right-no-check-box'" @click="checkButton(1)">
               <div>
                 <p></p>
               </div>
               <p class="right-check-title-p">已整改</p>
             </div>
-            <div :class="addForm.rectifyStatus == 2?'right-check-box':'right-no-check-box'" @click="checkButton(2)">
+            <div :class="addForm.rectifyResult == 0?'right-check-box':'right-no-check-box'" @click="checkButton(0)">
               <div>
                 <p></p>
               </div>
@@ -24,17 +24,17 @@
             </div>
           </div>
         </el-form-item>
-        <el-form-item label="整改措施" prop="rectifyDescribe">
+        <el-form-item label="整改措施" prop="rectifyMeasure">
           <el-input placeholder="请输入整改措施" maxLength='200' type="textarea" style="width:704px;"
-                    resize="none" v-model="addForm.rectifyDescribe" show-word-limit :rows="3"></el-input>
+                    resize="none" v-model="addForm.rectifyMeasure" show-word-limit :rows="3"></el-input>
         </el-form-item>
-        <el-form-item label="现场照片" prop="imgDtoList">
-          <div class="snapshotManagement-for-img-box" v-for="(img,imgIndex) in addForm.imgDtoList" :key="imgIndex">
-            <img class="for-img" :src="img.fileUrl" @click="lookImg(addForm.imgDtoList,imgIndex)">
+        <el-form-item label="现场照片" prop="rectifyUploadList">
+          <div class="snapshotManagement-for-img-box" v-for="(img,imgIndex) in addForm.rectifyUploadList" :key="imgIndex">
+            <img class="for-img" :src="img.fileUrl" @click="lookImg(addForm.rectifyUploadList,imgIndex)">
             <p class="for-del-button el-icon-circle-close" @click="delImg(imgIndex)"></p>
           </div>
           <el-upload
-            v-if="addForm.imgDtoList.length<6"
+            v-if="addForm.rectifyUploadList.length<6"
             style="display: inline-block;overflow: hidden"
             class="avatar-uploader"
             :action="uploadImgUrl"
@@ -46,11 +46,11 @@
           </el-upload>
           <p class="up-img-text">支持jpg/png/bmp/gif格式，且不超过2M，最多上传6张</p>
         </el-form-item>
-        <div v-if="addForm.rectifyStatus == 2">
-          <el-form-item label="整改方案" prop="rectifyProjectUrl">
-            <div class="up-file-button" v-if="!addForm.rectifyProjectUrl">
+        <div v-if="addForm.rectifyResult == 0">
+          <el-form-item label="整改方案" prop="rectifyMaterialUrl">
+            <div class="up-file-button" v-if="!addForm.rectifyMaterialUrl">
               <el-upload
-                v-if="addForm.imgDtoList.length<6"
+                v-if="addForm.rectifyUploadList.length<6"
                 style="display: inline-block;overflow: hidden"
                 class="avatar-uploader"
                 :action="uploadImgUrl"
@@ -62,9 +62,9 @@
               </el-upload>
               <p class="up-file-text">支持docx/xlsx/pdf格式文件</p>
             </div>
-            <div class="up-file-box" v-if="addForm.rectifyProjectUrl">
+            <div class="up-file-box" v-if="addForm.rectifyMaterialUrl">
               <img src="@/assets/ZDimages/safetyCheck/icon_dr_wj.png">
-              <p>{{addForm.rectifyProjectName}}</p>
+              <p @click="lookFile">{{addForm.rectifyMaterialName}}</p>
               <p class="el-icon-close" @click="delFileButton"></p>
             </div>
           </el-form-item>
@@ -93,23 +93,23 @@
         fullScreenViewProps:[],
         itemShowType:true,
         addForm:{
-          rectifyStatus:null,
-          rectifyDescribe:'',
-          imgDtoList:[],
-          rectifyProjectUrl:'',
+          rectifyResult:null,
+          rectifyMeasure:'',
+          rectifyUploadList:[],
+          rectifyMaterialUrl:'',
         },
         rules:{
-          rectifyStatus: [
+          rectifyResult: [
             { required: true, message: "请选择整改结果", trigger: "blur" },
           ],
-          rectifyDescribe: [
+          rectifyMeasure: [
             { required: true, message: "请输入整改措施", trigger: "blur" },
             { required: true, message: "请输入整改措施", validator: this.spaceJudgment, trigger: "blur" }
           ],
-          imgDtoList: [
+          rectifyUploadList: [
             { required: true, message: "请上传现场照片", trigger: "blur" },
           ],
-          rectifyProjectUrl: [
+          rectifyMaterialUrl: [
             { required: true, message: "请上传整改方案", trigger: "blur" },
           ],
         },
@@ -138,15 +138,16 @@
       },
       //整改选择按钮
       checkButton(type){
-        if(this.addForm.rectifyStatus != type){
-          this.$set(this.addForm,'rectifyStatus',type);
+        if(this.addForm.rectifyResult != type){
+          this.$set(this.addForm,'rectifyResult',type);
+          this.$forceUpdate();
         }
       },
       /*==========上传相关==========*/
       handleAvatarSuccess(srt,res) {
         this.$set(this,'loading',false);
         if(srt == 'img'){
-          if(this.addForm.imgDtoList.length>5){
+          if(this.addForm.rectifyUploadList.length>5){
             this.msgError('最多只可上传6张')
             return
           }
@@ -160,8 +161,9 @@
           let obj ={
             fileName:this.upDataName,
             fileUrl:res.data.url,
+            fileType:2,
           };
-          this.addForm.imgDtoList.push(obj);
+          this.addForm.rectifyUploadList.push(obj);
         } else if(srt == 'file'){
           this.$set(this,'loading',false);
           let suffixName= this.upDataName.split('.')[this.upDataName.split('.').length - 2]
@@ -171,14 +173,14 @@
             this.msgError('文件名里包含逗号或分号，请修改后重新上传！')
             return
           }
-          this.$set(this.addForm,'rectifyProjectUrl',res.data.url);
-          this.$set(this.addForm,'rectifyProjectName',suffixName);
+          this.$set(this.addForm,'rectifyMaterialUrl',res.data.url);
+          this.$set(this.addForm,'rectifyMaterialName',suffixName);
         }
         this.$forceUpdate()
       },
       beforeAvatarUpload(srt,file) {
         if(srt == 'img'){
-          if(this.addForm.imgDtoList.length>5){
+          if(this.addForm.rectifyUploadList.length>5){
             this.msgError('最多只可上传6张')
             return false
           }
@@ -225,17 +227,24 @@
       },
       //删除文件
       delFileButton(){
-        this.$set(this.addForm,'rectifyProjectUrl','');
-        this.$set(this.addForm,'rectifyProjectName','');
+        this.$set(this.addForm,'rectifyMaterialUrl','');
+        this.$set(this.addForm,'rectifyMaterialName','');
       },
       //删除照片
       delImg(imgIndex){
-        this.addForm.imgDtoList.splice(imgIndex,1);
+        this.addForm.rectifyUploadList.splice(imgIndex,1);
       },
       //照片预览
       lookImg(list,index){
-        console.log('this.$parent.$parent',this.$parent.$parent)
-        this.$parent.$parent.fullScreenViewClick(list,index);
+        this.$parent.fullScreenViewClick(list,index);
+      },
+      //文件预览
+      lookFile(){
+        let obj = {
+          fileName:this.addForm.rectifyMaterialName,
+          fileUrl:this.addForm.rectifyMaterialUrl,
+        };
+        this.$parent.fullScreenFileLookClick(obj);
       },
     },
   }
@@ -432,6 +441,7 @@
           line-height:40px;
           font-size:14px;
           margin:0 30px 0 15px;
+          cursor: pointer;
         }
         p:nth-child(3){
           cursor: pointer;

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

@@ -140,9 +140,15 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
+                   v-if="scope.row.rectifyStatus == 2"
+                   @click="tableButton(1,scope.row)"
+
+                >整改</p>
+                <p class="table-button-p"
+                   v-if="scope.row.rectifyStatus != 2"
                    @click="tableButton(2,scope.row)"
 
-                >详情/整改</p>
+                >详情</p>
                 <p class="table-button-null"></p>
               </div>
             </template>
@@ -157,7 +163,7 @@
         />
       </div>
     </div>
-    <!--<add-page :propsData="propsData" v-if="pageType === 2"></add-page>-->
+    <initiateInspect v-if="pageType == 2" :initiateInspectData="initiateInspectData"></initiateInspect>
   </div>
 </template>
 <script>
@@ -169,12 +175,12 @@
     securityCheckOptionList,
     securityCheckDangerList,
   } from "@/api/safetyCheck/indexDemoOne";
-  //import addPage from "./addPage.vue";
+  import initiateInspect from "@/views/safetyCheck/components/initiateInspect/initiateInspect.vue";
   export default {
     name: 'index',
-    //components: {
-    //  addPage
-    //},
+    components: {
+      initiateInspect
+    },
     data () {
       return {
         tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
@@ -210,7 +216,7 @@
         //数据数量
         total:0,
         //组件传参
-        propsData:{},
+        initiateInspectData:{},
       }
     },
     created () {
@@ -272,48 +278,21 @@
       tableButton(type,row){
         let self = this;
         if(type == 1){
-          //新增
+          //整改
           this.$set(this,'pageType',2);
-          this.$set(this,'propsData',{});
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = false;
+          obj.orderTitle = '隐患整改';
+          obj.orderType = '3';
+          this.$set(this,'initiateInspectData',obj);
         }else if(type == 2){
           //详情
           this.$set(this,'pageType',2);
           let obj = JSON.parse(JSON.stringify(row))
           obj.showType = true;
-          this.$set(this,'propsData',obj);
-        }else if(type == 3){
-          //编辑
-          this.$set(this,'pageType',2);
-          let obj = JSON.parse(JSON.stringify(row))
-          obj.showType = false;
-          this.$set(this,'propsData',obj);
-        }else if(type == 4){
-          //删除
-          this.$confirm('是否确认删除?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-          }).then(() => {
-            deleteFunction({id:row.id}).then(response => {
-              self.msgSuccess(response.message)
-              self.getList();
-            });
-          }).catch(() => {});
-        }else if(type == 5){
-          //启用&停用
-          let text = row.state  ? "停用" : "启用";
-          this.$confirm('是否确认' + text + '?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-          }).then(() => {
-            stateFunction({id:row.id,state:!row.state,}).then(response => {
-              self.msgSuccess(response.message)
-              self.getList();
-            });
-          }).catch(() => {});
+          obj.orderTitle = '整改详情';
+          obj.orderType = '4';
+          this.$set(this,'initiateInspectData',obj);
         }else if(type == 6){
           //返回并刷新
           this.$set(this,'pageType',1);

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

@@ -140,9 +140,15 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
+                   v-if="scope.row.rectifyStatus == 2"
+                   @click="tableButton(1,scope.row)"
+
+                >整改</p>
+                <p class="table-button-p"
+                   v-if="scope.row.rectifyStatus != 2"
                    @click="tableButton(2,scope.row)"
 
-                >详情/整改</p>
+                >详情</p>
                 <p class="table-button-null"></p>
               </div>
             </template>
@@ -157,7 +163,7 @@
         />
       </div>
     </div>
-    <!--<add-page :propsData="propsData" v-if="pageType === 2"></add-page>-->
+    <initiateInspect v-if="pageType == 2" :initiateInspectData="initiateInspectData"></initiateInspect>
   </div>
 </template>
 <script>
@@ -169,12 +175,12 @@
     securityCheckOptionList,
     securityCheckDangerList,
   } from "@/api/safetyCheck/indexDemoOne";
-  //import addPage from "./addPage.vue";
+  import initiateInspect from "@/views/safetyCheck/components/initiateInspect/initiateInspect.vue";
   export default {
     name: 'index',
-    //components: {
-    //  addPage
-    //},
+    components: {
+      initiateInspect
+    },
     data () {
       return {
         tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
@@ -210,7 +216,7 @@
         //数据数量
         total:0,
         //组件传参
-        propsData:{},
+        initiateInspectData:{},
       }
     },
     created () {
@@ -272,48 +278,21 @@
       tableButton(type,row){
         let self = this;
         if(type == 1){
-          //新增
+          //整改
           this.$set(this,'pageType',2);
-          this.$set(this,'propsData',{});
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = false;
+          obj.orderTitle = '隐患整改';
+          obj.orderType = '3';
+          this.$set(this,'initiateInspectData',obj);
         }else if(type == 2){
           //详情
           this.$set(this,'pageType',2);
           let obj = JSON.parse(JSON.stringify(row))
           obj.showType = true;
-          this.$set(this,'propsData',obj);
-        }else if(type == 3){
-          //编辑
-          this.$set(this,'pageType',2);
-          let obj = JSON.parse(JSON.stringify(row))
-          obj.showType = false;
-          this.$set(this,'propsData',obj);
-        }else if(type == 4){
-          //删除
-          this.$confirm('是否确认删除?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-          }).then(() => {
-            deleteFunction({id:row.id}).then(response => {
-              self.msgSuccess(response.message)
-              self.getList();
-            });
-          }).catch(() => {});
-        }else if(type == 5){
-          //启用&停用
-          let text = row.state  ? "停用" : "启用";
-          this.$confirm('是否确认' + text + '?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-          }).then(() => {
-            stateFunction({id:row.id,state:!row.state,}).then(response => {
-              self.msgSuccess(response.message)
-              self.getList();
-            });
-          }).catch(() => {});
+          obj.orderTitle = '整改详情';
+          obj.orderType = '4';
+          this.$set(this,'initiateInspectData',obj);
         }else if(type == 6){
           //返回并刷新
           this.$set(this,'pageType',1);

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

@@ -97,15 +97,6 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <!--与我相关-->
-          <div class="form-button-max-big-box-me">
-            <div class="form-button-big-box-me">
-              <div :class="queryParams.myRelated==1?'checkDiv-me':''" @click="topRightClickType">
-                <p class="text-p-me">与我相关</p>
-                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
-              </div>
-            </div>
-          </div>
           <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
           <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
           <p class="page-save-common-style-button" style="display: inline-block;margin-left:10px;" @click="searchToggle">{{advancedType?'普通搜索':'高级搜索'}}</p>
@@ -139,13 +130,13 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
-                   @click="tableButton(2,scope.row)"
+                   @click="tableButton(1,scope.row)"
 
                 >复查</p>
                 <p class="table-button-p"
-                   @click="tableButton(3,scope.row)"
+                   @click="tableButton(2,scope.row)"
 
-                >编辑</p>
+                >详情</p>
                 <p class="table-button-p"
                    @click="tableButton(4,scope.row)"
 
@@ -164,19 +155,49 @@
         />
       </div>
     </div>
-    <!--<add-page :propsData="propsData" v-if="pageType === 2"></add-page>-->
+    <el-dialog class="reviewManage-dialog" title='复查人转移' width="745px" append-to-body
+               :visible.sync="dialogType" v-if="dialogType" @close="dialogOff()"
+               :close-on-click-modal="false" :close-on-press-escape="false">
+      <div class="reviewManage-dialog-max-box">
+        <p class="reviewManage-dialog-name">督导组名称</p>
+        <div class="reviewManage-dialog-box">
+          <img src="@/assets/ZDimages/safetyCheck/icon_xyxc_cy.png">
+          <p>成员列表</p>
+        </div>
+        <el-table class="table-box table-null-img-20" border :data="dialogData.dialogList1">
+          <el-table-column label="" align="center" width="150">
+            <template scope="scope">
+              <div class="check-img-box" @click="tableColumnCheck(scope.row.dialogDataId)">
+                <img src="@/assets/ZDimages/basicsModules/icon_fcrzy_wxz@1x.png" v-if="scope.row.dialogDataId != tableColumnType">
+                <img src="@/assets/ZDimages/basicsModules/icon_fcrzy_xz@1x.png" v-if="scope.row.dialogDataId == tableColumnType">
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="姓名" prop="name" show-overflow-tooltip/>
+          <el-table-column label="工号" prop="name" width="130" show-overflow-tooltip/>
+          <el-table-column label="所在部门" prop="content" width="188" show-overflow-tooltip/>
+        </el-table>
+      </div>
+      <div slot="footer" class="dialog-footer dialog-footer-box">
+        <p class="dialog-footer-button-null"></p>
+        <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">确认</p>
+        <p class="dialog-footer-button-null"></p>
+      </div>
+    </el-dialog>
+    <initiateInspect v-if="pageType == 2" :initiateInspectData="initiateInspectData"></initiateInspect>
   </div>
 </template>
 <script>
   //import { getDicts } from "@/api/commonality/noPermission";
   //import { systemUserSelect } from "@/api/commonality/permission";
   //import { getInfo } from "@/api/basicsModules/index";
-  //import addPage from "./addPage.vue";
+  import initiateInspect from "@/views/safetyCheck/components/initiateInspect/initiateInspect.vue";
   export default {
     name: 'index',
-    //components: {
-    //  addPage
-    //},
+    components: {
+      initiateInspect
+    },
     data () {
       return {
         tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
@@ -192,7 +213,6 @@
         queryParams:{
           page:1,
           pageSize:20,
-          myRelated:1,
           queryParamsData1:"",
           queryParamsData2 :null,
         },
@@ -205,7 +225,29 @@
         //数据数量
         total:0,
         //组件传参
-        propsData:{},
+        initiateInspectData:{},
+        //复查转移
+        dialogData:{
+          dialogData1:'督导组名称',
+          dialogList1:[
+            {
+              dialogDataId:1,
+              dialogDataType:false,
+              dialogDataName:'名称',
+              dialogDataNum:'工号',
+              dialogDataDept:'部门',
+            },
+            {
+              dialogDataId:2,
+              dialogDataType:false,
+              dialogDataName:'名称',
+              dialogDataNum:'工号',
+              dialogDataDept:'部门',
+            },
+          ],
+        },
+        dialogType:false,
+        tableColumnType:null
       }
     },
     created () {
@@ -226,11 +268,6 @@
       searchToggle(){
         this.$set(this,'advancedType',!this.advancedType);
       },
-      //与我相关按钮
-      topRightClickType(){
-        this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
-        this.handleQuery();
-      },
       //查询按钮
       handleQuery(){
         this.$set(this.queryParams,'page',1);
@@ -242,7 +279,6 @@
         this.$set(this,'queryParams',{
           page:1,
           pageSize:20,
-          myRelated:1,
           queryParamsData1:"",
           queryParamsData2 :null,
         });
@@ -269,54 +305,53 @@
       tableButton(type,row){
         let self = this;
         if(type == 1){
-          //新增
+          //整改
           this.$set(this,'pageType',2);
-          this.$set(this,'propsData',{});
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = false;
+          obj.orderTitle = '隐患整改';
+          obj.orderType = '3';
+          this.$set(this,'initiateInspectData',obj);
         }else if(type == 2){
           //详情
           this.$set(this,'pageType',2);
           let obj = JSON.parse(JSON.stringify(row))
           obj.showType = true;
-          this.$set(this,'propsData',obj);
-        }else if(type == 3){
-          //编辑
-          this.$set(this,'pageType',2);
-          let obj = JSON.parse(JSON.stringify(row))
-          obj.showType = false;
-          this.$set(this,'propsData',obj);
+          obj.orderTitle = '整改详情';
+          obj.orderType = '4';
+          this.$set(this,'initiateInspectData',obj);
         }else if(type == 4){
-          //删除
-          this.$confirm('是否确认删除?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-          }).then(() => {
-            deleteFunction({id:row.id}).then(response => {
-              self.msgSuccess(response.message)
-              self.getList();
-            });
-          }).catch(() => {});
-        }else if(type == 5){
-          //启用&停用
-          let text = row.state  ? "停用" : "启用";
-          this.$confirm('是否确认' + text + '?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-          }).then(() => {
-            stateFunction({id:row.id,state:!row.state,}).then(response => {
-              self.msgSuccess(response.message)
-              self.getList();
-            });
-          }).catch(() => {});
+          //转移
+          this.dialogOpen();
         }else if(type == 6){
           //返回并刷新
           this.$set(this,'pageType',1);
           this.getList();
         }
       },
+      /******** 转移弹窗 ********/
+      //弹层关闭
+      dialogOff(){
+        this.$set(this,'dialogType',false);
+      },
+      //弹层开启
+      dialogOpen(){
+        this.$set(this,'tableColumnType',null);
+        this.$set(this,'dialogType',true);
+      },
+      //弹层确定
+      dialogSubmit(){
+        if(!this.tableColumnType){
+          this.msgError('请选择复查转移人')
+          return
+        }
+        this.$set(this,'dialogType',false);
+      },
+      tableColumnCheck(row) {
+        if(this.tableColumnType != row){
+          this.$set(this,'tableColumnType',row);
+        }
+      },
     },
   }
 </script>
@@ -395,3 +430,54 @@
     }
   }
 </style>
+<style lang="scss">
+  .reviewManage-dialog{
+    .el-dialog__body{
+      padding-top: 0;
+    }
+    .reviewManage-dialog-max-box{
+      height:500px;
+      display: flex;
+      flex-direction: column;
+      overflow: hidden;
+      flex:1;
+      .reviewManage-dialog-name{
+        line-height:70px;
+        height:70px;
+        font-size:16px;
+      }
+      .reviewManage-dialog-box{
+        display: flex;
+        border:1px solid #dedede;
+        border-bottom:none;
+        height:40px;
+        img{
+          width:14px;
+          height:14px;
+          display: inline-block;
+          margin:13px 15px;
+        }
+        p:nth-child(2){
+          flex:1;
+          font-size:14px;
+          line-height:40px;
+          color:#333;
+        }
+      }
+      .check-img-box{
+        cursor: pointer;
+        height:27px;
+        width:130px;
+        margin:0 auto;
+        overflow: hidden;
+        img{
+          overflow: hidden;
+          height:20px;
+          width:20px;
+          display: inline-block;
+          margin:3px 55px;
+        }
+      }
+    }
+  }
+</style>