From a6bb6c451c163570fba1a6c20e84facf03a9db36 Mon Sep 17 00:00:00 2001
From: cqf
Date: 星期三, 25 五月 2022 13:51:50 +0800
Subject: [PATCH] 修改导出分页问题+隐患部门value问题
---
src/views/hiddenDangerRectification/index.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue
index 521cf84..c7e49ca 100644
--- a/src/views/hiddenDangerRectification/index.vue
+++ b/src/views/hiddenDangerRectification/index.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>
@@ -149,7 +149,7 @@
<el-button class="btns" type="primary" size="small" @click="applyDelay()">申请延期</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">
@@ -201,7 +201,7 @@
<el-table-column prop="ACCOMPLISHTIME" label="完成时间" :formatter="formatColumnDate" width="120" 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="复查时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
</el-table-column>
<el-table-column label="隐患处理状态" align="center">
<template slot-scope="scope">
@@ -312,6 +312,7 @@
YHBMList: [],
YHJBList: [],
tableData: [],
+ loading:false,
listQuery: {
page: 1,
limit: 10,
@@ -429,7 +430,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
@@ -603,12 +606,14 @@
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
},
exportData(){
- var requestData = this.listQuery;
+ this.listLoading = true
+ var requestData = JSON.parse(JSON.stringify(this.listQuery));
requestData.export_type = 2;
//删除分页参数
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