From fea23b6123e5948694e90dd4f06a03fba2806379 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 1 Aug 2022 20:23:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=202.=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=9C=AA=E9=87=8D=E7=BD=AE=E9=97=AE=E9=A2=98=203.=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=AF=BC=E8=87=B4=E6=97=A0=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/FileResource.vue                 | 4 +++-
 src/views/basic/BussinessType.vue                      | 1 +
 src/views/basic/CorpExportSmp.vue                      | 1 +
 src/views/basic/CorpImport.vue                         | 1 +
 src/views/basic/CorpImportDetail.vue                   | 1 +
 src/views/basic/CorpMaintain.vue                       | 1 +
 src/views/basic/CorpRelevance.vue                      | 2 ++
 src/views/basic/CorpSelect.vue                         | 1 +
 src/views/basic/CorpSingleRelevance.vue                | 2 ++
 src/views/basic/UdIInfoSelect.vue                      | 1 +
 src/views/basic/UdiInfoDonwloadSmp.vue                 | 1 +
 src/views/basic/UdiInfoImport.vue                      | 1 +
 src/views/basic/UdiInfoImportDetail.vue                | 1 +
 src/views/basic/UdiInfoManage.vue                      | 1 +
 src/views/basic/UdiInfoRelevance.vue                   | 2 ++
 src/views/basic/UdiInfoSelectUdi.vue                   | 1 +
 src/views/basic/UdiInfoselectErpUdi.vue                | 1 +
 src/views/basic/UdiinfoExportSmp.vue                   | 1 +
 src/views/basic/basicCompany.vue                       | 1 +
 src/views/basic/basicCompanyProduct.vue                | 1 +
 src/views/basic/basicCompanyProductsImport.vue         | 1 +
 src/views/basic/basicCompanySalesmanUpdateLog.vue      | 1 +
 src/views/basic/basicCompanySalesmanUpdateLogTotal.vue | 1 +
 src/views/basic/basicCompanyUpdateLog.vue              | 1 +
 src/views/basic/basicUnitMaintain.vue                  | 1 +
 src/views/basic/basicUnitRelevance.vue                 | 2 ++
 src/views/basic/invWarehouse.vue                       | 5 ++++-
 src/views/inventory/InvPreProductsDetail.vue           | 1 +
 src/views/product/UnitManage.vue                       | 1 +
 src/views/product/selectErpUdi.vue                     | 1 +
 src/views/product/selectLocalUdi.vue                   | 1 +
 src/views/product/udiRelevance.vue                     | 2 ++
 src/views/sys/bindPlatform.vue                         | 1 +
 src/views/userManage/admin/authAdmin.vue               | 2 ++
 src/views/userManage/admin/authPermissionRule.vue      | 2 --
 src/views/userManage/admin/authRole.vue                | 2 ++
 src/views/userManage/customerManage.vue                | 2 ++
 src/views/userManage/customerUser.vue                  | 1 +
 src/views/userManage/param/systemPDFModule.vue         | 3 +++
 src/views/userManage/param/systemPDFTemplate.vue       | 3 +++
 src/views/userManage/param/systemParamConfig.vue       | 1 +
 src/views/userManage/phoneRegisterManage.vue           | 2 ++
 src/views/userManage/platform.vue                      | 2 ++
 src/views/userManage/registerManage.vue                | 2 ++
 src/views/userManage/suppliersEnterpriseBasicAdd.vue   | 1 +
 src/views/userManage/userAccountManage.vue             | 1 +
 src/views/warehouse/AdditionalOrder.vue                | 1 +
 src/views/warehouse/DialogSelectErpOrder.vue           | 1 +
 src/views/warehouse/DialogSelectRl.vue                 | 1 +
 src/views/warehouse/IOSearchOrder.vue                  | 1 +
 src/views/warehouse/InvProducts.vue                    | 1 +
 src/views/warehouse/InvProductsDetail.vue              | 1 +
 src/views/warehouse/UdiCodeTrace.vue                   | 1 +
 src/views/warehouse/UdiInfoSelectLocalUdi.vue          | 1 +
 src/views/warehouse/addOrder.vue                       | 1 +
 src/views/warehouse/code.vue                           | 1 +
 src/views/warehouse/codeReplace.vue                    | 1 +
 src/views/warehouse/errorCode.vue                      | 1 +
 src/views/warehouse/ioErrorOrder.vue                   | 1 +
 src/views/warehouse/ioFinishOrder.vue                  | 1 +
 src/views/warehouse/ioNewOrder.vue                     | 1 +
 src/views/warehouse/ioUdiTrace.vue                     | 1 +
 src/views/warehouse/selectProduct.vue                  | 1 +
 src/views/warehouse/stockOrderDelSearch.vue            | 2 ++
 src/views/warehouse/stockOrderDelete.vue               | 5 +++--
 src/views/warehouse/stockOrderDistribution.vue         | 1 +
 src/views/warehouse/stockOrderEdit.vue                 | 3 +++
 src/views/warehouse/stockOrderErrorDistribution.vue    | 4 +++-
 src/views/warehouse/stockOrderNewSelectProduct.vue     | 1 +
 src/views/warehouse/stockOrderQRCodeDetail.vue         | 1 +
 src/views/warehouse/stockOrderSearch.vue               | 2 ++
 src/views/warehouse/stockQRCodeExport.vue              | 2 ++
 72 files changed, 100 insertions(+), 7 deletions(-)

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"
+        >
         </el-pagination>
 
         <div style="margin-top: 20px">
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"
             ></el-pagination>
         </el-card>
     </div>
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"
         ></el-pagination>
     </div>
 </template>
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"
         ></el-pagination>
     </div>
 </template>
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"
             ></el-pagination>
 
         </el-card>
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"
         ></el-pagination>
 
         <el-dialog
