From c1df656dee7e75d109d2bee05f0c129e13e9367a Mon Sep 17 00:00:00 2001
From: panzy <225@qq.com>
Date: 星期六, 21 五月 2022 06:49:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shf' into shf
---
src/views/safetyHazardAccount/index.vue | 114 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 85 insertions(+), 29 deletions(-)
diff --git a/src/views/safetyHazardAccount/index.vue b/src/views/safetyHazardAccount/index.vue
index e15ac5a..66ae526 100644
--- a/src/views/safetyHazardAccount/index.vue
+++ b/src/views/safetyHazardAccount/index.vue
@@ -43,9 +43,9 @@
<el-select v-model="listQuery.form.ht_branch" placeholder="请选择">
<el-option
v-for="item in YHBMList"
- :key="item.branch_id"
+ :key="item.branch_name"
:label="item.branch_name"
- :value="item.branch_id">
+ :value="item.branch_name">
</el-option>
</el-select>
</el-form-item>
@@ -96,12 +96,12 @@
</el-select>
</el-form-item>
<el-form-item label="风险等级">
- <el-select v-model="listQuery.form.DTRisk_bankId" placeholder="请选择">
+ <el-select v-model="listQuery.form.DTRisk_level" placeholder="请选择">
<el-option
- v-for="item in reList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in levelList"
+ :key="item.name"
+ :label="item.name"
+ :value="item.name">
</el-option>
</el-select>
</el-form-item>
@@ -116,7 +116,7 @@
</el-select>
</el-form-item>
<el-form-item label="深入现场情况">
- <el-select v-model="listQuery.form.createBy" placeholder="请选择">
+ <el-select v-model="listQuery.form.class_situation" placeholder="请选择">
<el-option
v-for="item in llrList"
:key="item.id"
@@ -126,22 +126,22 @@
</el-select>
</el-form-item>
<el-form-item label="是否关联">
- <el-select v-model="listQuery.form.createBy" placeholder="请选择">
+ <el-select v-model="listQuery.form.DTRisk_bankId" placeholder="请选择">
<el-option
- v-for="item in llrList"
- :key="item.id"
- :label="item.realName"
- :value="item.id">
+ v-for="item in reList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="复查单位">
- <el-select v-model="listQuery.form.createBy" placeholder="请选择">
+ <el-select v-model="listQuery.form.callback_branch" placeholder="请选择">
<el-option
- v-for="item in llrList"
- :key="item.id"
- :label="item.realName"
- :value="item.id">
+ v-for="item in YHBMList"
+ :key="item.branch_id"
+ :label="item.branch_name"
+ :value="item.branch_id">
</el-option>
</el-select>
</el-form-item>
@@ -189,7 +189,7 @@
<el-col :span="12" style="text-align:right;" v-if="YHType=='0'">
<el-button type="primary" class="btns" size="small" @click="supervision('1')">督查督办</el-button>
<el-button type="primary" class="btns" size="small" @click="supervision('2')">举一反三</el-button>
- <el-button type="primary" class="btns" size="small" @click="base()">双基考核</el-button>
+ <!-- <el-button type="primary" class="btns" size="small" @click="base()">双基考核</el-button>-->
<el-button type="primary" class="btns" size="small" @click='deleteBatch'>删除</el-button>
</el-col>
</el-row>
@@ -200,24 +200,59 @@
<el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
<el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
<el-table-column label="隐患项目" align="center">
- <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
- <el-table-column prop="address" label="地点" align="center"></el-table-column>
- <el-table-column prop="ht_content" label="内容" align="center"></el-table-column>
+ <el-table-column prop="check_date" label="检查时间" width="120" align="center">
+ <template slot-scope="scope">
+ <label>{{ formatDate(scope.row.check_date) }}</label><br/>
+ <label>{{ scope.row.check_class }}</label>
+ </template>
+ </el-table-column>
+ <el-table-column prop="address" label="地点" align="center">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.address }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.address != null && scope.row.address.length > 10 ? scope.row.address.substring(0, 8) + "...." : scope.row.address
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </el-table-column>
+ <el-table-column prop="ht_content" label="内容" width="150" align="center">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.ht_content }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </el-table-column>
<el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
<el-table-column prop="ht_level" label="级别" align="center"></el-table-column>
</el-table-column>
<el-table-column label="整改计划" align="center">
- <el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
+ <el-table-column prop="measure" label="整改措施" width="150" align="center">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.measure }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.measure != null && scope.row.measure.length > 10 ? scope.row.measure.substring(0, 8) + "...." : scope.row.measure
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </el-table-column>
<el-table-column prop="ht_branch" label="隐患部门" align="center"></el-table-column>
<el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
- <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="alter_time" label="限改时间" width="120" :formatter="formatColumnDate" align="center"></el-table-column>
<!-- <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column> -->
</el-table-column>
<el-table-column label="整改情况" align="center">
- <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" align="center"></el-table-column>
+ <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" :formatter="formatColumnDate" align="center"></el-table-column>
<el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
<el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
- <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" :formatter="formatColumnDate" align="center"></el-table-column>
</el-table-column>
<el-table-column label="隐患处理状态" align="center">
<template slot-scope="scope">
@@ -229,7 +264,7 @@
</el-table-column>
<el-table-column prop="DTRisk_bankId" label="是否关联" align="center">
<template slot-scope="scope">
- <span
+ <span style ="color: red"
v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
<span v-else>已关联</span>
</template>
@@ -272,7 +307,8 @@
>
<el-form>
<el-row>
- <el-checkbox style="width: 80px;height: 30px" v-for="item in YHBMList" v-model="checked"
+ <el-checkbox style="width: 80px;height: 30px" :key="item.branch_id" v-for="item in YHBMList"
+ v-model="checked"
:label="item.branch_id">{{
item.branch_name
}}
@@ -321,6 +357,7 @@
YHJBList: [],
tableData: [],
requestData: {},
+ levelList:[{id:1,name:'低风险'},{id:2,name:'一般风险'},{id:3,name:'较大风险'},{id:4,name:'重大风险'}],
listQuery: {
page: 1,
limit: 10,
@@ -522,7 +559,7 @@
},
updateClick(row) {
this.$router.push({
- path: "/hiddenDangerAdd?id=" + row.id +"&route=safetyHazardAccount"
+ path: "/hiddenDangerAdd?id=" + row.id + "&route=safetyHazardAccount"
})
},
jump() {
@@ -536,6 +573,25 @@
path: "/hiddenDangerList?id=" + row.id,
})
},
+ //方法区
+ formatDate(data) {
+ // 获取单元格数据
+ if (data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
+ },
+ //方法区
+ formatColumnDate(row, column) {
+ // 获取单元格数据
+ let data = row[column.property]
+ if (data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
+ },
deleteClick(row) {
this.$confirm('确认删除吗', '提示', {
confirmButtonText: '确认',
--
Gitblit v1.9.2