浏览代码

icss数据维护翻页bug修改2739

zhouna 5 年之前
父节点
当前提交
5bf7c54857

+ 14 - 8
src/components/icss/IndeptLabel.vue

@@ -84,13 +84,14 @@
                     </template>
                 </el-table-column>
             </el-table>
-          <el-pagination @current-change="currentChange"
-                        background
-                        :page-size="pageSize"
-                        :page-sizes="pageSizeArr"
-                         @size-change="handleSizeChange"
-                        :layout="pageLayout"
-                        :total="total">
+          <el-pagination  :current-page.sync="currentPage"
+                          @current-change="currentChange"
+                          background
+                          :page-size.sync="pageSize"
+                          :page-sizes="pageSizeArr"
+                           @size-change="handleSizeChange"
+                          :layout="pageLayout"
+                          :total="total">
             </el-pagination>
         </div>
     </div>
@@ -139,6 +140,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm, to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -180,6 +182,10 @@
           }
           this.list = list;
           this.total = res.data.data.total;
+          if(this.inCurrentPage!==undefined){
+            this.currentPage=this.inCurrentPage;
+            this.inCurrentPage = undefined;
+          }
         })
       },
       filterDatas() {
@@ -246,7 +252,7 @@
         };
         const param = {
           tagTypeList: [1],
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           type: this.filter.tagAdscription,
           tagName: this.filter.tagSysName.trim(),

+ 6 - 1
src/components/icss/LabelGroup.vue

@@ -141,6 +141,7 @@ export default {
     next(vm => {
       //const pm = to.param;
       Object.assign(vm, to.params);
+      vm.inCurrentPage=to.params.currentPage;
     })
   },
     methods: {
@@ -187,6 +188,10 @@ export default {
                 }
                 this.list = list;
                 this.total = res.data.data.total;
+                if(this.inCurrentPage!==undefined){
+                  this.currentPage=this.inCurrentPage;
+                  this.inCurrentPage = undefined;
+                }
             })
         },
         filterDatas() {
@@ -249,7 +254,7 @@ export default {
           };
             const param = {
                 tagTypeList: this.filter.tagType[0] && this.filter.tagType|| this.tagTypesList,
-                current: this.currentPage,
+                current: this.inCurrentPage||this.currentPage,
                 size: this.pageSize,
                 type: this.filter.tagAdscription,
                 tagName: this.filter.tagSysName.trim(),

+ 6 - 1
src/components/icss/PhysicalExamTemplate.vue

@@ -121,6 +121,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm, to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -180,6 +181,10 @@
             const data = res.data.data;
             this.list = data.records;
             this.total = data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           }
         }).catch((error) => {
           console.log(error);
@@ -195,7 +200,7 @@
         };
         const param = {
           deptId: this.filter.deptId,
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize
         };
         return param;

+ 6 - 1
src/components/icss/TemplateMaintenance.vue

@@ -191,6 +191,7 @@
               vm.filter.ownTo = flt.ownTo;
             });
         }
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -233,6 +234,10 @@
             }
             this.list = list;
             this.total = res.data.data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           }
         })
       },
@@ -294,7 +299,7 @@
           };
         };
         const param = {
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           type: this.filter.tagAdscription,
           moduleType:this.filter.templateType,