From a6bb6c451c163570fba1a6c20e84facf03a9db36 Mon Sep 17 00:00:00 2001
From: cqf
Date: 星期三, 25 五月 2022 13:51:50 +0800
Subject: [PATCH] 修改导出分页问题+隐患部门value问题
---
src/views/oneFromanotherN/index.vue | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/views/oneFromanotherN/index.vue b/src/views/oneFromanotherN/index.vue
index 6e81886..856f228 100644
--- a/src/views/oneFromanotherN/index.vue
+++ b/src/views/oneFromanotherN/index.vue
@@ -77,7 +77,7 @@
<el-radio-button label="0">待发送</el-radio-button>
<el-radio-button label="1">已发送</el-radio-button>
</el-radio-group>
- <el-radio-group v-if="table2" >
+ <el-radio-group v-if="table2" >
<el-radio-button label="0">待自查</el-radio-button>
<el-radio-button label="1">已自查</el-radio-button>
</el-radio-group>
@@ -98,6 +98,7 @@
<div v-if="table1">
<el-table ref="dataTable"
v-if="listQuery.type==0"
+ v-loading="loading"
:data="tableData"
style="width: 100%"
@selection-change="handleSelectionChange">
@@ -114,7 +115,7 @@
<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 prop="address" label="隐患地点" align="center"></el-table-column>
- <el-table-column prop="ht_content" label="隐患内容" width="200" align="center"></el-table-column>
+ <el-table-column prop="ht_content" show-overflow-tooltip label="隐患内容" width="200" align="center"></el-table-column>
<!-- <el-table-column prop="curWarningLevel" label="下发单位" align="center"></el-table-column> -->
<el-table-column prop="date" label="基本操作" align="center">
<template slot-scope="scope">
@@ -137,7 +138,7 @@
<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 prop="address" label="隐患地点" align="center"></el-table-column>
- <el-table-column prop="ht_content" label="隐患内容" width="200" align="center"></el-table-column>
+ <el-table-column prop="ht_content" show-overflow-tooltip label="隐患内容" width="200" align="center"></el-table-column>
<el-table-column prop="workGroupName" label="发送单位" align="center"></el-table-column>
<el-table-column prop="state" label="未自查单位" align="center"></el-table-column>
</el-table>
@@ -285,7 +286,7 @@
v-for="item in YHBMList"
v-model="checked"
:label="item.branch_id"
- :key="item.branch_id">
+ :key="item.branch_name">
{{item.branch_name}}
</el-checkbox>
</el-row>
@@ -322,9 +323,6 @@
radio1:'待发送',
table1:true,
table2:false,
-
-
-
currentPage: 1,
pageSize: 10,
recordTotal: 0,
@@ -338,6 +336,7 @@
JCLBList:[],
tableData:[],
selectedList:[],
+ loading:false,
listLoading: false,
selfInspectVisible: false,
selfInspectForm:{
@@ -448,19 +447,14 @@
}
}
- if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
- if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
- }else {
- this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
- return
- }
- }
},
//搜索
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
--
Gitblit v1.9.2