diff --git a/src/views/basic/CorpRelevance.vue b/src/views/basic/CorpRelevance.vue
index 4ce7909..23c7efe 100644
--- a/src/views/basic/CorpRelevance.vue
+++ b/src/views/basic/CorpRelevance.vue
@@ -48,6 +48,7 @@
                     @current-change="handleErppageChange"
                     layout="prev, pager, next"
                     :total="erpTotal"
+                    :current-page="erpQuery.page"
                 ></el-pagination>
             </div>
         </el-card>
@@ -127,6 +128,7 @@
             @current-change="handlepageChange"
             layout="prev, pager, next"
             :total="total"
+            :current-page="unitQuery.page"
         ></el-pagination>
     </div>
 </template>
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"
         ></el-pagination>
 
 
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"
                 ></el-pagination>
             </div>
         </el-card>
@@ -118,6 +119,7 @@
             @current-change="handlepageChange"
             layout="prev, pager, next"
             :total="total"
+            :current-page="unitQuery.page"
         ></el-pagination>
     </div>
 </template>
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"
         ></el-pagination>
     </div>
 </template>
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"
         ></el-pagination>
     </div>
 </template>
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"
         ></el-pagination>
     </div>
 </template>
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"
             ></el-pagination>
 
         </el-card>
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"
         ></el-pagination>
     </div>
 </template>
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"
                 ></el-pagination>
             </div>
         </el-card>
@@ -219,6 +220,7 @@
                     @current-change="handleCurrentChange"
                     layout="prev, pager, next"
                     :total="total"
+                    :current-page="unionQuery.page"
                 ></el-pagination>
             </div>
         </el-card>
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"
                 ></el-pagination>
             </div>
         </el-card>
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"
                 ></el-pagination>
             </div>
         </el-card>
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"
         ></el-pagination>
     </div>
 </template>
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"
                 >
                 </el-pagination>
             </el-card>
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"
             >
             </el-pagination>
         </el-card>
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"
         ></el-pagination>
     </div>
 </template>
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"
                 >
                 </el-pagination>
             </el-card>
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"
                 >
                 </el-pagination>
             </el-card>
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"
                 >
                 </el-pagination>
             </el-card>
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"
         ></el-pagination>
 
         <el-dialog
