Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/pages/main/DetailsPage.vue

@@ -172,11 +172,6 @@ export default {
       this.$router.push("/mypatients/" + patient_id);
     }
   },
-  beforeRouteUpdate(to, from, next) {
-    console.log(1111111111111111111111111111)
-    console.log(to,from);    //345,123
-    next();
-  },
   watch: {
     clientHeight(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
@@ -192,9 +187,22 @@ export default {
           that.mediaMatches();
         }, 400);
       }
-    }
+    },
   },
-  
+  beforeRouteUpdate(to, from){
+    console.log(to.active2)
+    if(to.query.active1 == "2" && to.active2 == undefined){
+      this.index = parseInt(to.query.active1)
+      var patient_id = to.query.patient_id;
+    var date = to.query.date;
+    var patient_name = to.query.patient_name;
+    this.patient_id = patient_id;
+    this.date = date;
+    this.patient_name = patient_name;
+    this.GetPatientInfoWithDiseases(this.patient_id);
+    }
+    console.log(from)
+  }
 };
 </script>
 

src/pages/main/dialysis/DialysisTab.vue

@@ -20,7 +20,7 @@
 
     <div class="tab-content">
       <long-table v-show="index == 0" title="长期透析处方"></long-table>
-      <record-table v-show="index == 1" title="透析记录" @change="changeIndex"></record-table>
+      <record-table v-show="index == 1" title="透析记录"></record-table>
       <schedul-table v-show="index == 2" class="排班信息"></schedul-table>
       <mission-table v-show="index == 3" class="宣教信息"></mission-table>
     </div>
@@ -66,9 +66,6 @@ export default {
   methods: {
     ClickTab: function(tabIndex) {
       this.index = tabIndex;
-    },
-    changeIndex(index){
-      this.$emit("a",index)
     }
   },
   mounted(){

src/pages/main/dialysis/RecordTable.vue

@@ -924,7 +924,9 @@ export default {
       })
     },
     toToday(){
-      this.$emit("change",1)
+      this.$router.push(
+        '/details?patient_id=' + 1064 + '&date=' + 1590508800 + '&patient_name=' + '黄晓' + '&active1=' + 2 
+      )
     }
   },
   created() {