Commit fb32f91b authored by 何虹's avatar 何虹 💬

.

parent 1e303579
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
:title="column.label" :title="column.label"
:fixed="column.fixed" :fixed="column.fixed"
:min-width="column.width||80" :min-width="column.width||80"
:sortable="column.isSort?'custom':false" :sortable="column.isSort"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<i <i
...@@ -170,7 +170,7 @@ import utilsExcel from '../../funTools/excel/utils_excel' ...@@ -170,7 +170,7 @@ import utilsExcel from '../../funTools/excel/utils_excel'
import rowTable from './rowTable' import rowTable from './rowTable'
import commonMixins from '../../ucClass/commonMixins' import commonMixins from '../../ucClass/commonMixins'
export default { export default {
mixins:[commonMixins], mixins: [commonMixins],
components: { components: {
childItem, childItem,
rowTable, rowTable,
...@@ -502,14 +502,15 @@ export default { ...@@ -502,14 +502,15 @@ export default {
order: this.dealWithOrderValue(order), order: this.dealWithOrderValue(order),
prop prop
} }
debugger
this.$emit('sortChange', sortData, this.getBindEntity()) this.$emit('sortChange', sortData, this.getBindEntity())
}, },
/** /**
* 处理排序值 * 处理排序值
*/ */
dealWithOrderValue(order) { dealWithOrderValue(order) {
if (order === 'descending') return 0 if (order === 'descending' || order === 'desc') return 0
if (order === 'ascending') return 1 if (order === 'ascending' || order === 'asc') return 1
if (!order) return '' if (!order) return ''
}, },
rowDblclick(row, column, event) { rowDblclick(row, column, event) {
...@@ -779,7 +780,7 @@ export default { ...@@ -779,7 +780,7 @@ export default {
}) })
}, },
async exportExcel(flage) { async exportExcel(flage) {
const data = this.tableData const data = this.tabledata
const columnsProp_ = [] const columnsProp_ = []
this.tableColumns.forEach(item => { this.tableColumns.forEach(item => {
if (item.childs) { if (item.childs) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment