diff --git a/src/components/common/FileResource.vue b/src/components/common/FileResource.vue
index 7a9efaa..7171282 100644
--- a/src/components/common/FileResource.vue
+++ b/src/components/common/FileResource.vue
@@ -124,7 +124,9 @@
:page-size="query.size"
@current-change="handleCurrentChange"
layout="prev, pager, next"
- :total="total">
+ :total="total"
+ :current-page="query.page"
+ >
diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue
index 12914ec..0ac9e5b 100644
--- a/src/views/basic/BussinessType.vue
+++ b/src/views/basic/BussinessType.vue
@@ -125,6 +125,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="filterQuery.page"
>
diff --git a/src/views/basic/CorpExportSmp.vue b/src/views/basic/CorpExportSmp.vue
index 6f6d9f2..063388a 100644
--- a/src/views/basic/CorpExportSmp.vue
+++ b/src/views/basic/CorpExportSmp.vue
@@ -84,6 +84,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="filterQuery.page"
>
diff --git a/src/views/basic/CorpImport.vue b/src/views/basic/CorpImport.vue
index 4de0971..8a0fbd6 100644
--- a/src/views/basic/CorpImport.vue
+++ b/src/views/basic/CorpImport.vue
@@ -112,6 +112,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="filterQuery.page"
>
diff --git a/src/views/basic/CorpImportDetail.vue b/src/views/basic/CorpImportDetail.vue
index 3d27274..d1b8378 100644
--- a/src/views/basic/CorpImportDetail.vue
+++ b/src/views/basic/CorpImportDetail.vue
@@ -78,6 +78,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="filterQuery.page"
>
diff --git a/src/views/basic/CorpMaintain.vue b/src/views/basic/CorpMaintain.vue
index e0f4e57..d400cb6 100644
--- a/src/views/basic/CorpMaintain.vue
+++ b/src/views/basic/CorpMaintain.vue
@@ -101,6 +101,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="query.page"
>
@@ -127,6 +128,7 @@
@current-change="handlepageChange"
layout="prev, pager, next"
:total="total"
+ :current-page="unitQuery.page"
>
diff --git a/src/views/basic/CorpSelect.vue b/src/views/basic/CorpSelect.vue
index 094632d..e1e6698 100644
--- a/src/views/basic/CorpSelect.vue
+++ b/src/views/basic/CorpSelect.vue
@@ -95,6 +95,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="query.page"
>
diff --git a/src/views/basic/CorpSingleRelevance.vue b/src/views/basic/CorpSingleRelevance.vue
index 55d486b..e4b8adf 100644
--- a/src/views/basic/CorpSingleRelevance.vue
+++ b/src/views/basic/CorpSingleRelevance.vue
@@ -41,6 +41,7 @@
@current-change="handleErppageChange"
layout="prev, pager, next"
:total="erpTotal"
+ :current-page="erpQuery.page"
>
@@ -118,6 +119,7 @@
@current-change="handlepageChange"
layout="prev, pager, next"
:total="total"
+ :current-page="unitQuery.page"
>
diff --git a/src/views/basic/UdIInfoSelect.vue b/src/views/basic/UdIInfoSelect.vue
index 0e0569e..95d5c95 100644
--- a/src/views/basic/UdIInfoSelect.vue
+++ b/src/views/basic/UdIInfoSelect.vue
@@ -531,6 +531,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="filterQuery.page"
>
diff --git a/src/views/basic/UdiInfoDonwloadSmp.vue b/src/views/basic/UdiInfoDonwloadSmp.vue
index 5a3032c..2699876 100644
--- a/src/views/basic/UdiInfoDonwloadSmp.vue
+++ b/src/views/basic/UdiInfoDonwloadSmp.vue
@@ -104,6 +104,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="filterQuery.page"
>
diff --git a/src/views/basic/UdiInfoImport.vue b/src/views/basic/UdiInfoImport.vue
index 643c538..4657e78 100644
--- a/src/views/basic/UdiInfoImport.vue
+++ b/src/views/basic/UdiInfoImport.vue
@@ -117,6 +117,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="filterQuery.page"
>
diff --git a/src/views/basic/UdiInfoImportDetail.vue b/src/views/basic/UdiInfoImportDetail.vue
index 2ebcdf4..c936909 100644
--- a/src/views/basic/UdiInfoImportDetail.vue
+++ b/src/views/basic/UdiInfoImportDetail.vue
@@ -99,6 +99,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="filterQuery.page"
>
diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index 8dd1260..3f8c1da 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -656,6 +656,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="filterQuery.page"
>
diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue
index 267e59a..29dacef 100644
--- a/src/views/basic/UdiInfoRelevance.vue
+++ b/src/views/basic/UdiInfoRelevance.vue
@@ -92,6 +92,7 @@
@current-change="handleErpPageChange"
layout="prev, pager, next"
:total="pageTotal"
+ :current-page="erpQuery.page"
>
@@ -219,6 +220,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="unionQuery.page"
>
diff --git a/src/views/basic/UdiInfoSelectUdi.vue b/src/views/basic/UdiInfoSelectUdi.vue
index 09509b3..f995d01 100644
--- a/src/views/basic/UdiInfoSelectUdi.vue
+++ b/src/views/basic/UdiInfoSelectUdi.vue
@@ -109,6 +109,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="unionQuery.page"
>
diff --git a/src/views/basic/UdiInfoselectErpUdi.vue b/src/views/basic/UdiInfoselectErpUdi.vue
index 3dc004b..3cc1132 100644
--- a/src/views/basic/UdiInfoselectErpUdi.vue
+++ b/src/views/basic/UdiInfoselectErpUdi.vue
@@ -105,6 +105,7 @@
@current-change="handleErpPageChange"
layout="prev, pager, next"
:total="pageTotal"
+ :current-page="erpQuery.page"
>
diff --git a/src/views/basic/UdiinfoExportSmp.vue b/src/views/basic/UdiinfoExportSmp.vue
index 1de2b81..616907d 100644
--- a/src/views/basic/UdiinfoExportSmp.vue
+++ b/src/views/basic/UdiinfoExportSmp.vue
@@ -84,6 +84,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="filterQuery.page"
>
diff --git a/src/views/basic/basicCompany.vue b/src/views/basic/basicCompany.vue
index 7b9c7dc..c719222 100644
--- a/src/views/basic/basicCompany.vue
+++ b/src/views/basic/basicCompany.vue
@@ -747,6 +747,7 @@
@current-change="salesmanHandleCurrentChange"
layout="prev, pager, next"
:total="salesmanTotal"
+ :current-page="salesmanQuery.page"
>
diff --git a/src/views/basic/basicCompanyProduct.vue b/src/views/basic/basicCompanyProduct.vue
index 3499113..3d10627 100644
--- a/src/views/basic/basicCompanyProduct.vue
+++ b/src/views/basic/basicCompanyProduct.vue
@@ -97,6 +97,7 @@
@current-change="salesmanHandleCurrentChange"
layout="prev, pager, next"
:total="productTotal"
+ :current-page="productQuery.page"
>
diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue
index ce516bf..5b24577 100644
--- a/src/views/basic/basicCompanyProductsImport.vue
+++ b/src/views/basic/basicCompanyProductsImport.vue
@@ -603,6 +603,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="filterQuery.page"
>
diff --git a/src/views/basic/basicCompanySalesmanUpdateLog.vue b/src/views/basic/basicCompanySalesmanUpdateLog.vue
index c7909f1..0960894 100644
--- a/src/views/basic/basicCompanySalesmanUpdateLog.vue
+++ b/src/views/basic/basicCompanySalesmanUpdateLog.vue
@@ -74,6 +74,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="logTotal"
+ :current-page="logQuery.page"
>
diff --git a/src/views/basic/basicCompanySalesmanUpdateLogTotal.vue b/src/views/basic/basicCompanySalesmanUpdateLogTotal.vue
index 113a0d6..79f85e1 100644
--- a/src/views/basic/basicCompanySalesmanUpdateLogTotal.vue
+++ b/src/views/basic/basicCompanySalesmanUpdateLogTotal.vue
@@ -74,6 +74,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="logTotal"
+ :current-page="logQuery.page"
>
diff --git a/src/views/basic/basicCompanyUpdateLog.vue b/src/views/basic/basicCompanyUpdateLog.vue
index 0e240e2..3b48d8e 100644
--- a/src/views/basic/basicCompanyUpdateLog.vue
+++ b/src/views/basic/basicCompanyUpdateLog.vue
@@ -88,6 +88,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="logTotal"
+ :current-page="logQuery.page"
>
diff --git a/src/views/basic/basicUnitMaintain.vue b/src/views/basic/basicUnitMaintain.vue
index 21f2c3f..fa374c2 100644
--- a/src/views/basic/basicUnitMaintain.vue
+++ b/src/views/basic/basicUnitMaintain.vue
@@ -94,6 +94,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="query.page"
>
@@ -123,6 +124,7 @@
@current-change="handlepageChange"
layout="prev, pager, next"
:total="total"
+ :current-page="unitQuery.page"
>
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 9d71a27..57e46e1 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -27,7 +27,7 @@
- 查询
+ 查询
添加仓库
@@ -611,6 +611,9 @@ export default {
onSubmit() {
this.getList();
},
+ search() {
+ this.getList();
+ },
getList() {
this.loading = true;
filterList(this.query)
diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvPreProductsDetail.vue
index 2398605..50dcdc8 100644
--- a/src/views/inventory/InvPreProductsDetail.vue
+++ b/src/views/inventory/InvPreProductsDetail.vue
@@ -107,6 +107,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next,total"
:total="total"
+ :current-page="query.page"
>
diff --git a/src/views/product/UnitManage.vue b/src/views/product/UnitManage.vue
index 285dc91..ed824c3 100644
--- a/src/views/product/UnitManage.vue
+++ b/src/views/product/UnitManage.vue
@@ -82,6 +82,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="query.page"
>
diff --git a/src/views/product/selectLocalUdi.vue b/src/views/product/selectLocalUdi.vue
index c9f5c8a..71e4fad 100644
--- a/src/views/product/selectLocalUdi.vue
+++ b/src/views/product/selectLocalUdi.vue
@@ -95,6 +95,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="unionQuery.page"
>
diff --git a/src/views/product/udiRelevance.vue b/src/views/product/udiRelevance.vue
index 291bfa5..b8a89bb 100644
--- a/src/views/product/udiRelevance.vue
+++ b/src/views/product/udiRelevance.vue
@@ -145,6 +145,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="unionQuery.page"
>
@@ -206,6 +207,7 @@ export default {
zczbhhzbapzbh: "",
isCheck: 1
},
+ total: 0,
combineQuery: {
thirdId: "",
keys: []
diff --git a/src/views/sys/bindPlatform.vue b/src/views/sys/bindPlatform.vue
index b4159e4..be97863 100644
--- a/src/views/sys/bindPlatform.vue
+++ b/src/views/sys/bindPlatform.vue
@@ -61,6 +61,7 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
+ :current-page="query.page"
>
@@ -304,6 +305,7 @@ export default {
path: "",
query: this.query
});
+ this.query.page = 1;
this.getList();
},
handleCurrentChange(val) {
diff --git a/src/views/userManage/admin/authPermissionRule.vue b/src/views/userManage/admin/authPermissionRule.vue
index 6ce2ddc..bc1a9bb 100644
--- a/src/views/userManage/admin/authPermissionRule.vue
+++ b/src/views/userManage/admin/authPermissionRule.vue
@@ -1,8 +1,6 @@
-
-
diff --git a/src/views/userManage/admin/authRole.vue b/src/views/userManage/admin/authRole.vue
index 712812a..7cf770f 100644
--- a/src/views/userManage/admin/authRole.vue
+++ b/src/views/userManage/admin/authRole.vue
@@ -90,6 +90,7 @@
-->
diff --git a/src/views/warehouse/code.vue b/src/views/warehouse/code.vue
index c1b84e4..0f464ac 100644
--- a/src/views/warehouse/code.vue
+++ b/src/views/warehouse/code.vue
@@ -37,6 +37,7 @@
{
let params = {
- id: row.id
+ id: row.orderId
};
deleteByOrderId(params).then((res) => {
if (res.code === 20000) {
@@ -471,7 +472,7 @@
}).then(() => {
let ids = [];
this.list.forEach(item => {
- ids.push(item.id);
+ ids.push(item.orderId);
});
let params = {
ids: ids
diff --git a/src/views/warehouse/stockOrderDistribution.vue b/src/views/warehouse/stockOrderDistribution.vue
index c3d1520..a29d4e2 100644
--- a/src/views/warehouse/stockOrderDistribution.vue
+++ b/src/views/warehouse/stockOrderDistribution.vue
@@ -166,6 +166,7 @@
diff --git a/src/views/warehouse/stockOrderEdit.vue b/src/views/warehouse/stockOrderEdit.vue
index 9882d60..f74ca44 100644
--- a/src/views/warehouse/stockOrderEdit.vue
+++ b/src/views/warehouse/stockOrderEdit.vue
@@ -74,6 +74,7 @@
{
this.detailLoading = false;
this.detailList = response.data.list || [];
+ this.detailTotal = response.total;
})
.catch(() => {
this.detailLoading = false;
diff --git a/src/views/warehouse/stockOrderErrorDistribution.vue b/src/views/warehouse/stockOrderErrorDistribution.vue
index 844a9e3..f8cac2f 100644
--- a/src/views/warehouse/stockOrderErrorDistribution.vue
+++ b/src/views/warehouse/stockOrderErrorDistribution.vue
@@ -180,7 +180,9 @@
@current-change="handleCurrentChange"
layout="prev, pager, next"
:page-size="query.limit"
- :total="total">
+ :total="total"
+ :current-page="query.page"
+ >
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index 647c338..33fdf6f 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -97,6 +97,7 @@
>
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index 1512241..cc0898d 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -124,6 +124,7 @@
@@ -175,6 +176,7 @@