diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index 3c02927e6..fa407d03b 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -407,6 +407,9 @@ export const JeecgListMixin = { } }) dataSource.push(totalRow) + //总数要增加合计的行数,每页都有一行合计,所以总数要加上 + let size = parseInt(this.ipagination.total/this.ipagination.pageSize) +1 + this.ipagination.total = this.ipagination.total + size } }, paginationChange(page, pageSize) { diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue index a07283b8a..182e22c10 100644 --- a/jshERP-web/src/views/report/AccountReport.vue +++ b/jshERP-web/src/views/report/AccountReport.vue @@ -64,7 +64,7 @@ :page-size="ipagination.pageSize" :page-size-options="ipagination.pageSizeOptions" :total="ipagination.total" - :show-total="(total, range) => `共 ${total} 条`"> + :show-total="(total, range) => `共 ${total-parseInt(total/ipagination.pageSize)-1} 条`"> diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue index de7b44f7f..221049cc1 100644 --- a/jshERP-web/src/views/report/AllocationDetail.vue +++ b/jshERP-web/src/views/report/AllocationDetail.vue @@ -91,7 +91,7 @@ :page-size="ipagination.pageSize" :page-size-options="ipagination.pageSizeOptions" :total="ipagination.total" - :show-total="(total, range) => `共 ${total} 条`"> + :show-total="(total, range) => `共 ${total-parseInt(total/ipagination.pageSize)-1} 条`"> diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue index ec8ee501d..0f7cbae1d 100644 --- a/jshERP-web/src/views/report/BuyInReport.vue +++ b/jshERP-web/src/views/report/BuyInReport.vue @@ -52,7 +52,7 @@ :page-size="ipagination.pageSize" :page-size-options="ipagination.pageSizeOptions" :total="ipagination.total" - :show-total="(total, range) => `共 ${total} 条`"> + :show-total="(total, range) => `共 ${total-parseInt(total/ipagination.pageSize)-1} 条`"> diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue index 0608ccbef..4c0e19f4c 100644 --- a/jshERP-web/src/views/report/CustomerAccount.vue +++ b/jshERP-web/src/views/report/CustomerAccount.vue @@ -71,7 +71,7 @@ :page-size="ipagination.pageSize" :page-size-options="ipagination.pageSizeOptions" :total="ipagination.total" - :show-total="(total, range) => `共 ${total} 条`"> + :show-total="(total, range) => `共 ${total-parseInt(total/ipagination.pageSize)-1} 条`"> diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue index afe0fc492..9c87191b6 100644 --- a/jshERP-web/src/views/report/InDetail.vue +++ b/jshERP-web/src/views/report/InDetail.vue @@ -84,7 +84,7 @@ :page-size="ipagination.pageSize" :page-size-options="ipagination.pageSizeOptions" :total="ipagination.total" - :show-total="(total, range) => `共 ${total} 条`"> + :show-total="(total, range) => `共 ${total-parseInt(total/ipagination.pageSize)-1} 条`"> diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue index eb8e09afd..1db37ddb5 100644 --- a/jshERP-web/src/views/report/InMaterialCount.vue +++ b/jshERP-web/src/views/report/InMaterialCount.vue @@ -81,7 +81,7 @@ :page-size="ipagination.pageSize" :page-size-options="ipagination.pageSizeOptions" :total="ipagination.total" - :show-total="(total, range) => `共 ${total} 条`"> + :show-total="(total, range) => `共 ${total-parseInt(total/ipagination.pageSize)-1} 条`"> diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue index 8846f8107..48236146e 100644 --- a/jshERP-web/src/views/report/InOutStockReport.vue +++ b/jshERP-web/src/views/report/InOutStockReport.vue @@ -70,7 +70,7 @@ :page-size="ipagination.pageSize" :page-size-options="ipagination.pageSizeOptions" :total="ipagination.total" - :show-total="(total, range) => `共 ${total} 条`"> + :show-total="(total, range) => `共 ${total-parseInt(total/ipagination.pageSize)-1} 条`"> diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue index 66dd761df..dd5f31313 100644 --- a/jshERP-web/src/views/report/MaterialStock.vue +++ b/jshERP-web/src/views/report/MaterialStock.vue @@ -87,7 +87,7 @@ :page-size="ipagination.pageSize" :page-size-options="ipagination.pageSizeOptions" :total="ipagination.total" - :show-total="(total, range) => `共 ${total} 条`"> + :show-total="(total, range) => `共 ${total-parseInt(total/ipagination.pageSize)-1} 条`"> diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue index 78d295858..e5ac2737f 100644 --- a/jshERP-web/src/views/report/OutDetail.vue +++ b/jshERP-web/src/views/report/OutDetail.vue @@ -84,7 +84,7 @@ :page-size="ipagination.pageSize" :page-size-options="ipagination.pageSizeOptions" :total="ipagination.total" - :show-total="(total, range) => `共 ${total} 条`"> + :show-total="(total, range) => `共 ${total-parseInt(total/ipagination.pageSize)-1} 条`"> diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue index 9c1761212..33eac2b6b 100644 --- a/jshERP-web/src/views/report/OutMaterialCount.vue +++ b/jshERP-web/src/views/report/OutMaterialCount.vue @@ -81,7 +81,7 @@ :page-size="ipagination.pageSize" :page-size-options="ipagination.pageSizeOptions" :total="ipagination.total" - :show-total="(total, range) => `共 ${total} 条`"> + :show-total="(total, range) => `共 ${total-parseInt(total/ipagination.pageSize)-1} 条`"> diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue index b8b6bd398..b5fe693e9 100644 --- a/jshERP-web/src/views/report/SaleOutReport.vue +++ b/jshERP-web/src/views/report/SaleOutReport.vue @@ -52,7 +52,7 @@ :page-size="ipagination.pageSize" :page-size-options="ipagination.pageSizeOptions" :total="ipagination.total" - :show-total="(total, range) => `共 ${total} 条`"> + :show-total="(total, range) => `共 ${total-parseInt(total/ipagination.pageSize)-1} 条`"> diff --git a/jshERP-web/src/views/report/StockWarningReport.vue b/jshERP-web/src/views/report/StockWarningReport.vue index 6bbbfbe87..3fbc70569 100644 --- a/jshERP-web/src/views/report/StockWarningReport.vue +++ b/jshERP-web/src/views/report/StockWarningReport.vue @@ -59,7 +59,7 @@ :page-size="ipagination.pageSize" :page-size-options="ipagination.pageSizeOptions" :total="ipagination.total" - :show-total="(total, range) => `共 ${total} 条`"> + :show-total="(total, range) => `共 ${total-parseInt(total/ipagination.pageSize)-1} 条`"> diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue index ec98cedaa..9170d4b23 100644 --- a/jshERP-web/src/views/report/VendorAccount.vue +++ b/jshERP-web/src/views/report/VendorAccount.vue @@ -71,7 +71,7 @@ :page-size="ipagination.pageSize" :page-size-options="ipagination.pageSizeOptions" :total="ipagination.total" - :show-total="(total, range) => `共 ${total} 条`"> + :show-total="(total, range) => `共 ${total-parseInt(total/ipagination.pageSize)-1} 条`">