Merge remote-tracking branch 'origin/dev5.3.4+' into test

src/components/icss/ChronicDiseaseStructureList.vue

@@ -133,6 +133,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm, to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -175,6 +176,10 @@
           // }
           this.list = list;
           this.total = res.data.data.total;
+          if(this.inCurrentPage!==undefined){
+            this.currentPage=this.inCurrentPage;
+            this.inCurrentPage = undefined;
+          }
         })
       },
       filterDatas() {
@@ -219,7 +224,7 @@
           this.clearFilter();
         };
         const param = {
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           name: this.filter.tagSysName.trim(),
           status:this.filter.isState

src/components/icss/VersionInfo.vue

@@ -133,6 +133,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm, to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -200,6 +201,10 @@
               this.canModiId = this.list[0].id;
             }
             this.flag = false;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           }
         }).catch((error) => {
           console.log(error);
@@ -218,7 +223,7 @@
         };
         const param = {
           name: this.filter.name.trim(),
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           productType:this.filter.type?this.filter.type:0
         };