From 44d7a737dc0d63ad1dd7c52d45fc2233d1950173 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 09 六月 2022 09:56:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master
---
src/views/hiddenDangerReview/recheckCancellationNumber.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/views/hiddenDangerReview/recheckCancellationNumber.vue b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
index 5126227..ebb4619 100644
--- a/src/views/hiddenDangerReview/recheckCancellationNumber.vue
+++ b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
@@ -45,7 +45,7 @@
v-for="item in YHBMList"
:key="item.branch_id"
:label="item.branch_name"
- :value="item.branch_id">
+ :value="item.branch_name">
</el-option>
</el-select>
</el-form-item>
@@ -151,7 +151,7 @@
<el-button class="btns" type="primary" size="small">批量发送</el-button>
</el-col>
</el-row>
- <el-table :data="tableData" ref="dangerRectificationTable" style="width: 100%">
+ <el-table :data="tableData" ref="dangerRectificationTable" style="width: 100%" v-loading="loading">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column prop="number" label="编号" align="center" width="120">
<template slot-scope="scope">
@@ -194,7 +194,7 @@
<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 prop="measure" label="整改措施" width="150" align="center">
<template slot-scope="scope">
<el-popover trigger="hover" placement="top">
<p>{{ scope.row.measure }}</p>
@@ -233,7 +233,7 @@
<el-table-column prop="DTRisk_level" label="风险等级" align="center"></el-table-column>
<el-table-column prop="warningLevel" label="初始警情" align="center"></el-table-column>
<el-table-column prop="curWarningLevel" label="当前警情" align="center"></el-table-column>
- <el-table-column prop="date" label="流程操作" align="center">
+ <el-table-column prop="date" label="流程操作" align="center" fixed="right">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
</template>
@@ -241,7 +241,7 @@
</el-table>
<!--批量复查弹窗-->
<el-dialog
- title="提示"
+ title="发送隐患单"
:visible.sync="dialogVisible"
:close-on-click-modal="false"
width="30%"
@@ -358,6 +358,7 @@
YHBMList: [],
YHJBList: [],
tableData: [],
+ loading:false,
ruleForm: {
id: "",
step: "3",
@@ -471,7 +472,9 @@
getPageList() {
this.listQuery.page = 1
this.checkTime()
+ this.loading = true
getPageList(this.listQuery).then(res => {
+ this.loading =false
if (res.data.ok == 1) {
this.tableData = res.data.data.items
this.recordTotal = res.data.data.total
@@ -566,12 +569,14 @@
}
},
exportData() {
- var requestData = this.listQuery;
+ this.listLoading = true
+ var requestData = JSON.parse(JSON.stringify(this.listQuery));
requestData.export_type = 3;
//删除分页参数
this.$delete(requestData, 'page')
this.$delete(requestData, 'limit')
danger_export_do(requestData).then(res => {
+ this.listLoading = false
var blob = new Blob([res.data])
var downloadElement = document.createElement('a')
var href = window.URL.createObjectURL(blob) //创建下载的链接
--
Gitblit v1.9.2