Selaa lähdekoodia

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

xiaoming_global 4 vuotta sitten
vanhempi
commit
6bbdf429b7

+ 0 - 8
src/pages/main/add_urgent_schedule.vue Näytä tiedosto

@@ -387,18 +387,10 @@
387 387
               this.zone_device_options = []
388 388
               this.origin_schedules = rs.data.data.schedules;
389 389
               this.patients = rs.data.data.patients;
390
-              console.log(this.patients)
391 390
               this.modes = rs.data.data.modes;
392 391
               this.origin_device_numbers = rs.data.data.device_numbers;
393 392
 
394 393
 
395
-              if (this.patients.length > 0) {
396
-                this.patient_id = this.patients[0].id;
397
-              }
398
-              if (this.modes.length > 0) {
399
-                this.mode_id = this.modes[0].id;
400
-              }
401
-
402 394
               var zone_device_map = {};
403 395
               for (
404 396
                 let index = 0;

+ 3 - 6
src/pages/main/dialog/modify_order/modify_order_form.vue Näytä tiedosto

@@ -110,11 +110,7 @@
110 110
 
111 111
             <div class="cell" v-show="order.parent_id == 0">
112 112
               <label>医嘱嘱托</label>
113
-              <input
114
-                class="inputBox"
115
-                style="width:100%"
116
-                v-model="order.remark"
117
-              />
113
+              <input class="inputBox" style="width:100%" v-model="order.remark" />
118 114
             </div>
119 115
             <!-- </div> -->
120 116
           </div>
@@ -252,7 +248,7 @@ export default {
252 248
   computed: {
253 249
     dialog_title: function() {
254 250
       if (this.mode == 1) {
255
-        return "修改医嘱";
251
+        return "修改子药";
256 252
       }
257 253
     }
258 254
   },
@@ -397,6 +393,7 @@ export default {
397 393
     float: left;
398 394
     width: 4.5rem;
399 395
     margin: 0.35rem 0.3rem 0.1rem 0.4rem;
396
+    padding-bottom: 3px;
400 397
     label {
401 398
       display: block;
402 399
       height: 0.9rem;

+ 4 - 16
src/pages/main/dialog/new_order/order_form.vue Näytä tiedosto

@@ -20,11 +20,7 @@
20 20
               <label>药品规格</label>
21 21
               <!--<input class="inputBox" style="width:62.5%" v-model="order.advice_desc">-->
22 22
 
23
-              <input
24
-                class="inputBox"
25
-                style="width:60%"
26
-                v-model="order.advice_desc"
27
-              />
23
+              <input class="inputBox" style="width:60%" v-model="order.advice_desc" />
28 24
               <input
29 25
                 type="text"
30 26
                 placeholder="单位"
@@ -57,12 +53,7 @@
57 53
 
58 54
             <div class="cell">
59 55
               <label>单次用量</label>
60
-              <input
61
-                type="number"
62
-                class="inputBox"
63
-                style="width:62.5%"
64
-                v-model="order.single_dose"
65
-              />
56
+              <input type="number" class="inputBox" style="width:62.5%" v-model="order.single_dose" />
66 57
               <input
67 58
                 type="text"
68 59
                 placeholder="单位"
@@ -98,11 +89,7 @@
98 89
 
99 90
             <div class="cell" v-show="order.parent_id == 0">
100 91
               <label>医嘱嘱托</label>
101
-              <input
102
-                class="inputBox"
103
-                style="width:100%"
104
-                v-model="order.remark"
105
-              />
92
+              <input class="inputBox" style="width:100%" v-model="order.remark" />
106 93
             </div>
107 94
           </div>
108 95
         </div>
@@ -443,6 +430,7 @@ export default {
443 430
     float: left;
444 431
     width: 4.5rem;
445 432
     margin: 0.35rem 0.3rem 0.1rem 0.4rem;
433
+    padding-bottom: 3px;
446 434
     label {
447 435
       display: block;
448 436
       height: 0.9rem;

+ 1 - 1
src/pages/main/dialog/subMenu/MsgTip.vue Näytä tiedosto

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

+ 17 - 16
src/pages/main/template/DialysisPrintOrderSix.vue Näytä tiedosto

@@ -583,7 +583,7 @@
583 583
                   </div>
584 584
                   次/分
585 585
                 </div>
586
-                <div class="inline_block" style="margin-left:10px;flex:1;">
586
+                <div class="inline_block" style="margin-left:10px;flex:1.5;">
587 587
                   BP:
588 588
                   <div class="under_line" style="width: 50px;text-align: center;">
589 589
                     {{afterdialysis.systolic_blood_pressure?afterdialysis.systolic_blood_pressure:'/'}}
@@ -594,17 +594,28 @@
594 594
                   </div>
595 595
                   mmHg
596 596
                 </div>
597
+                <div class="inline_block" style="margin-left:10px;flex:1.5;">
598
+                  实际治疗时间:
599
+                  <div class="under_line" style="width: 20px;text-align: center">
600
+                    {{afterdialysis.actual_treatment_hour?afterdialysis.actual_treatment_hour:'/'}}
601
+                  </div>
602
+                  h
603
+                  <div class="under_line" style="width: 20px;text-align: center">
604
+                    {{afterdialysis.actual_treatment_minute?afterdialysis.actual_treatment_minute:0}}
605
+                  </div>
606
+                  min
607
+                </div>
597 608
               </div>
598 609
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
599
-                <div class="inline_block" style="flex:1;">
610
+                <div class="inline_block" style="flex:2;">
600 611
                   凝血程度:
601
-                  <div class="under_line" style="width: 100px;text-align: center">
612
+                  <div class="under_line" style="width: 200px;text-align: center">
602 613
                     {{afterdialysis.cruor?afterdialysis.cruor:'/'}}
603 614
                   </div>
604 615
                 </div>
605
-                <div class="inline_block" style="flex:1;">
616
+                <div class="inline_block" style="flex:2;">
606 617
                   内瘘:
607
-                  <div class="under_line" style="width: 70px;text-align: center">
618
+                  <div class="under_line" style="width: 200px;text-align: center">
608 619
                     {{afterdialysis.internal_fistula?afterdialysis.internal_fistula:'/'}}
609 620
                   </div>
610 621
                 </div>
@@ -614,17 +625,7 @@
614 625
                     {{afterdialysis.catheter?afterdialysis.catheter:'/'}}
615 626
                   </div>
616 627
                 </div>
617
-                <div class="inline_block" style="flex:1;">
618
-                  实际治疗时间:
619
-                  <div class="under_line" style="width: 20px;text-align: center">
620
-                    {{afterdialysis.actual_treatment_hour?afterdialysis.actual_treatment_hour:'/'}}
621
-                  </div>
622
-                  h
623
-                  <div class="under_line" style="width: 20px;text-align: center">
624
-                    {{afterdialysis.actual_treatment_minute?afterdialysis.actual_treatment_minute:0}}
625
-                  </div>
626
-                  min
627
-                </div>
628
+                
628 629
               </div>
629 630
 
630 631
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">