diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index 931d653a..d22ed801 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -381,7 +381,8 @@ export const JeecgListMixin = { }, /** 表格增加合计行 */ tableAddTotalRow(columns, dataSource) { - if(dataSource.length>0 && this.ipagination.pageSize!==10) { + if(dataSource.length>0 && this.ipagination.pageSize%10===1) { + //分页条数为11、21、31等的时候增加合计行 let numKey = 'rowIndex' let totalRow = { [numKey]: '合计' } //移除不需要合计的列 diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue index 52699c9e..5cc49d79 100644 --- a/jshERP-web/src/views/report/AccountReport.vue +++ b/jshERP-web/src/views/report/AccountReport.vue @@ -51,7 +51,7 @@ :loading="loading" @change="handleTableChange"> - 流水 + {{record.id?'流水':''}}