返回后带参数

src/components/basicKnow/AddTerm.vue

@@ -799,9 +799,15 @@ export default {
           this.warning('年龄最小值应该小于最大值');
           return;
         }
-        if(this.minValue&&this.maxValue&&this.minValue >= this.maxValue&&this.data.type=='实验室检查子项目'){
-          this.warning('最小值应该小于最大值');
-          return;
+        if(this.data.type=='实验室检查子项目'){
+          if(this.minValue<0||this.minValue>99999||this.maxValue<0||this.maxValue>99999){
+            this.warning('取值范围必须是0-99999');
+            return;
+          }
+          if(this.minValue&&this.maxValue&&this.minValue >= this.maxValue){
+            this.warning('最小值应该小于最大值');
+            return;
+          }
         }
       }
       // 过滤同义词空数据

src/components/basicKnow/BasicTermsMaintenance.vue

@@ -124,14 +124,16 @@ export default {
     };
   },
   created() {
-    // this.getDataList();
+    const param = this.$route.params;
+    if(param.currentPage){
+      this.inCurrentPage = param.currentPage
+      this.filter = param.filter
+    }
+    
     this.getTypeList();
-    const that = this;
     //返回时避免参数未赋值就获取列表
-    setTimeout(function() {
-    });
     this.$nextTick(()=>{
-      that.getDataList();
+      this.getDataList();
     })
   },
   watch: {
@@ -142,13 +144,13 @@ export default {
       deep: true
     }
   },
-  beforeRouteEnter(to, from, next) {
-    next(vm => {
-      //const pm = to.param;
-      Object.assign(vm, to.params);
-      vm.inCurrentPage = to.params.currentPage;
-    });
-  },
+  // beforeRouteEnter(to, from, next) {
+  //   next(vm => {
+  //     //const pm = to.param;
+  //     Object.assign(vm, to.params);
+  //     vm.inCurrentPage = to.params.currentPage;
+  //   });
+  // },
   methods: {
     handleSizeChange(val) {
       this.pageSize = val;
@@ -325,8 +327,7 @@ export default {
               } else {
                 if (this.filter.isState !== '' && this.list.length === 1) {
                   //有启用状态筛选条件且当前页只有最后一条数据删除时，删除成功后跳转到前一页
-                  this.currentPage =
-                    this.currentPage === 1 ? 1 : this.currentPage - 1;
+                  this.currentPage = this.currentPage === 1 ? 1 : this.currentPage - 1;
                 }
               }
               this.warning(res.data.msg || '操作成功', 'success');

src/components/knowledgeExtra/AboutDisease.vue

@@ -89,12 +89,15 @@
       }
     },
     created() {
-      const that = this;
+      const param = this.$route.params;
+      if(param.currentPage){
+        this.inCurrentPage = param.currentPage
+        this.filter = param.filter
+      }
       //返回时避免参数未赋值就获取列表
-      setTimeout(function(){
-        that.getDataList();
+      this.$nextTick(()=>{
+        this.getDataList();
       });
-      // this.getTypeList();
     },
     watch: {
       'filter': {
@@ -104,13 +107,13 @@
         deep: true
       }
     },
-    beforeRouteEnter(to, from, next){
-      next(vm => {
-        //const pm = to.param;
-        Object.assign(vm,to.params);
-        vm.inCurrentPage=to.params.currentPage;
-      })
-    },
+    // beforeRouteEnter(to, from, next){
+    //   next(vm => {
+    //     //const pm = to.param;
+    //     Object.assign(vm,to.params);
+    //     vm.inCurrentPage=to.params.currentPage;
+    //   })
+    // },
     methods: {
       handleSizeChange(val){
         this.pageSize = val;

src/components/knowledgeExtra/RuleManager.vue

@@ -180,6 +180,11 @@
             }
         },
         created() {
+            const param = this.$route.params;
+            if(param.currentPage){
+                this.inCurrentPage = param.currentPage
+                this.filter = param.filter
+            }
             this.getTypeList();
             const that = this;
             //返回时避免参数未赋值就获取列表
@@ -196,13 +201,13 @@
                 deep: true
             }
         },
-        beforeRouteEnter(to, from, next) {
-            next(vm => {
-                //const pm = to.param;
-                Object.assign(vm, to.params);
-                vm.inCurrentPage=to.params.currentPage;
-            })
-        },
+        // beforeRouteEnter(to, from, next) {
+        //     next(vm => {
+        //         //const pm = to.param;
+        //         Object.assign(vm, to.params);
+        //         vm.inCurrentPage=to.params.currentPage;
+        //     })
+        // },
         methods: {
             getDict(){
                 api.zskgetDict().then((res) => {

src/components/knowledgeExtra/StaticInfo.vue

@@ -126,13 +126,16 @@
       }
     },
     created() {
+      const param = this.$route.params;
+      if(param.currentPage){
+        this.inCurrentPage = param.currentPage
+        this.filter = param.filter
+      }
       //返回时避免参数未赋值就获取列表
-      setTimeout(()=>{
+      this.$nextTick(()=>{
         this.getDataList();
         this.getListBack();
       });
-      // const enums = JSON.parse(localStorage.getItem('knowledgeEnumsData'));
-      // this.typeList = enums.conceptDetailLexiconTypeEnum;
     },
     watch: {
       'filter': {
@@ -142,13 +145,13 @@
         deep: true
       }
     },
-    beforeRouteEnter(to, from, next){
-      next(vm => {
-        //const pm = to.param;
-        Object.assign(vm,to.params);
-        vm.inCurrentPage=to.params.currentPage;
-      })
-    },
+    // beforeRouteEnter(to, from, next){
+    //   next(vm => {
+    //     //const pm = to.param;
+    //     Object.assign(vm,to.params);
+    //     vm.inCurrentPage=to.params.currentPage;
+    //   })
+    // },
     methods: {
       handleSizeChange(val){
         this.pageSize = val;