Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/main/add_urgent_schedule.vue

@@ -387,18 +387,10 @@
               this.zone_device_options = []
               this.origin_schedules = rs.data.data.schedules;
               this.patients = rs.data.data.patients;
-              console.log(this.patients)
               this.modes = rs.data.data.modes;
               this.origin_device_numbers = rs.data.data.device_numbers;
 
 
-              if (this.patients.length > 0) {
-                this.patient_id = this.patients[0].id;
-              }
-              if (this.modes.length > 0) {
-                this.mode_id = this.modes[0].id;
-              }
-
               var zone_device_map = {};
               for (
                 let index = 0;

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1289,7 +1289,7 @@
               this.zhiShow = true
               this.totalShow = true
               this.huShow  = true 
-              console.log("aa")
+              console.log("a")
             }
           }
         }

src/pages/main/dialog/subMenu/MsgTip.vue

@@ -78,7 +78,7 @@ export default {
       this.predialysis.weight_before > 0 &&
       this.last_record.weight_after > 0
     ) {
-      add_weight = parseFloat(
+      this.add_weight = parseFloat(
         this.predialysis.weight_before - this.last_record.weight_after
       ).toFixed(2);
     }

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -583,7 +583,7 @@
                   </div>
                   次/分
                 </div>
-                <div class="inline_block" style="margin-left:10px;flex:1;">
+                <div class="inline_block" style="margin-left:10px;flex:1.5;">
                   BP：
                   <div class="under_line" style="width: 50px;text-align: center;">
                     {{afterdialysis.systolic_blood_pressure?afterdialysis.systolic_blood_pressure:'/'}}
@@ -594,17 +594,28 @@
                   </div>
                   mmHg
                 </div>
+                <div class="inline_block" style="margin-left:10px;flex:1.5;">
+                  实际治疗时间：
+                  <div class="under_line" style="width: 20px;text-align: center">
+                    {{afterdialysis.actual_treatment_hour?afterdialysis.actual_treatment_hour:'/'}}
+                  </div>
+                  h
+                  <div class="under_line" style="width: 20px;text-align: center">
+                    {{afterdialysis.actual_treatment_minute?afterdialysis.actual_treatment_minute:0}}
+                  </div>
+                  min
+                </div>
               </div>
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                <div class="inline_block" style="flex:1;">
+                <div class="inline_block" style="flex:2;">
                   凝血程度：
-                  <div class="under_line" style="width: 100px;text-align: center">
+                  <div class="under_line" style="width: 200px;text-align: center">
                     {{afterdialysis.cruor?afterdialysis.cruor:'/'}}
                   </div>
                 </div>
-                <div class="inline_block" style="flex:1;">
+                <div class="inline_block" style="flex:2;">
                   内瘘：
-                  <div class="under_line" style="width: 70px;text-align: center">
+                  <div class="under_line" style="width: 200px;text-align: center">
                     {{afterdialysis.internal_fistula?afterdialysis.internal_fistula:'/'}}
                   </div>
                 </div>
@@ -614,17 +625,7 @@
                     {{afterdialysis.catheter?afterdialysis.catheter:'/'}}
                   </div>
                 </div>
-                <div class="inline_block" style="flex:1;">
-                  实际治疗时间：
-                  <div class="under_line" style="width: 20px;text-align: center">
-                    {{afterdialysis.actual_treatment_hour?afterdialysis.actual_treatment_hour:'/'}}
-                  </div>
-                  h
-                  <div class="under_line" style="width: 20px;text-align: center">
-                    {{afterdialysis.actual_treatment_minute?afterdialysis.actual_treatment_minute:0}}
-                  </div>
-                  min
-                </div>
+                
               </div>
 
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">