purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决合计展示的bug

Browse Source
This commit is contained in:
季圣华
2021-10-17 22:18:59 +08:00
parent 12c6c22ea0
commit d776f34267
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jshERP-web/src/mixins/JeecgListMixin.js
View File

@@ -381,7 +381,8 @@ export const JeecgListMixin = {
}, },
/** 表格增加合计行 */ /** 表格增加合计行 */
tableAddTotalRow(columns, dataSource) { 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 numKey = 'rowIndex'
let totalRow = { [numKey]: '合计' } let totalRow = { [numKey]: '合计' }
//移除不需要合计的列 //移除不需要合计的列

2
jshERP-web/src/views/report/AccountReport.vue
View File

@@ -51,7 +51,7 @@
:loading="loading" :loading="loading"
@change="handleTableChange"> @change="handleTableChange">
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="showAccountInOutList(record)">流水</a> <a @click="showAccountInOutList(record)">{{record.id?'流水':''}}</a>
</span> </span>
</a-table> </a-table>
<a-row :gutter="24" style="margin-top: 8px;text-align:right;"> <a-row :gutter="24" style="margin-top: 8px;text-align:right;">