diff --git a/src/views/basic/basicUnitRelevance.vue b/src/views/basic/basicUnitRelevance.vue
index f52bebe..f578620 100644
--- a/src/views/basic/basicUnitRelevance.vue
+++ b/src/views/basic/basicUnitRelevance.vue
@@ -54,6 +54,7 @@
                     @current-change="handleErppageChange"
                     layout="prev, pager, next"
                     :total="erpTotal"
+                    :current-page="erpQuery.page"
                 ></el-pagination>
             </div>
         </el-card>
@@ -123,6 +124,7 @@
             @current-change="handlepageChange"
             layout="prev, pager, next"
             :total="total"
+            :current-page="unitQuery.page"
         ></el-pagination>
     </div>
 </template>
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 @@
                 <el-form-item>
                     <el-button-group style="margin-left: 10px;display:flex;">
                         <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                        <el-button type="primary" icon="search" @click="search">查询</el-button>
                         <el-button type="primary" @click.native="handleForm(null, null,'addTop')"
                         >添加仓库
                         </el-button>
@@ -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"
         >
         </el-pagination>
     </div>
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"
         ></el-pagination>
 
         <el-dialog
diff --git a/src/views/product/selectErpUdi.vue b/src/views/product/selectErpUdi.vue
index 0f96a86..83fd777 100644
--- a/src/views/product/selectErpUdi.vue
+++ b/src/views/product/selectErpUdi.vue
@@ -60,6 +60,7 @@
                     @current-change="handleErpPageChange"
                     layout="prev, pager, next"
                     :total="pageTotal"
+                    :current-page="erpQuery.page"
                 ></el-pagination>
             </div>
         </el-card>
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"
                 ></el-pagination>
 
             </div>
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"
                 ></el-pagination>
             </div>
             <div style="text-align: center">
@@ -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"
         ></el-pagination>
 
         <el-dialog
diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue
index 1e374b0..ba92d4f 100644
--- a/src/views/userManage/admin/authAdmin.vue
+++ b/src/views/userManage/admin/authAdmin.vue
@@ -80,6 +80,7 @@
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
                 :total="total"
+                :current-page="query.page"
             >
             </el-pagination>
 
@@ -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 @@
 <template>
     <div>
         <el-card>
-
-
             <el-form :inline="true" :model="query" class="query-form" size="mini">
                 <el-form-item class="query-form-item">
                     <el-select v-model="query.status" placeholder="状态">
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 @@
             </el-table>
 
             <el-pagination
+                :current-page="query.page"
                 :page-size="query.limit"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
