diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentClassificationStatisticsList.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentClassificationStatisticsList.vue index f3d6b51..233e21d 100644 --- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentClassificationStatisticsList.vue +++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentClassificationStatisticsList.vue @@ -41,7 +41,7 @@ - +
{ if (res.success) { - // todo 处理TableColumns 的数据 先本地生成 + // 处理TableColumns 的数据 // let columnsKeys = res.result.columns || [] let syncColumns = this.getColumnsData(res.result.titleList || []) + console.log("-------syncColumns----", syncColumns) this.columns = [firstColumnTop, ...defaultTableColumns, ...syncColumns] this.columnsFooter = [firstColumnFooter, ...defaultTableColumns, ...syncColumns] // this.dataSource = res.result.pageList.records @@ -319,7 +319,7 @@ export default { this.dataSource = res.result.valList || [] this.dataSource.map(data => { syncColumns.map(col => { - data[col.dataIndex] = data.allMoney || '0.00' + '' + data[col.dataIndex] = data[col.dataIndex] || '0.00' + '' }) }) // 操作汇总表格的数据 @@ -336,11 +336,11 @@ export default { obj[col.dataIndex] = footerData[col.dataIndex] || '0.00' + '' }) this.footerDataSource = [obj] - if (res.result.pageList.total) { - this.ipagination.total = res.result.pageList.total - } else { - this.ipagination.total = 0 - } + // if (res.result.pageList.total) { + // this.ipagination.total = res.result.pageList.total + // } else { + // this.ipagination.total = 0 + // } } if (this.dataSource.length > 0) { this.$nextTick(() => { @@ -360,6 +360,10 @@ export default { this.$message.warning('请选择项目年份时间段') return } + if(!this.queryParam.chargeCompany) { + this.$message.warning('请选择来款企业进行查询') + return + } this.lastQueryParam = {...this.queryParam} this.loadData(1) }, @@ -372,7 +376,7 @@ export default { year_begin: new Date().getFullYear().toString(), year_end: new Date().getFullYear().toString() } - this.loadData(1) + // this.loadData(1) } } }