From f86e7a28563a8fa129a67cf3e0e6efa534fc3be7 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Tue, 31 May 2022 15:06:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue
index 71406d5..2e8191b 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue
@@ -5,6 +5,21 @@
<span class="span-filter-label">单号</span>
<el-input style="width: 140px" v-model="filter.filter.code" ></el-input>
+ <span class="span-filter-label">状态</span>
+ <el-select
+ v-model="filter.filter.status"
+ class="filter-item"
+ clearable
+ @clear="clearStatus"
+ style="width:150px;margin-bottom: 10px">
+ <el-option
+ v-for="item in reportStatus"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
+
<span class="span-filter-label">隐患等级</span>
<el-select v-model="filter.filter.level" clearable @clear="clearLevel" placeholder="请选择">
<el-option
@@ -17,6 +32,16 @@
<span class="span-filter-label">上报人</span>
<el-input style="width: 160px" v-model="filter.filter.requestorName"></el-input>
+
+ <span class="span-filter-label">隐患来源</span>
+ <el-select v-model="filter.filter.source" clearable placeholder="请选择">
+ <el-option
+ v-for="item in sources"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
@click="queryHandle"/>
</div>
@@ -40,7 +65,12 @@
</el-table-column>
<el-table-column label="隐患等级" prop="level" align="center" >
<template slot-scope="scope">
- <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ <el-tag :type="scope.row.level == '重大隐患'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="隐患来源" prop="source" align="center" >
+ <template slot-scope="scope">
+ <span>{{sources.find(item=>item.key === scope.row.source).value}}</span>
</template>
</el-table-column>
<el-table-column label="上报人" prop="requestor" align="center" />
@@ -100,8 +130,18 @@
tableData:[],
listLoading: false,
levels:[
- {"key":"URGENT","value":"紧急"},
- {"key":"COMMON","value":"一般"},
+ {"key":"URGENT","value":"重大隐患"},
+ {"key":"COMMON","value":"一般隐患"},
+ ],
+ sources:[
+ {"key":1,"value":"隐患上报"},
+ {"key":2,"value":"巡检上报"},
+ ],
+ reportStatus:[
+ {"key":"TORECTIFY","value":"待整改"},
+ {"key":"TOACCEPT","value":"整改待验收"},
+ {"key":"REJECTED","value":"驳回待整改"},
+ {"key":"COMPLETED","value":"已完成"},
],
dataForm: {
id:'',
@@ -115,6 +155,7 @@
pageIndex:1,
pageSize:10,
filter:{
+ status:null,
code:'',
requestorName:'',
level:null,
@@ -182,7 +223,10 @@
},
clearLevel(){
this.filter.filter.level = null
- }
+ },
+ clearStatus(){
+ this.filter.filter.status = null
+ },
}
}
@@ -194,7 +238,7 @@
color: red;
}
.overdue-img{
- position: fixed;
+ position: absolute;
background-color: #f56c6c;
border-radius: 4px;
color: #fff;
--
Gitblit v1.9.2