|
|
@@ -6,21 +6,21 @@
|
|
|
<el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
|
|
|
<div class="form-button-max-big-box">
|
|
|
<div class="form-button-big-box" style="margin-left:10px;">
|
|
|
- <div :class="queryParams.buttonType==1?'checkDiv':''" @click="topLeftClickType(1)">
|
|
|
+ <div :class="queryParams.manageStatus=='-1'?'checkDiv':''" @click="topLeftClickType('-1')">
|
|
|
<p class="text-p">全部</p>
|
|
|
- <p class="el-icon-check icon-p" v-if="queryParams.buttonType==1"></p>
|
|
|
+ <p class="el-icon-check icon-p" v-if="queryParams.manageStatus=='-1'"></p>
|
|
|
</div>
|
|
|
- <div :class="queryParams.buttonType==2?'checkDiv':''" @click="topLeftClickType(2)">
|
|
|
+ <div :class="queryParams.manageStatus==0?'checkDiv':''" @click="topLeftClickType(0)">
|
|
|
<p class="text-p">待检查</p>
|
|
|
- <p class="el-icon-check icon-p" v-if="queryParams.buttonType==2"></p>
|
|
|
+ <p class="el-icon-check icon-p" v-if="queryParams.manageStatus==0"></p>
|
|
|
</div>
|
|
|
- <div :class="queryParams.buttonType==3?'checkDiv':''" @click="topLeftClickType(3)">
|
|
|
+ <div :class="queryParams.manageStatus==1?'checkDiv':''" @click="topLeftClickType(1)">
|
|
|
<p class="text-p">检查中</p>
|
|
|
- <p class="el-icon-check icon-p" v-if="queryParams.buttonType==3"></p>
|
|
|
+ <p class="el-icon-check icon-p" v-if="queryParams.manageStatus==1"></p>
|
|
|
</div>
|
|
|
- <div :class="queryParams.buttonType==4?'checkDiv':''" @click="topLeftClickType(4)">
|
|
|
+ <div :class="queryParams.manageStatus==2?'checkDiv':''" @click="topLeftClickType(2)">
|
|
|
<p class="text-p">已检查</p>
|
|
|
- <p class="el-icon-check icon-p" v-if="queryParams.buttonType==4"></p>
|
|
|
+ <p class="el-icon-check icon-p" v-if="queryParams.manageStatus==2"></p>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -33,13 +33,13 @@
|
|
|
style="width: 250px"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="学院" prop="data1" label-width="50px">
|
|
|
- <el-select v-model="queryParams.data1" clearable placeholder="请选择学院" style="width: 150px">
|
|
|
+ <el-form-item label="学院" prop="deptId" label-width="50px">
|
|
|
+ <el-select v-model="queryParams.deptId" clearable placeholder="请选择学院" style="width: 150px">
|
|
|
<el-option
|
|
|
- v-for="item in optionsOne"
|
|
|
- :key="item.key"
|
|
|
- :label="item.label"
|
|
|
- :value="item.key">
|
|
|
+ v-for="item in deptSelectList"
|
|
|
+ :key="item.deptId"
|
|
|
+ :label="item.deptName"
|
|
|
+ :value="item.deptId">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -99,9 +99,9 @@
|
|
|
<template slot-scope="scope">
|
|
|
<div class="table-button-box">
|
|
|
<p class="table-button-null"></p>
|
|
|
- <p class="table-button-p" v-if="scope.row.manageStatus!=0" @click="goAddPage(3)">详情</p>
|
|
|
- <p class="table-button-p" v-if="scope.row.manageStatus==0">编辑</p>
|
|
|
- <p class="table-button-p" v-if="scope.row.manageStatus==0" @click="goAddPage(2)">开始检查</p>
|
|
|
+ <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
|
|
|
+ <p class="table-button-p" v-if="scope.row.manageStatus==1" @click="goAddPage(2,scope.row.id)">编辑</p>
|
|
|
+ <p class="table-button-p" v-if="scope.row.manageStatus==0" @click="goAddPage(2,scope.row.id)">开始检查</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.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
|
|
|
<p class="table-button-null"></p>
|
|
|
@@ -118,16 +118,17 @@
|
|
|
/>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <addPage v-if="pageType==2"></addPage>
|
|
|
- <infoPage v-if="pageType==3"></infoPage>
|
|
|
+ <addPage v-if="pageType==2" :propsAddData="propsAddData"></addPage>
|
|
|
+ <infoPage v-if="pageType==3" :propsInfoData="propsInfoData"></infoPage>
|
|
|
<lookDocumentDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDialog>
|
|
|
<lookDocumentListDialog v-if="lookDocumentListType" :propsLookDocumentListData="propsLookDocumentListData"></lookDocumentListDialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
- import { findByCheckPlanId } from '@/api/safetyCheck/index'
|
|
|
- import addPage from './addPage.vue'
|
|
|
+ import { listDepartments } from "@/api/system/dept";
|
|
|
+ import { checkManageList } from '@/api/safetyCheck/index'
|
|
|
+ import addPage from '@/views/safetyCheck/components/addPage/addPage.vue'
|
|
|
import infoPage from '@/views/safetyCheck/components/infoPage/infoPage.vue'
|
|
|
import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
|
|
|
import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
|
|
|
@@ -146,33 +147,56 @@
|
|
|
propsLookDocumentData:{},
|
|
|
lookDocumentListType:false,
|
|
|
propsLookDocumentListData:{},
|
|
|
+ propsAddData:{},
|
|
|
+ propsInfoData:{},
|
|
|
+ //学院列表
|
|
|
+ deptSelectList:[],
|
|
|
pageType:1,
|
|
|
queryParams:{
|
|
|
pageNum:1,
|
|
|
pageSize:20,
|
|
|
- buttonType:1,
|
|
|
- isSelf:0,
|
|
|
- timeType:0,
|
|
|
+ checkType:2,
|
|
|
+ manageStatus:'-1',
|
|
|
+ checkTimeSort:0,
|
|
|
searchValue:"",
|
|
|
- data1:""
|
|
|
+ deptId:"",
|
|
|
+ isSelf:0,
|
|
|
},
|
|
|
dateRange:[],
|
|
|
- tableList:[{}],
|
|
|
+ tableList:[],
|
|
|
total:0,
|
|
|
- optionsOne:[{key:1,label:"校级"},{key:2,label:"院级"}],
|
|
|
- optionsTwo:[{key:1,label:"启用"},{key:0,label:"停用"}],
|
|
|
}
|
|
|
},
|
|
|
created(){
|
|
|
|
|
|
},
|
|
|
mounted(){
|
|
|
-
|
|
|
+ this.listDepartments();
|
|
|
+ this.getList();
|
|
|
},
|
|
|
methods:{
|
|
|
//开始检查
|
|
|
- goAddPage(type){
|
|
|
- this.$set(this,'pageType',type);
|
|
|
+ goAddPage(type,id){
|
|
|
+ if(this.pageType != type){
|
|
|
+ if(type == 1){
|
|
|
+ //返回
|
|
|
+ this.$set(this,'pageType',type);
|
|
|
+ }else if(type == 2){
|
|
|
+ //开始检查/编辑
|
|
|
+ this.$set(this,'propsAddData',{
|
|
|
+ id:id,
|
|
|
+ title:'实验室自查',
|
|
|
+ });
|
|
|
+ this.$set(this,'pageType',type);
|
|
|
+ }else if(type == 3){
|
|
|
+ //详情
|
|
|
+ this.$set(this,'pageType',type);
|
|
|
+ }else if(type == 4){
|
|
|
+ //返回并刷新
|
|
|
+ this.getList();
|
|
|
+ this.$set(this,'pageType',1);
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
//时间排序方法
|
|
|
sortChange(val){
|
|
|
@@ -182,22 +206,32 @@
|
|
|
},
|
|
|
//范围选择
|
|
|
topLeftClickType(type){
|
|
|
- if(this.queryParams.buttonType != type){
|
|
|
- this.$set(this.queryParams,'buttonType',type);
|
|
|
+ if(this.queryParams.manageStatus != type){
|
|
|
+ this.$set(this.queryParams,'manageStatus',type);
|
|
|
this.getList();
|
|
|
}
|
|
|
},
|
|
|
topRightClickType(){
|
|
|
this.$set(this.queryParams,'isSelf',this.queryParams.isSelf==1?0:1);
|
|
|
+ this.getList();
|
|
|
},
|
|
|
//获取数据列表
|
|
|
getList(){
|
|
|
- // this.queryParamsData = JSON.parse(JSON.stringify(this.queryParams));
|
|
|
- // this.queryParamsData.type = 'RFID_RECOGNIZER';
|
|
|
- // listHardware(this.queryParamsData).then(response => {
|
|
|
- // this.total = response.total;
|
|
|
- // this.tableList = response.rows;
|
|
|
- // });
|
|
|
+ let obj = JSON.parse(JSON.stringify(this.queryParams))
|
|
|
+ if(this.dateRange[0]){
|
|
|
+ obj.startTime = this.dateRange[0];
|
|
|
+ }else{
|
|
|
+ obj.startTime = "";
|
|
|
+ }
|
|
|
+ if(this.dateRange[1]){
|
|
|
+ obj.endTime = this.dateRange[1];
|
|
|
+ }else{
|
|
|
+ obj.endTime = "";
|
|
|
+ }
|
|
|
+ checkManageList(obj).then(response => {
|
|
|
+ this.total = response.data.total;
|
|
|
+ this.tableList = response.data.records;
|
|
|
+ });
|
|
|
},
|
|
|
/** 搜索按钮操作 */
|
|
|
handleQuery() {
|
|
|
@@ -210,11 +244,12 @@
|
|
|
this.$set(this,'queryParams',{
|
|
|
pageNum:1,
|
|
|
pageSize:20,
|
|
|
- buttonType:1,
|
|
|
- timeType:0,
|
|
|
- isSelf:0,
|
|
|
+ checkType:2,
|
|
|
+ manageStatus:'-1',
|
|
|
+ checkTimeSort:0,
|
|
|
searchValue:"",
|
|
|
- data1:""
|
|
|
+ deptId:"",
|
|
|
+ isSelf:0,
|
|
|
});
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
@@ -243,6 +278,12 @@
|
|
|
this.$set(this,'lookDocumentListType',false);
|
|
|
}
|
|
|
},
|
|
|
+ //获取学院列表
|
|
|
+ listDepartments(){
|
|
|
+ listDepartments().then(response => {
|
|
|
+ this.deptSelectList = response.data;
|
|
|
+ });
|
|
|
+ },
|
|
|
},
|
|
|
}
|
|
|
</script>
|
dedsudiyu