From 50d33c74675a9d9eee957a685d9e55b77974f6f9 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 06 一月 2023 16:44:06 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/index.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/index.vue b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/index.vue
index a471d01..3e4bea4 100644
--- a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/index.vue
+++ b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/index.vue
@@ -12,7 +12,12 @@
<span>整改部门：</span>
<el-cascader :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable class="input-box" v-model="checkData.params.rectifyDepId"> </el-cascader>
</div>
-
+ <div class="basic-line">
+ <span>整改状态：</span>
+ <el-select class="input-box" v-model="checkData.params.dangerStatus" placeholder="整改状态" clearable filterable>
+ <el-option v-for="item in dangerStatusList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
+ </div>
<el-button size="default" type="primary" class="ml10" v-throttle @click="handleSearch">
<el-icon>
<ele-Search />
@@ -22,6 +27,8 @@
</div>
<el-table :data="checkData.data" style="width: 100%" fit highlight-current-row>
<el-table-column type="index" label="序号" width="60" />
+ <el-table-column prop="reportTime" label="上报时间" show-overflow-tooltip width="170px"></el-table-column>
+ <el-table-column prop="dangerCode" label="隐患名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="rectifyDesc" label="整改内容说明" show-overflow-tooltip min-width="150px"></el-table-column>
<el-table-column prop="applyTime" label="整改时间" show-overflow-tooltip min-width="150px"></el-table-column>
<el-table-column prop="rectifyType" label=" 整改类型" show-overflow-tooltip min-width="150px">
@@ -119,10 +126,7 @@
{ id: 2, name: '限期整改' }
],
dangerStatusList: [
- { id: 0, name: '整改中' },
{ id: 1, name: '待验收' },
- { id: 2, name: '延期整改' },
- { id: 4, name: '超期未整改' },
{ id: 9, name: '已验收' }
]
});
--
Gitblit v1.9.2