|
|
@ -95,6 +95,7 @@ |
|
|
</el-form> |
|
|
</el-form> |
|
|
|
|
|
|
|
|
<el-table |
|
|
<el-table |
|
|
|
|
|
v-if="queryForm.groupType === '0'" |
|
|
:data="dataList" |
|
|
:data="dataList" |
|
|
border |
|
|
border |
|
|
:height="height" |
|
|
:height="height" |
|
|
@ -103,14 +104,38 @@ |
|
|
:row-style="controlRowStyle" |
|
|
:row-style="controlRowStyle" |
|
|
style="width: 100%;"> |
|
|
style="width: 100%;"> |
|
|
<el-table-column |
|
|
<el-table-column |
|
|
v-if="queryForm.groupType === '0'" |
|
|
|
|
|
type="selection" |
|
|
type="selection" |
|
|
header-align="center" |
|
|
header-align="center" |
|
|
align="center" |
|
|
align="center" |
|
|
width="50"> |
|
|
width="50"> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
<el-table-column |
|
|
<el-table-column |
|
|
v-for="(item,index) in columnList" :key="index" |
|
|
|
|
|
|
|
|
v-for="(item,index) in arrayColumns" :key="index" |
|
|
|
|
|
:sortable="item.columnSortable" |
|
|
|
|
|
:prop="item.columnProp" |
|
|
|
|
|
:header-align="item.headerAlign" |
|
|
|
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
|
|
|
:align="item.align" |
|
|
|
|
|
:fixed="item.fixed==''?false:item.fixed" |
|
|
|
|
|
:min-width="item.columnWidth" |
|
|
|
|
|
:label="item.columnLabel"> |
|
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
|
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span> |
|
|
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
|
|
</template> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
</el-table> |
|
|
|
|
|
<el-table |
|
|
|
|
|
v-if="queryForm.groupType === '1'" |
|
|
|
|
|
:data="dataList" |
|
|
|
|
|
border |
|
|
|
|
|
:height="height" |
|
|
|
|
|
v-loading="dataListLoading" |
|
|
|
|
|
@selection-change="handleSelectionChange" |
|
|
|
|
|
:row-style="controlRowStyle" |
|
|
|
|
|
style="width: 100%;"> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
v-for="(item,index) in arrayPart" :key="index" |
|
|
:sortable="item.columnSortable" |
|
|
:sortable="item.columnSortable" |
|
|
:prop="item.columnProp" |
|
|
:prop="item.columnProp" |
|
|
:header-align="item.headerAlign" |
|
|
:header-align="item.headerAlign" |
|
|
@ -718,7 +743,6 @@ export default { |
|
|
this. getBu () |
|
|
this. getBu () |
|
|
this.$nextTick(() => { |
|
|
this.$nextTick(() => { |
|
|
this.height = window.innerHeight - 210 |
|
|
this.height = window.innerHeight - 210 |
|
|
this.columnList = this.arrayColumns |
|
|
|
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
@ -813,6 +837,11 @@ export default { |
|
|
finishDownload () {}, |
|
|
finishDownload () {}, |
|
|
|
|
|
|
|
|
fields () { |
|
|
fields () { |
|
|
|
|
|
if (this.queryForm.groupType === '0'){ |
|
|
|
|
|
this.columnList = this.arrayColumns |
|
|
|
|
|
}else { |
|
|
|
|
|
this.columnList = this.arrayPart |
|
|
|
|
|
} |
|
|
let json = "{" |
|
|
let json = "{" |
|
|
this.columnList.forEach((item, index) => { |
|
|
this.columnList.forEach((item, index) => { |
|
|
if (index == this.columnList.length - 1) { |
|
|
if (index == this.columnList.length - 1) { |
|
|
|