From 57f2179782582317a599e3bd143301af140b83ab Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 28 Jul 2022 16:46:01 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=87=8D=E7=BD=AE=E5=90=8E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=E9=A1=B5?= =?UTF-8?q?=E7=A0=81=E5=9B=9E=E6=98=BE=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/BasicEntrutsRece.vue | 1 + src/views/basic/BasicThirdSys.vue | 1 + src/views/basic/BussinessType.vue | 1 + src/views/basic/BussinessTypeLocl.vue | 11 +++++-- src/views/basic/BussinessTypeThird.vue | 8 +++-- src/views/basic/CorpExport.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 | 1 + src/views/basic/CorpSelect.vue | 1 + src/views/basic/CorpSingleRelevance.vue | 1 + src/views/basic/UdiInfoDb.vue | 1 + src/views/basic/UdiInfoDonwloadSmp.vue | 1 + src/views/basic/UdiInfoImport.vue | 1 + src/views/basic/UdiInfoImportDetail.vue | 1 + src/views/basic/UdiInfoManageSp.vue | 1 + src/views/basic/UdiInfoRelevance.vue | 2 ++ src/views/basic/UdiInfoSelectLocalUdi.vue | 1 + src/views/basic/UdiInfoSelectUdi.vue | 1 + src/views/basic/UdidbImportLog.vue | 1 + src/views/basic/UdiinfoExport.vue | 1 + src/views/basic/UdiinfoExportSmp.vue | 1 + src/views/basic/UdiinfoSelectVersion.vue | 1 + .../basic/basicCompanyProductsImport.vue | 1 + src/views/basic/invWarehouse.vue | 2 ++ src/views/business/addOrder.vue | 4 ++- src/views/business/codeReplace.vue | 1 + src/views/business/errorCode.vue | 1 + src/views/business/selectThrOrder.vue | 1 + src/views/business/stockOrder.vue | 2 ++ src/views/business/stockOrderDelSearch.vue | 2 ++ src/views/business/stockOrderDelete.vue | 1 + src/views/business/stockOrderDistribution.vue | 4 ++- src/views/business/stockOrderEdit.vue | 1 + .../business/stockOrderNewSelectProduct.vue | 1 + src/views/business/stockOrderQRCodeDetail.vue | 4 ++- src/views/business/stockOrderSearch.vue | 2 ++ src/views/business/stockOrderWaitCheck.vue | 2 ++ src/views/business/stockQRCodeExport.vue | 5 +++- src/views/inout/DialogImportErpOrder.vue | 1 + src/views/inout/DialogSelectErpOrder.vue | 1 + src/views/inout/DialogSelectInout.vue | 1 + src/views/inout/DialogSelectRl.vue | 1 + src/views/inout/IOAddOrder.vue | 4 ++- src/views/inout/IOCheckErrorOrder.vue | 1 + src/views/inout/IOCheckWaitOrder.vue | 1 + src/views/inout/IOErpOrder.vue | 1 + src/views/inout/IOErrorOrder.vue | 1 + src/views/inout/IOFinishCode.vue | 1 + src/views/inout/IOFinishOrder.vue | 1 + src/views/inout/IONewCode.vue | 1 + src/views/inout/IONewOrder.vue | 1 + src/views/inout/IOWaitOrder.vue | 1 + src/views/inout/errorCode.vue | 1 + src/views/inventory/stockCode.vue | 1 + src/views/smp/ErpOrderSmpUpload.vue | 1 + src/views/smp/UdiInfoSmpUpload.vue | 1 + src/views/thrsys/SysUdimsConfig.vue | 1 + src/views/thrsys/SysUdimsData.vue | 1 + src/views/thrsys/SysUdimsDownloadData.vue | 1 + src/views/thrsys/ThrCorpSelect.vue | 1 + src/views/thrsys/ThrCorps.vue | 1 + src/views/thrsys/ThrCorpsExport.vue | 1 + src/views/thrsys/ThrCorpsExportSmp.vue | 1 + src/views/thrsys/ThrCorpsImport.vue | 1 + src/views/thrsys/ThrCorpsImportDetail.vue | 1 + src/views/thrsys/ThrInvProducts.vue | 1 + src/views/thrsys/ThrInvProductsExport.vue | 1 + src/views/thrsys/ThrInvProductsImport.vue | 1 + .../thrsys/ThrInvProductsImportDetail.vue | 1 + src/views/thrsys/ThrInvProductsSelect.vue | 1 + src/views/thrsys/ThrInvWarehouse.vue | 1 + src/views/thrsys/ThrOrdedrReceiveAdd.vue | 1 + src/views/thrsys/ThrOrdedrReceiveSearch.vue | 1 + src/views/thrsys/ThrOrder.vue | 1 + src/views/thrsys/ThrOrderExport.vue | 1 + src/views/thrsys/ThrOrderExportSmp.vue | 1 + src/views/thrsys/ThrOrderImport.vue | 1 + src/views/thrsys/ThrOrderImportDetail.vue | 1 + src/views/thrsys/ThrOrderSelect.vue | 1 + src/views/thrsys/ThrProducts.vue | 1 + src/views/thrsys/ThrProductsExport.vue | 1 + src/views/thrsys/ThrProductsExportSmp.vue | 1 + src/views/thrsys/ThrProductsImport.vue | 1 + src/views/thrsys/ThrProductsImportDetail.vue | 1 + src/views/thrsys/ThrProductsSelect.vue | 1 + .../userManage/param/systemPDFModule.vue | 30 ++++--------------- .../userManage/param/systemPDFTemplate.vue | 1 + 90 files changed, 123 insertions(+), 35 deletions(-) diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue index 81eff79..eaa2e03 100644 --- a/src/views/basic/BasicEntrutsRece.vue +++ b/src/views/basic/BasicEntrutsRece.vue @@ -101,6 +101,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/basic/BasicThirdSys.vue b/src/views/basic/BasicThirdSys.vue index f966bd5..be4ac18 100644 --- a/src/views/basic/BasicThirdSys.vue +++ b/src/views/basic/BasicThirdSys.vue @@ -158,6 +158,7 @@ @current-change="handlePageChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 5983592..7856bfa 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -147,6 +147,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue index 0f8790b..9367204 100644 --- a/src/views/basic/BussinessTypeLocl.vue +++ b/src/views/basic/BussinessTypeLocl.vue @@ -34,7 +34,7 @@ - + diff --git a/src/views/basic/CorpExportSmp.vue b/src/views/basic/CorpExportSmp.vue index 258c3c1..dd82780 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 9cb020b..cfdeea1 100644 --- a/src/views/basic/CorpImport.vue +++ b/src/views/basic/CorpImport.vue @@ -111,6 +111,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 56f9824..1f08ecc 100644 --- a/src/views/basic/CorpImportDetail.vue +++ b/src/views/basic/CorpImportDetail.vue @@ -83,6 +83,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 c70ef2f..1ef6a37 100644 --- a/src/views/basic/CorpMaintain.vue +++ b/src/views/basic/CorpMaintain.vue @@ -115,6 +115,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > diff --git a/src/views/basic/CorpSelect.vue b/src/views/basic/CorpSelect.vue index bd60cc3..05e5cc2 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 14fe3c4..0321184 100644 --- a/src/views/basic/CorpSingleRelevance.vue +++ b/src/views/basic/CorpSingleRelevance.vue @@ -118,6 +118,7 @@ @current-change="handlepageChange" layout="prev, pager, next" :total="total" + :current-page="unitQuery.page" > diff --git a/src/views/basic/UdiInfoDb.vue b/src/views/basic/UdiInfoDb.vue index 2d759cc..776f70b 100644 --- a/src/views/basic/UdiInfoDb.vue +++ b/src/views/basic/UdiInfoDb.vue @@ -149,6 +149,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="unionQuery.page" > diff --git a/src/views/basic/UdiInfoDonwloadSmp.vue b/src/views/basic/UdiInfoDonwloadSmp.vue index 580bccc..8e24e76 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 05581fd..b0a0df6 100644 --- a/src/views/basic/UdiInfoImport.vue +++ b/src/views/basic/UdiInfoImport.vue @@ -116,6 +116,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 9e812fb..aebee10 100644 --- a/src/views/basic/UdiInfoImportDetail.vue +++ b/src/views/basic/UdiInfoImportDetail.vue @@ -102,6 +102,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/basic/UdiInfoManageSp.vue b/src/views/basic/UdiInfoManageSp.vue index 290bea9..5831fa6 100644 --- a/src/views/basic/UdiInfoManageSp.vue +++ b/src/views/basic/UdiInfoManageSp.vue @@ -738,6 +738,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 0fdb9e8..d2f3733 100644 --- a/src/views/basic/UdiInfoRelevance.vue +++ b/src/views/basic/UdiInfoRelevance.vue @@ -93,6 +93,7 @@ @current-change="handleErpPageChange" layout="prev, pager, next" :total="pageTotal" + :curret-page="erpQuery.page" > @@ -232,6 +233,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="unionQuery.page" > diff --git a/src/views/basic/UdiInfoSelectLocalUdi.vue b/src/views/basic/UdiInfoSelectLocalUdi.vue index 5bacc65..0e7597d 100644 --- a/src/views/basic/UdiInfoSelectLocalUdi.vue +++ b/src/views/basic/UdiInfoSelectLocalUdi.vue @@ -152,6 +152,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 0fdc46a..6ba9feb 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/UdidbImportLog.vue b/src/views/basic/UdidbImportLog.vue index 3e171d0..7e5d285 100644 --- a/src/views/basic/UdidbImportLog.vue +++ b/src/views/basic/UdidbImportLog.vue @@ -97,6 +97,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/basic/UdiinfoExport.vue b/src/views/basic/UdiinfoExport.vue index 2a081b6..1e298f3 100644 --- a/src/views/basic/UdiinfoExport.vue +++ b/src/views/basic/UdiinfoExport.vue @@ -91,6 +91,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/basic/UdiinfoExportSmp.vue b/src/views/basic/UdiinfoExportSmp.vue index 0073c1c..1da064f 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/UdiinfoSelectVersion.vue b/src/views/basic/UdiinfoSelectVersion.vue index be37197..317f5bf 100644 --- a/src/views/basic/UdiinfoSelectVersion.vue +++ b/src/views/basic/UdiinfoSelectVersion.vue @@ -73,6 +73,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="unionQuery.page" > diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue index 86a487e..8cc40a1 100644 --- a/src/views/basic/basicCompanyProductsImport.vue +++ b/src/views/basic/basicCompanyProductsImport.vue @@ -590,6 +590,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 1092726..205e629 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -628,6 +628,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" >
@@ -687,6 +688,7 @@ @current-change="handleSubCurrentChange" layout="prev, pager, next" :total="subTotal" + :current-page="thirdQuery.page" >
diff --git a/src/views/business/addOrder.vue b/src/views/business/addOrder.vue index 6584001..d6fa845 100644 --- a/src/views/business/addOrder.vue +++ b/src/views/business/addOrder.vue @@ -158,7 +158,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/business/codeReplace.vue b/src/views/business/codeReplace.vue index 0cc0b16..e0a6e7c 100644 --- a/src/views/business/codeReplace.vue +++ b/src/views/business/codeReplace.vue @@ -56,6 +56,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next,total" :total="total" + :current-page="query.page" > diff --git a/src/views/business/errorCode.vue b/src/views/business/errorCode.vue index c9c66eb..76f15c7 100644 --- a/src/views/business/errorCode.vue +++ b/src/views/business/errorCode.vue @@ -73,6 +73,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" >
diff --git a/src/views/business/selectThrOrder.vue b/src/views/business/selectThrOrder.vue index d7fdfcd..9a8e67b 100644 --- a/src/views/business/selectThrOrder.vue +++ b/src/views/business/selectThrOrder.vue @@ -112,6 +112,7 @@ @current-change="handleErpPageChange" layout="prev, pager, next" :total="pageTotal" + :current-page="listQuery.page" > diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue index 75ccf78..b359e78 100644 --- a/src/views/business/stockOrder.vue +++ b/src/views/business/stockOrder.vue @@ -157,6 +157,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > @@ -184,6 +185,7 @@ @current-change="detailHandleCurrentChange" layout="prev, pager, next" :total="detailTotal" + :current-page="detailQuery.page" > diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue index fb9ff03..cbff2c1 100644 --- a/src/views/business/stockOrderDelSearch.vue +++ b/src/views/business/stockOrderDelSearch.vue @@ -167,6 +167,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > @@ -245,6 +246,7 @@ @current-change="detailHandleCurrentChange" layout="prev, pager, next" :total="detailTotal" + :current-page="detailQuery.page" > diff --git a/src/views/business/stockOrderDelete.vue b/src/views/business/stockOrderDelete.vue index f8be405..8edddda 100644 --- a/src/views/business/stockOrderDelete.vue +++ b/src/views/business/stockOrderDelete.vue @@ -115,6 +115,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > diff --git a/src/views/business/stockOrderDistribution.vue b/src/views/business/stockOrderDistribution.vue index 6845d30..c6d9871 100644 --- a/src/views/business/stockOrderDistribution.vue +++ b/src/views/business/stockOrderDistribution.vue @@ -166,7 +166,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/business/stockOrderEdit.vue b/src/views/business/stockOrderEdit.vue index 8d1b5e6..0463175 100644 --- a/src/views/business/stockOrderEdit.vue +++ b/src/views/business/stockOrderEdit.vue @@ -75,6 +75,7 @@ @current-change="detailHandleCurrentChange" layout="prev, pager, next" :total="detailTotal" + :current-page="detailQuery.page" > diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue index 22b6620..4c60b7c 100644 --- a/src/views/business/stockOrderNewSelectProduct.vue +++ b/src/views/business/stockOrderNewSelectProduct.vue @@ -112,6 +112,7 @@ @current-change="handleErpPageChange" layout="prev, pager, next" :total="pageTotal" + :current-page="listQuery.page" > diff --git a/src/views/business/stockOrderQRCodeDetail.vue b/src/views/business/stockOrderQRCodeDetail.vue index bc0d9ef..ac72842 100644 --- a/src/views/business/stockOrderQRCodeDetail.vue +++ b/src/views/business/stockOrderQRCodeDetail.vue @@ -113,7 +113,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/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue index d0b10e4..de9efc7 100644 --- a/src/views/business/stockOrderSearch.vue +++ b/src/views/business/stockOrderSearch.vue @@ -140,6 +140,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > @@ -215,6 +216,7 @@ @current-change="detailHandleCurrentChange" layout="prev, pager, next" :total="detailTotal" + :current-page="detailQuery.page" > diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue index 76f25b0..c56a13c 100644 --- a/src/views/business/stockOrderWaitCheck.vue +++ b/src/views/business/stockOrderWaitCheck.vue @@ -137,6 +137,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > @@ -164,6 +165,7 @@ @current-change="detailHandleCurrentChange" layout="prev, pager, next" :total="detailTotal" + :current-page="detailQuery.page" > diff --git a/src/views/business/stockQRCodeExport.vue b/src/views/business/stockQRCodeExport.vue index fa40287..6dca8fb 100644 --- a/src/views/business/stockQRCodeExport.vue +++ b/src/views/business/stockQRCodeExport.vue @@ -121,7 +121,9 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :page-size="query.limit" - :total="total"> + :total="total" + :current-page="query.page" + > @@ -179,6 +181,7 @@ @current-change="handleLableChange" layout="prev, pager, next" :total="labltotal" + :current-page="refreshQuery.page" > diff --git a/src/views/inout/DialogImportErpOrder.vue b/src/views/inout/DialogImportErpOrder.vue index 278642a..7c958ba 100644 --- a/src/views/inout/DialogImportErpOrder.vue +++ b/src/views/inout/DialogImportErpOrder.vue @@ -86,6 +86,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/inout/DialogSelectErpOrder.vue b/src/views/inout/DialogSelectErpOrder.vue index 4ffdce9..6ed54e5 100644 --- a/src/views/inout/DialogSelectErpOrder.vue +++ b/src/views/inout/DialogSelectErpOrder.vue @@ -103,6 +103,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/inout/DialogSelectInout.vue b/src/views/inout/DialogSelectInout.vue index a55e1ea..63577e9 100644 --- a/src/views/inout/DialogSelectInout.vue +++ b/src/views/inout/DialogSelectInout.vue @@ -66,6 +66,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue index 07a03c7..75aba74 100644 --- a/src/views/inout/DialogSelectRl.vue +++ b/src/views/inout/DialogSelectRl.vue @@ -492,6 +492,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index 3768245..02c4c2a 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -349,7 +349,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/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue index 914b0c8..3cd8576 100644 --- a/src/views/inout/IOCheckErrorOrder.vue +++ b/src/views/inout/IOCheckErrorOrder.vue @@ -251,6 +251,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue index a2e0610..022285f 100644 --- a/src/views/inout/IOCheckWaitOrder.vue +++ b/src/views/inout/IOCheckWaitOrder.vue @@ -167,6 +167,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/inout/IOErpOrder.vue b/src/views/inout/IOErpOrder.vue index 7817ba4..6fd2b06 100644 --- a/src/views/inout/IOErpOrder.vue +++ b/src/views/inout/IOErpOrder.vue @@ -107,6 +107,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/inout/IOErrorOrder.vue b/src/views/inout/IOErrorOrder.vue index e104bb9..470ea6b 100644 --- a/src/views/inout/IOErrorOrder.vue +++ b/src/views/inout/IOErrorOrder.vue @@ -258,6 +258,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/inout/IOFinishCode.vue b/src/views/inout/IOFinishCode.vue index 8c927b0..468d70d 100644 --- a/src/views/inout/IOFinishCode.vue +++ b/src/views/inout/IOFinishCode.vue @@ -61,6 +61,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next,total" :total="total" + :current-page="query.page" > diff --git a/src/views/inout/IOFinishOrder.vue b/src/views/inout/IOFinishOrder.vue index 97612f5..26272a5 100644 --- a/src/views/inout/IOFinishOrder.vue +++ b/src/views/inout/IOFinishOrder.vue @@ -225,6 +225,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/inout/IONewCode.vue b/src/views/inout/IONewCode.vue index b75a717..3871e0d 100644 --- a/src/views/inout/IONewCode.vue +++ b/src/views/inout/IONewCode.vue @@ -47,6 +47,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue index 7c04587..cf65b48 100644 --- a/src/views/inout/IONewOrder.vue +++ b/src/views/inout/IONewOrder.vue @@ -253,6 +253,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/inout/IOWaitOrder.vue b/src/views/inout/IOWaitOrder.vue index e2b4c06..04e183b 100644 --- a/src/views/inout/IOWaitOrder.vue +++ b/src/views/inout/IOWaitOrder.vue @@ -194,6 +194,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/inout/errorCode.vue b/src/views/inout/errorCode.vue index 7c39626..67f6042 100644 --- a/src/views/inout/errorCode.vue +++ b/src/views/inout/errorCode.vue @@ -111,6 +111,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > diff --git a/src/views/inventory/stockCode.vue b/src/views/inventory/stockCode.vue index 0573565..67d923c 100644 --- a/src/views/inventory/stockCode.vue +++ b/src/views/inventory/stockCode.vue @@ -81,6 +81,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > diff --git a/src/views/smp/ErpOrderSmpUpload.vue b/src/views/smp/ErpOrderSmpUpload.vue index 471e394..6213bd7 100644 --- a/src/views/smp/ErpOrderSmpUpload.vue +++ b/src/views/smp/ErpOrderSmpUpload.vue @@ -68,6 +68,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/smp/UdiInfoSmpUpload.vue b/src/views/smp/UdiInfoSmpUpload.vue index 3b59b8f..847a5a7 100644 --- a/src/views/smp/UdiInfoSmpUpload.vue +++ b/src/views/smp/UdiInfoSmpUpload.vue @@ -479,6 +479,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue index b72e0bb..beb96a0 100644 --- a/src/views/thrsys/SysUdimsConfig.vue +++ b/src/views/thrsys/SysUdimsConfig.vue @@ -279,6 +279,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="busQuery.page" > diff --git a/src/views/thrsys/SysUdimsData.vue b/src/views/thrsys/SysUdimsData.vue index 4616f2e..2ca8046 100644 --- a/src/views/thrsys/SysUdimsData.vue +++ b/src/views/thrsys/SysUdimsData.vue @@ -128,6 +128,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/SysUdimsDownloadData.vue b/src/views/thrsys/SysUdimsDownloadData.vue index 790f565..0fe8673 100644 --- a/src/views/thrsys/SysUdimsDownloadData.vue +++ b/src/views/thrsys/SysUdimsDownloadData.vue @@ -106,6 +106,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrCorpSelect.vue b/src/views/thrsys/ThrCorpSelect.vue index f9652b0..810c532 100644 --- a/src/views/thrsys/ThrCorpSelect.vue +++ b/src/views/thrsys/ThrCorpSelect.vue @@ -73,6 +73,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrCorps.vue b/src/views/thrsys/ThrCorps.vue index 5d7eb54..a17f2d9 100644 --- a/src/views/thrsys/ThrCorps.vue +++ b/src/views/thrsys/ThrCorps.vue @@ -60,6 +60,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrCorpsExport.vue b/src/views/thrsys/ThrCorpsExport.vue index f48ce2b..ad9d741 100644 --- a/src/views/thrsys/ThrCorpsExport.vue +++ b/src/views/thrsys/ThrCorpsExport.vue @@ -90,6 +90,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrCorpsExportSmp.vue b/src/views/thrsys/ThrCorpsExportSmp.vue index df9bb99..514200d 100644 --- a/src/views/thrsys/ThrCorpsExportSmp.vue +++ b/src/views/thrsys/ThrCorpsExportSmp.vue @@ -90,6 +90,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrCorpsImport.vue b/src/views/thrsys/ThrCorpsImport.vue index 2223c53..5908988 100644 --- a/src/views/thrsys/ThrCorpsImport.vue +++ b/src/views/thrsys/ThrCorpsImport.vue @@ -153,6 +153,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrCorpsImportDetail.vue b/src/views/thrsys/ThrCorpsImportDetail.vue index 6cc8d1d..d91b0fb 100644 --- a/src/views/thrsys/ThrCorpsImportDetail.vue +++ b/src/views/thrsys/ThrCorpsImportDetail.vue @@ -45,6 +45,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrInvProducts.vue b/src/views/thrsys/ThrInvProducts.vue index a845cc0..b91a6b7 100644 --- a/src/views/thrsys/ThrInvProducts.vue +++ b/src/views/thrsys/ThrInvProducts.vue @@ -90,6 +90,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrInvProductsExport.vue b/src/views/thrsys/ThrInvProductsExport.vue index c6c0642..53dbb2a 100644 --- a/src/views/thrsys/ThrInvProductsExport.vue +++ b/src/views/thrsys/ThrInvProductsExport.vue @@ -90,6 +90,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrInvProductsImport.vue b/src/views/thrsys/ThrInvProductsImport.vue index 208ebbd..1ccf2ba 100644 --- a/src/views/thrsys/ThrInvProductsImport.vue +++ b/src/views/thrsys/ThrInvProductsImport.vue @@ -154,6 +154,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrInvProductsImportDetail.vue b/src/views/thrsys/ThrInvProductsImportDetail.vue index 4b6bcec..4ea7453 100644 --- a/src/views/thrsys/ThrInvProductsImportDetail.vue +++ b/src/views/thrsys/ThrInvProductsImportDetail.vue @@ -46,6 +46,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrInvProductsSelect.vue b/src/views/thrsys/ThrInvProductsSelect.vue index 5e63a91..52a8ea3 100644 --- a/src/views/thrsys/ThrInvProductsSelect.vue +++ b/src/views/thrsys/ThrInvProductsSelect.vue @@ -98,6 +98,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue index b7a76a7..cce4b88 100644 --- a/src/views/thrsys/ThrInvWarehouse.vue +++ b/src/views/thrsys/ThrInvWarehouse.vue @@ -161,6 +161,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrOrdedrReceiveAdd.vue b/src/views/thrsys/ThrOrdedrReceiveAdd.vue index 0ca86e9..b43dcd1 100644 --- a/src/views/thrsys/ThrOrdedrReceiveAdd.vue +++ b/src/views/thrsys/ThrOrdedrReceiveAdd.vue @@ -94,6 +94,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrOrdedrReceiveSearch.vue b/src/views/thrsys/ThrOrdedrReceiveSearch.vue index e5278bb..2e31a6d 100644 --- a/src/views/thrsys/ThrOrdedrReceiveSearch.vue +++ b/src/views/thrsys/ThrOrdedrReceiveSearch.vue @@ -125,6 +125,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrOrder.vue b/src/views/thrsys/ThrOrder.vue index 3892622..c6c7474 100644 --- a/src/views/thrsys/ThrOrder.vue +++ b/src/views/thrsys/ThrOrder.vue @@ -125,6 +125,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrOrderExport.vue b/src/views/thrsys/ThrOrderExport.vue index 1209f02..155ad61 100644 --- a/src/views/thrsys/ThrOrderExport.vue +++ b/src/views/thrsys/ThrOrderExport.vue @@ -90,6 +90,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrOrderExportSmp.vue b/src/views/thrsys/ThrOrderExportSmp.vue index 53e55d8..bc50c49 100644 --- a/src/views/thrsys/ThrOrderExportSmp.vue +++ b/src/views/thrsys/ThrOrderExportSmp.vue @@ -91,6 +91,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrOrderImport.vue b/src/views/thrsys/ThrOrderImport.vue index c839b1d..9727f8e 100644 --- a/src/views/thrsys/ThrOrderImport.vue +++ b/src/views/thrsys/ThrOrderImport.vue @@ -155,6 +155,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrOrderImportDetail.vue b/src/views/thrsys/ThrOrderImportDetail.vue index 7d89c60..f223d9d 100644 --- a/src/views/thrsys/ThrOrderImportDetail.vue +++ b/src/views/thrsys/ThrOrderImportDetail.vue @@ -46,6 +46,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrOrderSelect.vue b/src/views/thrsys/ThrOrderSelect.vue index 59dbfd0..e4a2d60 100644 --- a/src/views/thrsys/ThrOrderSelect.vue +++ b/src/views/thrsys/ThrOrderSelect.vue @@ -118,6 +118,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrProducts.vue b/src/views/thrsys/ThrProducts.vue index fe543a4..cfe1689 100644 --- a/src/views/thrsys/ThrProducts.vue +++ b/src/views/thrsys/ThrProducts.vue @@ -95,6 +95,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrProductsExportSmp.vue b/src/views/thrsys/ThrProductsExportSmp.vue index fda4ef1..f94d93f 100644 --- a/src/views/thrsys/ThrProductsExportSmp.vue +++ b/src/views/thrsys/ThrProductsExportSmp.vue @@ -91,6 +91,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrProductsImport.vue b/src/views/thrsys/ThrProductsImport.vue index 167055e..f5fe153 100644 --- a/src/views/thrsys/ThrProductsImport.vue +++ b/src/views/thrsys/ThrProductsImport.vue @@ -127,6 +127,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > diff --git a/src/views/thrsys/ThrProductsSelect.vue b/src/views/thrsys/ThrProductsSelect.vue index 20e447f..1bc95ac 100644 --- a/src/views/thrsys/ThrProductsSelect.vue +++ b/src/views/thrsys/ThrProductsSelect.vue @@ -101,6 +101,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > @@ -188,6 +189,7 @@ @current-change="handlePageChange" layout="prev, pager, next" :total="total" + :current-page="moduleQuery.page" > @@ -358,6 +360,7 @@ @current-change="moduleHandleCurrentChange" layout="prev, pager, next" :total="selectTemplateTotal" + :current-page="selectTemplateQuery.page" > @@ -490,14 +493,13 @@ export default { this.$router.push({ path: "" }); - this.query = { - templateType: null, - moduleId: null, + this.moduleQuery = { name: "", page: 1, limit: 20 }; this.getModuleList(); + this.list = []; }, onSubmit() { this.getModuleList(); @@ -554,8 +556,6 @@ export default { }, jumpDl(row) { - console.log(BASE_URL); - console.log(row.templateDlUrl + "----" + SERVER_IP); this.handleDownload(BASE_URL + "/udiwms/donwload/file?fileName=" + row.templateDlUrl, row.name + ".jrxml"); }, getModuleList() { @@ -622,14 +622,12 @@ export default { page: 1, limit: 20 }; - console.log("this.selectTemplateQuery.busRlId =" + this.selectTemplateQuery.busRlId); this.selectTemplateGetList(); }, selectTemplateGetList() { - console.log(this.selectTemplateQuery) this.selectTemplateLoading = true; systemPDFTemplateList(this.selectTemplateQuery) .then(response => { @@ -643,9 +641,6 @@ export default { this.selectTemplateTotal = 0; }); }, - previewTemplate(row) { - console.log(row) - }, showFieldExpain(row) { this.currentRow = row.fieldExplain.replace('\\\n', '
'); @@ -687,7 +682,6 @@ export default { if (this.$refs.upload.uploadFiles.length < 1 && !this.uploadDisabled) { this.$message.warning(`请选择jasper文件`); } - console.log(this.formName) this.$refs["dataForm"].validate(valid => { if (valid) { if (!this.uploadDisabled) { @@ -699,11 +693,8 @@ export default { }); }, uploadHandleRemove(file, fileList) { - console.log(file, fileList); }, uploadHandlePreview(file) { - console.log(file); - console.log(this.fileList); }, uploadHandleExceed(files, fileList) { this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); @@ -735,7 +726,6 @@ export default { return isLt; }, uploadHandleSuccess(response, file, fileList) { - console.log(response) if (response.code === 20000) { this.formData.path = response.data.path; this.submitTemplate(); @@ -747,7 +737,6 @@ export default { }, submitTemplate() { - console.log(this.formData) this.$refs["dataForm"].validate(valid => { if (valid) { this.formLoading = true; @@ -790,7 +779,6 @@ export default { }).then(() => { systemPDFTemplateDeleteById({id: row.id, path: row.path}) .then(response => { - console.log(response) if (response.code === 20000) { this.$message.success(response.data); // 刷新表单 @@ -812,8 +800,6 @@ export default { }, moduleSelectHandleCurrentChange(val) { this.moduleFormData.templateId = val.id; - console.log(val) - console.log(this.moduleFormData) }, moduleSubmitSelectTemplate() { @@ -821,9 +807,6 @@ export default { let data = Object.assign({}, this.moduleFormData); this.moduleFormName = 'update'; if (this.selectTemplateQuery.type == 1) { - - - console.log("this.selectTemplateQuery.busRlId =" + this.selectTemplateQuery.busRlId); let query = { id: this.selectTemplateQuery.busRlId, templateId: data.templateId, @@ -871,10 +854,8 @@ export default { this.moduleNameList = response.data.list; this.moduleNameMap = {}; this.moduleNameList.forEach((obj, index) => { - console.log(obj) this.moduleNameMap[obj.id] = obj.name; }); - console.log(this.moduleNameMap) }) .catch(() => { }); @@ -882,7 +863,6 @@ export default { handleEdit(index, row) { this.currentCheckIndex = index; - console.log(this.currentCheckIndex) }, handleSave(index, row) { this.currentCheckIndex = -1; diff --git a/src/views/userManage/param/systemPDFTemplate.vue b/src/views/userManage/param/systemPDFTemplate.vue index 5096872..1e8b604 100644 --- a/src/views/userManage/param/systemPDFTemplate.vue +++ b/src/views/userManage/param/systemPDFTemplate.vue @@ -427,6 +427,7 @@ export default { this.getList(); }, onSubmit() { + this.query.page = 1; this.getList(); }, handleCurrentChange(val) {