|
|
@@ -85,12 +85,13 @@
|
|
|
border
|
|
|
stripe
|
|
|
style="width: 100%; margin-top: 20px"
|
|
|
- max-height="800px"
|
|
|
@cell-click="cellClik"
|
|
|
:row-style="{ height: '30px' }"
|
|
|
:cell-style="{ fontWeight: '700' }"
|
|
|
- id="salesLogistics_saleSteelAllReport_table"
|
|
|
+ :key="saleSteelKey"
|
|
|
+ id="salesLogisticsStat_saleSteelAllReport_table"
|
|
|
individual-panel
|
|
|
+ @resetTable="reset"
|
|
|
>
|
|
|
<el-table-column
|
|
|
prop="index"
|
|
|
@@ -523,6 +524,7 @@ export default {
|
|
|
//省市县Id
|
|
|
addressId: null,
|
|
|
addressRow: {},
|
|
|
+ saleSteelKey:false
|
|
|
};
|
|
|
},
|
|
|
created() {},
|
|
|
@@ -560,6 +562,7 @@ export default {
|
|
|
},
|
|
|
//销售钢材报表导出excel
|
|
|
exportAllReportToExcel() {
|
|
|
+ var arr = [];
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
text: "正在导出Excel",
|
|
|
@@ -569,17 +572,24 @@ export default {
|
|
|
var title = this.tableTitle;
|
|
|
let tHeader = [];
|
|
|
let filterVal = [];
|
|
|
- console.log(this.$refs.tableRef);
|
|
|
- this.$refs.tableRef.$children.forEach((item) => {
|
|
|
- if (item.label != undefined && item.prop != undefined) {
|
|
|
- if (tHeader.indexOf(item.label) === -1) {
|
|
|
- tHeader.push(item.label);
|
|
|
+ this.$refs.tableRef.columns.forEach(item => {
|
|
|
+ if (item.label != undefined && item.property != undefined) {
|
|
|
+ arr.push(item.property);
|
|
|
}
|
|
|
- if (filterVal.indexOf(item.prop) === -1) {
|
|
|
- filterVal.push(item.prop);
|
|
|
- }
|
|
|
- }
|
|
|
});
|
|
|
+
|
|
|
+ for (var k = 0; k < arr.length; k++){
|
|
|
+ var prop = arr[k];
|
|
|
+ this.$refs.tableRef.$children.forEach(item => {
|
|
|
+ console.log('itme.prop',item.prop,prop);
|
|
|
+ if(item.prop === prop){
|
|
|
+ tHeader.push(item.label);
|
|
|
+ filterVal.push(item.prop);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
this.downloadLoading = true;
|
|
|
require.ensure([], () => {
|
|
|
const {
|
|
|
@@ -1070,7 +1080,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
|
|
|
- if (this.columnIndexs.indexOf(columnIndex) != -1) {
|
|
|
+ if (this.mergeList.indexOf(column.property) != -1) {
|
|
|
const _row = this.spanArr[rowIndex];
|
|
|
const _col = _row > 0 ? 1 : 0;
|
|
|
return {
|
|
|
@@ -1321,6 +1331,12 @@ export default {
|
|
|
}
|
|
|
return flexWidth + "px";
|
|
|
},
|
|
|
+ reset() {
|
|
|
+ var that = this;
|
|
|
+ that.$nextTick(() => {
|
|
|
+ that.saleSteelKey = !that.saleSteelKey;
|
|
|
+ });
|
|
|
+ }
|
|
|
},
|
|
|
};
|
|
|
</script>
|
