From d776f342671dc39b82ad1baf89ba01c59c3d05b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 17 Oct 2021 22:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=88=E8=AE=A1=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/mixins/JeecgListMixin.js       | 3 ++-
 jshERP-web/src/views/report/AccountReport.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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