diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index 3c02927e..fa407d03 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 a07283b8..182e22c1 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} 条`">
{{ props.value-1 }}条/页
diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue
index de7b44f7..221049cc 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} 条`">
{{ props.value-1 }}条/页
diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue
index ec8ee501..0f7cbae1 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} 条`">
{{ props.value-1 }}条/页
diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue
index 0608ccbe..4c0e19f4 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} 条`">
{{ props.value-1 }}条/页
diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue
index afe0fc49..9c87191b 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} 条`">
{{ props.value-1 }}条/页
diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue
index eb8e09af..1db37ddb 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} 条`">
{{ props.value-1 }}条/页
diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue
index 8846f810..48236146 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} 条`">
{{ props.value-1 }}条/页
diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index 66dd761d..dd5f3131 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} 条`">
{{ props.value-1 }}条/页
diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue
index 78d29585..e5ac2737 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} 条`">
{{ props.value-1 }}条/页
diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue
index 9c176121..33eac2b6 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} 条`">
{{ props.value-1 }}条/页
diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue
index b8b6bd39..b5fe693e 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} 条`">
{{ props.value-1 }}条/页
diff --git a/jshERP-web/src/views/report/StockWarningReport.vue b/jshERP-web/src/views/report/StockWarningReport.vue
index 6bbbfbe8..3fbc7056 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} 条`">
{{ props.value-1 }}条/页
diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue
index ec98ceda..9170d4b2 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} 条`">
{{ props.value-1 }}条/页