Merge branch '20201014_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201014_pc_vue_new_branch

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -525,7 +525,7 @@ export default {
       console.log(val);
       this.$router.push({
         path: "/dialysis/details",
-        query: { patient_id: val.patient_id, date: val.sch_time_int }
+        query: { patient_id: val.patient_id, date: val.sch_time_int,mode_id:val.mode_id }
       });
     },
     handleSelectionChange(val) {
@@ -568,6 +568,7 @@ export default {
       }
       this.SchedualPatientsTableData = [];
       getSchedualPatient(this.listQuery).then(response => {
+        console.log("2222",response.data.data.schedule)
         if (response.data.state == 0) {
           this.loading = false;
           this.$message.error(response.data.msg);
@@ -582,14 +583,10 @@ export default {
                 bp: []
               };
 
-              SchedualPatientsTable["sch_id"] =
-                response.data.data.schedule[i].id;
-              SchedualPatientsTable["sch_time_int"] =
-                response.data.data.schedule[i].schedule_date;
-              SchedualPatientsTable["sch_time"] = parseTime(
-                response.data.data.schedule[i].schedule_date,
-                "{y}-{m}-{d}"
-              );
+              SchedualPatientsTable["sch_id"] = response.data.data.schedule[i].id;
+              SchedualPatientsTable["sch_time_int"] = response.data.data.schedule[i].schedule_date;
+              SchedualPatientsTable["sch_time"] = parseTime(response.data.data.schedule[i].schedule_date,"{y}-{m}-{d}");
+              SchedualPatientsTable["mode_id"] = response.data.data.schedule[i].mode_id
               SchedualPatientsTable["dialysis_no"] =
                 response.data.data.schedule[i].patient.dialysis_no;
               SchedualPatientsTable["name"] =
@@ -604,8 +601,7 @@ export default {
                 response.data.data.schedule[i].patient_id;
               SchedualPatientsTable["mode_name"] =
                 response.data.data.schedule[i].treatment_mode.name;
-              SchedualPatientsTable["target_ultrafiltration"] =
-                response.data.data.schedule[i].prescription.target_ultrafiltration;
+              SchedualPatientsTable["target_ultrafiltration"] = response.data.data.schedule[i].prescription.target_ultrafiltration;
               if (
                 response.data.data.schedule[i].assessment_before_dislysis.id > 0
               ) {
@@ -643,6 +639,7 @@ export default {
               }
 
               this.SchedualPatientsTableData.push(SchedualPatientsTable);
+              console.log("中国222222",this.SchedualPatientsTableData)
             }
           }
         }