csx 5 years ago
parent
commit
b84e6e622c

+ 1 - 1
build/cdn.json View File

@@ -1,3 +1,3 @@
1 1
 {
2
-  "version": "1.0.93"
2
+  "version": "1.0.98"
3 3
 }

+ 2 - 2
src/pages/main/dialog/AssessmentDialog.vue View File

@@ -16,9 +16,9 @@
16 16
         </div>
17 17
 
18 18
 
19
-        <div class="item" v-if="isShow('干体重')&&this.$store.getters.user.template_info.template_id == 6">
19
+        <div class="item" v-if="isShow('干体重')&&this.$store.getters.user.template_info.template_id == 6" @click="showDryWeight">
20 20
           <h2 class="name">干体重(kg)</h2>
21
-          <div class="content" @click="showDryWeight">
21
+          <div class="content" >
22 22
             <input type="tel" @focus="inputFocus" v-model="formValue.dry_weight" disabled="disabled"/>
23 23
           </div>
24 24
         </div>

+ 1 - 1
src/pages/main/dialog/OrdersDialog.vue View File

@@ -79,7 +79,7 @@
79 79
                   <div class="txt">
80 80
                     <span>{{advice.advice_name }}</span>
81 81
                     <span v-if="advice.advice_desc">({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
82
-                    <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}})</span>
82
+                    <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
83 83
                     <span v-if="advice.single_dose && template_id != 6" >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
84 84
                     <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
85 85
                     <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>

+ 11 - 11
src/pages/main/dialog/subMenu/MsgTip.vue View File

@@ -14,56 +14,56 @@
14 14
           <label class="name" for="txms">本次透析日期</label>
15 15
           <div class="content">
16 16
             <span class="text" id="txms"> {{dialysis_date}}</span>
17
-            
17
+
18 18
           </div>
19 19
         </div>
20 20
         <div class="item">
21 21
           <label class="name" for="txms">透前体重(kg)</label>
22 22
           <div class="content">
23 23
             <span class="text" id="txms">{{predialysis.weight_before}}</span>
24
-            
24
+
25 25
           </div>
26 26
         </div>
27 27
         <div class="item">
28 28
           <label class="name" for="txms">干体重(kg)</label>
29 29
           <div class="content">
30 30
             <span class="text" id="txms">{{last_predialysis.dry_weight}}</span>
31
-            
31
+
32 32
           </div>
33 33
         </div>
34 34
         <div class="item">
35 35
           <label class="name" for="txms">衣物重(kg)</label>
36 36
           <div class="content">
37 37
             <span class="text" id="txms">{{predialysis.additional_weight}}</span>
38
-            
38
+
39 39
           </div>
40 40
         </div>
41 41
         <div class="item">
42 42
           <label class="name" for="txms">体重增加(kg)</label>
43 43
           <div class="content">
44 44
             <span class="text" id="txms">{{add_weight}}</span>
45
-            
45
+
46 46
           </div>
47 47
         </div>
48 48
         <div class="item">
49 49
           <label class="name" for="txms">透后体重(kg)</label>
50 50
           <div class="content">
51 51
             <span class="text" id="txms">{{record.weight_after}}</span>
52
-            
52
+
53 53
           </div>
54 54
         </div>
55 55
         <div class="item">
56 56
           <label class="name" for="txms">体重减少(kg)</label>
57 57
           <div class="content">
58 58
             <span class="text" id="txms">{{record.weight_loss}}</span>
59
-            
59
+
60 60
           </div>
61 61
         </div>
62 62
         <div class="item">
63 63
           <label class="name" for="txms">上次透后体重(kg)</label>
64 64
           <div class="content">
65 65
             <span class="text" id="txms">{{predialysis.weight_after_last_transparency}}</span>
66
-            
66
+
67 67
           </div>
68 68
         </div>
69 69
     </div>
@@ -74,10 +74,10 @@
74 74
   import {parseTime} from '@/utils'
75 75
 
76 76
   export default {
77
-    name: 'LongAdviceSubMenu',
77
+    name: 'MsgTip',
78 78
     created () {
79
-      if (predialysis.weight_before > 0 && predialysis.weight_after_last_transparency > 0) {
80
-        add_weight = parseFloat(predialysis.weight_before - predialysis.weight_after_last_transparency).toFixed(2)
79
+      if (this.predialysis&&this.predialysis.weight_before > 0 && this.predialysis.weight_after_last_transparency > 0) {
80
+        this.add_weight = parseFloat(this.predialysis.weight_before - this.predialysis.weight_after_last_transparency).toFixed(2)
81 81
       }
82 82
     },
83 83
     data () {

+ 1 - 1
src/pages/main/template/DialysisPrintOrderSix.vue View File

@@ -447,7 +447,7 @@
447 447
                           <span >{{advice.advice_name }}</span>
448 448
                           <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
449 449
                           <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
450
-                          <span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</span>
450
+                          <!--<span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</span>-->
451 451
                           <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
452 452
                           <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
453 453
                           <span v-if="advice.parent_id == 0 && advice.remark.length > 0" >({{advice.remark}})</span>

File diff suppressed because it is too large
+ 759 - 772
src/pages/main/today/TodayTab.vue