预问诊，诊断依据数据维护翻页bug修改2739

src/components/diagBase/DiagBase.vue

@@ -135,6 +135,7 @@ export default {
   beforeRouteEnter(to, from, next) {
     next(vm => {
       Object.assign(vm, to.params);
+      vm.inCurrentPage=to.params.currentPage;
     })
   },
     methods: {
@@ -158,6 +159,10 @@ export default {
             api.diagBasePage(param).then((res) => {
                 this.list = res.data.data.records
                 this.total = res.data.data.total;
+              if(this.inCurrentPage!==undefined){
+                this.currentPage=this.inCurrentPage;
+                this.inCurrentPage = undefined;
+              }
             })
         },
         filterDatas() {
@@ -243,7 +248,7 @@ export default {
               this.clearFilter();
             };
             const param = {
-                current: this.currentPage,
+                current: this.inCurrentPage||this.currentPage,
                 size: this.pageSize,
                 disName: this.filter.disName.trim(),
                 modifier: this.filter.modifier, //操作人

src/components/diagBase/QuestionWords.vue

@@ -126,6 +126,7 @@ export default {
     next(vm => {
       //const pm = to.param;
       Object.assign(vm, to.params);
+      vm.inCurrentPage=to.params.currentPage;
     })
   },
     methods: {
@@ -170,6 +171,10 @@ export default {
                 }
                 this.list = list;
                 this.total = res.data.data.total;
+              if(this.inCurrentPage!==undefined){
+                this.currentPage=this.inCurrentPage;
+                this.inCurrentPage = undefined;
+              }
             })
         },
         filterDatas() {
@@ -192,7 +197,7 @@ export default {
         },
         getFilterItems() {
             const param = {
-                current: this.currentPage,
+                current: this.inCurrentPage||this.currentPage,
                 size: this.pageSize,
                 disName: this.filter.disName.trim(),
                 questionCode: this.filter.questionName.trim(),

src/components/preTreat/CombinQuestion.vue

@@ -137,6 +137,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm,to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -176,6 +177,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 @@
         };
         let param = {
           tagTypeList: this.filter.tagType[0] ? this.filter.tagType: [4,6],
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           callType:2,
           size: this.pageSize,
           type: this.filter.tagAdscription,

src/components/preTreat/QuestionModules.vue

@@ -137,6 +137,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm,to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -189,6 +190,10 @@
             }
             this.list = list;
             this.total = res.data.data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           }else{
             this.$message({
               message: res.data.msg,
@@ -247,7 +252,7 @@
           type:this.filter.type,
           moduleType: this.filter.moduleType,
           relationId: this.filter.moduleType==1?this.filter.relationId:'',
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
         };
         return param;

src/components/preTreat/SimpleQuestion.vue

@@ -147,6 +147,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm,to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -186,6 +187,10 @@
           }
           this.list = list;
           this.total = res.data.data.total;
+          if(this.inCurrentPage!==undefined){
+            this.currentPage=this.inCurrentPage;
+            this.inCurrentPage = undefined;
+          }
         })
       },
       filterDatas() {
@@ -264,7 +269,7 @@
         const param = {
           tagTypeList: [1],
           callType:1,
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           type: this.filter.tagAdscription,
           tagName: this.filter.tagSysName.trim(),