@@ -321,6 +322,7 @@ export default {
             this.getList();
         },
         onSubmit() {
+            this.query.page = 1;
             this.getList();
         },
         handleCurrentChange(val) {
diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue
index efa636d..40d88b2 100644
--- a/src/views/userManage/customerManage.vue
+++ b/src/views/userManage/customerManage.vue
@@ -265,6 +265,7 @@
             </el-dialog>
         </div>
         <el-pagination
+            :current-page="filterQuery.page"
             :page-size="filterQuery.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
@@ -396,6 +397,7 @@ export default {
                 });
         },
         onSubmit() {
+            this.filterQuery.page = 1;
             this.getList();
         },
         getList() {
diff --git a/src/views/userManage/customerUser.vue b/src/views/userManage/customerUser.vue
index 73f5145..5340ca9 100644
--- a/src/views/userManage/customerUser.vue
+++ b/src/views/userManage/customerUser.vue
@@ -71,6 +71,7 @@
         </el-table>
 
         <el-pagination
+            :current-page="query.page"
             :page-size="query.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
diff --git a/src/views/userManage/param/systemPDFModule.vue b/src/views/userManage/param/systemPDFModule.vue
index 88f4ea4..6793efb 100644
--- a/src/views/userManage/param/systemPDFModule.vue
+++ b/src/views/userManage/param/systemPDFModule.vue
@@ -86,6 +86,7 @@
             </el-table>
 
             <el-pagination
+                :current-page="moduleQuery.page"
                 :page-size="moduleQuery.limit"
                 @current-change="moduleHandleCurrentChange"
                 layout="prev, pager, next"
@@ -177,6 +178,7 @@
                 </div>
             </el-dialog>
             <el-pagination
+                :current-page="moduleQuery.page"
                 :page-size="moduleQuery.limit"
                 @current-change="handlePageChange"
                 layout="prev, pager, next"
@@ -354,6 +356,7 @@
                 </el-table>
 
                 <el-pagination
+                    :current-page="selectTemplateQuery.page"
                     :page-size="selectTemplateQuery.limit"
                     @current-change="moduleHandleCurrentChange"
                     layout="prev, pager, next"
diff --git a/src/views/userManage/param/systemPDFTemplate.vue b/src/views/userManage/param/systemPDFTemplate.vue
index 10415a9..d0488db 100644
--- a/src/views/userManage/param/systemPDFTemplate.vue
+++ b/src/views/userManage/param/systemPDFTemplate.vue
@@ -76,6 +76,7 @@
             </el-table>
 
             <el-pagination
+                :current-page="query.page"
                 :page-size="query.limit"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
@@ -278,6 +279,7 @@
                 </el-table>
 
                 <el-pagination
+                    :current-page="selectTemplateQuery.page"
                     :page-size="selectTemplateQuery.limit"
                     @current-change="moduleHandleCurrentChange"
                     layout="prev, pager, next"
@@ -425,6 +427,7 @@ export default {
             this.getList();
         },
         onSubmit() {
+            this.query.page = 1;
             this.getList();
         },
         handleCurrentChange(val) {
diff --git a/src/views/userManage/param/systemParamConfig.vue b/src/views/userManage/param/systemParamConfig.vue
index e459d2f..56f46d7 100644
--- a/src/views/userManage/param/systemParamConfig.vue
+++ b/src/views/userManage/param/systemParamConfig.vue
@@ -47,6 +47,7 @@
             </el-table>
 
             <el-pagination
+                :current-page="query.page"
                 :page-size="query.limit"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
diff --git a/src/views/userManage/phoneRegisterManage.vue b/src/views/userManage/phoneRegisterManage.vue
index e0311f7..c3eb7d2 100644
--- a/src/views/userManage/phoneRegisterManage.vue
+++ b/src/views/userManage/phoneRegisterManage.vue
@@ -169,6 +169,7 @@
         </el-dialog>
 
         <el-pagination
+            :current-page="filterQuery.page"
             :page-size="filterQuery.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
@@ -225,6 +226,7 @@ export default {
         },
 
         onSubmit() {
+            this.filterQuery.page = 1;
             this.getList();
         },
         getList() {
diff --git a/src/views/userManage/platform.vue b/src/views/userManage/platform.vue
index 7f0012d..67f940a 100644
--- a/src/views/userManage/platform.vue
+++ b/src/views/userManage/platform.vue
@@ -112,6 +112,7 @@
 
 
         <el-pagination
+            :current-page="filterQuery.page"
             :page-size="filterQuery.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
@@ -199,6 +200,7 @@ export default {
             });
         },
         onSubmit() {
+            this.filterQuery.page = 1;
             this.getList();
         },
         getList() {
diff --git a/src/views/userManage/registerManage.vue b/src/views/userManage/registerManage.vue
index d2ea742..1effcdd 100644
--- a/src/views/userManage/registerManage.vue
+++ b/src/views/userManage/registerManage.vue
@@ -281,6 +281,7 @@
       </span>
         </el-dialog>
         <el-pagination
+            :current-page="filterQuery.page"
             :page-size="filterQuery.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
@@ -362,6 +363,7 @@ export default {
             this.getList();
         },
         onSubmit() {
+            this.filterQuery.page = 1;
             this.getList();
         },
         getList() {
diff --git a/src/views/userManage/suppliersEnterpriseBasicAdd.vue b/src/views/userManage/suppliersEnterpriseBasicAdd.vue
index fdee4c1..af3b1d0 100644
--- a/src/views/userManage/suppliersEnterpriseBasicAdd.vue
+++ b/src/views/userManage/suppliersEnterpriseBasicAdd.vue
@@ -293,6 +293,7 @@
                     </el-table-column>
                 </el-table>
                 <el-pagination
+                    :current-page="certQuery.page"
                     :page-size="certQuery.limit"
                     @current-change="certHandleCurrentChange"
                     layout="prev, pager, next"
diff --git a/src/views/userManage/userAccountManage.vue b/src/views/userManage/userAccountManage.vue
index fc3248f..44a14ff 100644
--- a/src/views/userManage/userAccountManage.vue
+++ b/src/views/userManage/userAccountManage.vue
@@ -75,6 +75,7 @@
         </el-table>
 
         <el-pagination
+            :current-page="query.page"
             :page-size="query.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue
index 698aa0d..bbf1384 100644
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@@ -214,6 +214,7 @@
             ></codeDetail>
         </el-dialog>
         <el-pagination
+            :current-page="filterQuery.page"
             :page-size="filterQuery.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
diff --git a/src/views/warehouse/DialogSelectErpOrder.vue b/src/views/warehouse/DialogSelectErpOrder.vue
index 0f8d99a..550a380 100644
--- a/src/views/warehouse/DialogSelectErpOrder.vue
+++ b/src/views/warehouse/DialogSelectErpOrder.vue
@@ -99,6 +99,7 @@
                 <!-- <el-table-column label="下载状态" prop="isDownload"></el-table-column> -->
             </el-table>
             <el-pagination
+                :current-page="filterQuery.page"
                 :page-size="filterQuery.limit"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
diff --git a/src/views/warehouse/DialogSelectRl.vue b/src/views/warehouse/DialogSelectRl.vue
index 3d607d7..339101a 100644
--- a/src/views/warehouse/DialogSelectRl.vue
+++ b/src/views/warehouse/DialogSelectRl.vue
@@ -490,6 +490,7 @@
         </el-dialog>
 
         <el-pagination
+            :current-page="filterQuery.page"
             :page-size="filterQuery.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
diff --git a/src/views/warehouse/IOSearchOrder.vue b/src/views/warehouse/IOSearchOrder.vue
index 5697523..5fbc99a 100644
--- a/src/views/warehouse/IOSearchOrder.vue
+++ b/src/views/warehouse/IOSearchOrder.vue
@@ -231,6 +231,7 @@
             </el-dialog>
 
             <el-pagination
+                :current-page="filterQuery.page"
                 :page-size="filterQuery.limit"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
diff --git a/src/views/warehouse/InvProducts.vue b/src/views/warehouse/InvProducts.vue
index e6e8862..bdd2b2b 100644
--- a/src/views/warehouse/InvProducts.vue
+++ b/src/views/warehouse/InvProducts.vue
@@ -79,6 +79,7 @@
             ></codeDetail>
         </el-dialog>
         <el-pagination
+            :current-page="filterQuery.page"
             :page-size="filterQuery.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
diff --git a/src/views/warehouse/InvProductsDetail.vue b/src/views/warehouse/InvProductsDetail.vue
index 9771c29..5b0e1c1 100644
--- a/src/views/warehouse/InvProductsDetail.vue
+++ b/src/views/warehouse/InvProductsDetail.vue
@@ -42,6 +42,7 @@
         </el-table>
 
         <el-pagination
+            :current-page="query.page"
             :page-size="query.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next,total"
diff --git a/src/views/warehouse/UdiCodeTrace.vue b/src/views/warehouse/UdiCodeTrace.vue
index dc57d1d..623f26f 100644
--- a/src/views/warehouse/UdiCodeTrace.vue
+++ b/src/views/warehouse/UdiCodeTrace.vue
@@ -91,6 +91,7 @@
                     ></el-table-column>
                 </el-table>
                 <el-pagination
+                    :current-page="query.page"
                     :page-size="query.limit"
                     @current-change="handleCurrentChange"
                     layout="prev, pager, next"
diff --git a/src/views/warehouse/UdiInfoSelectLocalUdi.vue b/src/views/warehouse/UdiInfoSelectLocalUdi.vue
index 58ce762..79aeec0 100644
--- a/src/views/warehouse/UdiInfoSelectLocalUdi.vue
+++ b/src/views/warehouse/UdiInfoSelectLocalUdi.vue
@@ -149,6 +149,7 @@
 
                 </el-table>
                 <el-pagination
+                    :current-page="unionQuery.page"
                     :page-size="unionQuery.limit"
                     @current-change="handleCurrentChange"
                     layout="prev, pager, next"
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 68aa4e9..d605d1b 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -195,6 +195,7 @@
                     <el-pagination
                         @current-change="handleCurrentChange"
                         layout="prev, pager, next,total"
+                        :current-page="query.page"
                         :page-size="query.limit"
                         :total="total">
                     </el-pagination>
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 @@
         </el-table>
 
         <el-pagination
+            :current-page="query.page"
             :page-size="query.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next,total"
diff --git a/src/views/warehouse/codeReplace.vue b/src/views/warehouse/codeReplace.vue
index 5e60725..5946299 100644
--- a/src/views/warehouse/codeReplace.vue
+++ b/src/views/warehouse/codeReplace.vue
@@ -52,6 +52,7 @@
         </el-table>
 
         <el-pagination
+            :current-page="query.page"
             :page-size="query.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next,total"
diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue
index b2c140a..2221250 100644
--- a/src/views/warehouse/errorCode.vue
+++ b/src/views/warehouse/errorCode.vue
@@ -65,6 +65,7 @@
             </el-table-column>
         </el-table>
         <el-pagination
+            :current-page="query.page"
             :page-size="query.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
diff --git a/src/views/warehouse/ioErrorOrder.vue b/src/views/warehouse/ioErrorOrder.vue
index a5fec63..41402d4 100644
--- a/src/views/warehouse/ioErrorOrder.vue
+++ b/src/views/warehouse/ioErrorOrder.vue
@@ -193,6 +193,7 @@
             ></codeDetail>
         </el-dialog>
         <el-pagination
+            :current-page="filterQuery.page"
             :page-size="filterQuery.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
diff --git a/src/views/warehouse/ioFinishOrder.vue b/src/views/warehouse/ioFinishOrder.vue
index 70b55f2..bc3c24e 100644
--- a/src/views/warehouse/ioFinishOrder.vue
+++ b/src/views/warehouse/ioFinishOrder.vue
@@ -180,6 +180,7 @@
                 </el-table-column>
             </el-table>
             <el-pagination
+                :current-page="filterQuery.page"
                 :page-size="filterQuery.limit"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
diff --git a/src/views/warehouse/ioNewOrder.vue b/src/views/warehouse/ioNewOrder.vue
index 0b52d4e..0879cbf 100644
--- a/src/views/warehouse/ioNewOrder.vue
+++ b/src/views/warehouse/ioNewOrder.vue
@@ -186,6 +186,7 @@
             ></codeDetail>
         </el-dialog>
         <el-pagination
+            :current-page="filterQuery.page"
             :page-size="filterQuery.limit"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
diff --git a/src/views/warehouse/ioUdiTrace.vue b/src/views/warehouse/ioUdiTrace.vue
index d20509c..ff78e42 100644
--- a/src/views/warehouse/ioUdiTrace.vue
+++ b/src/views/warehouse/ioUdiTrace.vue
@@ -85,6 +85,7 @@
                 </el-table-column>
             </el-table>
             <el-pagination
+                :current-page="query.page"
                 :page-size="query.limit"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
diff --git a/src/views/warehouse/selectProduct.vue b/src/views/warehouse/selectProduct.vue
index 9d8f63f..1aec4a1 100644
--- a/src/views/warehouse/selectProduct.vue
+++ b/src/views/warehouse/selectProduct.vue
@@ -100,6 +100,7 @@
                     ></el-table-column>
                 </el-table>
                 <el-pagination
+                    :current-page="unionQuery.page"
                     :page-size="unionQuery.limit"
                     @current-change="handleCurrentChange"
                     layout="prev, pager, next"
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 601dc1b..5feea74 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -136,6 +136,7 @@
             </el-table>
 
             <el-pagination
+                :current-page="query.page"
                 :page-size="query.limit"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
@@ -212,6 +213,7 @@
             </el-table>
 
             <el-pagination
+                :current-page="detailQuery.page"
                 :page-size="detailQuery.limit"
                 @current-change="detailHandleCurrentChange"
                 layout="prev, pager, next"
diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue
index c931425..572eb78 100644
--- a/src/views/warehouse/stockOrderDelete.vue
+++ b/src/views/warehouse/stockOrderDelete.vue
@@ -106,6 +106,7 @@
             </el-table>
 
             <el-pagination
+                :current-page="query.page"
                 :page-size="query.limit"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
@@ -439,7 +440,7 @@
                     type: 'warning'
                 }).then(() => {
                     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 @@
                 <el-pagination
                     @current-change="handleCurrentChange"
                     layout="prev, pager, next"
+                    :current-page="query.page"
                     :page-size="query.limit"
                     :total="total">
                 </el-pagination>
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 @@
             </el-table>
 
             <el-pagination
+                :current-page="detailQuery.page"
                 :page-size="detailQuery.limit"
                 @current-change="detailHandleCurrentChange"
                 layout="prev, pager, next"
@@ -146,6 +147,7 @@ export default {
                 page: 1,
                 limit: 20
             },
+            detailTotal: 0,
             batchForm: {
                 secSalesListNo: '',
                 firstSalesInvNo: '',
@@ -251,6 +253,7 @@ export default {
                 .then((response) => {
                     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"
+                >
                 </el-pagination>
             </div>
         </el-form>
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 @@
                     ></el-table-column>
                 </el-table>
                 <el-pagination
+                    :current-page="listQuery.page"
                     :page-size="listQuery.limit"
                     @current-change="handleErpPageChange"
                     layout="prev, pager, next"
diff --git a/src/views/warehouse/stockOrderQRCodeDetail.vue b/src/views/warehouse/stockOrderQRCodeDetail.vue
index 3a2b675..57e8efa 100644
--- a/src/views/warehouse/stockOrderQRCodeDetail.vue
+++ b/src/views/warehouse/stockOrderQRCodeDetail.vue
@@ -129,6 +129,7 @@
                 <el-pagination
                     @current-change="handleCurrentChange"
                     layout="prev, pager, next"
+                    :current-page="query.page"
                     :page-size="query.limit"
                     :total="total">
                 </el-pagination>
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 @@
             </el-table>
 
             <el-pagination
+                :current-page="query.page"
                 :page-size="query.limit"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
@@ -202,6 +203,7 @@
             </el-table>
 
             <el-pagination
+                :current-page="detailQuery.page"
                 :page-size="detailQuery.limit"
                 @current-change="detailHandleCurrentChange"
                 layout="prev, pager, next"
diff --git a/src/views/warehouse/stockQRCodeExport.vue b/src/views/warehouse/stockQRCodeExport.vue
index 78fa708..51df876 100644
--- a/src/views/warehouse/stockQRCodeExport.vue
+++ b/src/views/warehouse/stockQRCodeExport.vue
@@ -120,6 +120,7 @@
                 <el-pagination
                     @current-change="handleCurrentChange"
                     layout="prev, pager, next"
+                    :current-page="query.page"
                     :page-size="query.limit"
                     :total="total">
                 </el-pagination>
@@ -175,6 +176,7 @@
             </el-table>
 
             <el-pagination
+                :current-page="refreshQuery.page"
                 :page-size="refreshQuery.limit"
                 @current-change="handleLableChange"
                 layout="prev, pager, next"