1.修改单据编辑传参错误问题

2.修复分页参数未重置问题 3.修复部分页面分页参数导致无结果问题
3 years ago · fea23b6123
parent b1a93b45c9
commit fea23b6123
72 changed files with 100 additions and 7 deletions
--- 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">
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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>


--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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)
--- 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>
--- 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
--- 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>
--- 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>
--- 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: []
--- 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
--- 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) {
--- 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="状态">
--- 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) {
--- 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() {
--- 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"
--- 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"
--- 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) {
--- 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"
--- 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() {
--- 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() {
--- 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() {
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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>
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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>
--- 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;
--- 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>
--- 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"
--- 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>
--- 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"
--- 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"