csx 4 years ago
parent
commit
9c89c4df14

+ 1 - 1
build/cdn.json View File

1
 {
1
 {
2
-  "version": "1.1.258"
2
+  "version": "1.1.335"
3
 }
3
 }

+ 2 - 2
config/prod.env.js View File

1
 "use strict";
1
 "use strict";
2
 module.exports = {
2
 module.exports = {
3
   NODE_ENV: '"production"',
3
   NODE_ENV: '"production"',
4
-  // BASE_API: '"https://api.xt.kuyicloud.com"'
4
+  BASE_API: '"https://api.xt.kuyicloud.com"'
5
 
5
 
6
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
6
+  // BASE_API: '"http://api.xt.test.sgjyun.com"'
7
   // http://api.xt.test.sgjyun.com
7
   // http://api.xt.test.sgjyun.com
8
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
8
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
9
 };
9
 };

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

531
       :predialysis="predialysis"
531
       :predialysis="predialysis"
532
       :last_predialysis="last_predialysis"
532
       :last_predialysis="last_predialysis"
533
       :record="record"
533
       :record="record"
534
+      :dry_weight="dry_weight"
534
       :last_record="last_record"
535
       :last_record="last_record"
535
       :patient_prop="patient"
536
       :patient_prop="patient"
536
       :prescription_prop="prescription_prop"
537
       :prescription_prop="prescription_prop"

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

27
       <div class="item">
27
       <div class="item">
28
         <label class="name" for="txms">干体重(kg)</label>
28
         <label class="name" for="txms">干体重(kg)</label>
29
         <div class="content">
29
         <div class="content">
30
-          <span class="text" id="txms">{{ last_predialysis.dry_weight }}</span>
30
+          <span class="text" id="txms">{{ getDryWeight() }}</span>
31
         </div>
31
         </div>
32
       </div>
32
       </div>
33
       <div class="item">
33
       <div class="item">
115
     },
115
     },
116
     prescription_prop: {
116
     prescription_prop: {
117
       type: Object
117
       type: Object
118
-    }
118
+    },dry_weight: {
119
+      type: Object
120
+    },
119
   },
121
   },
120
   computed: {
122
   computed: {
121
     dialysis_date: function() {
123
     dialysis_date: function() {
123
     }
125
     }
124
   },
126
   },
125
   methods: {
127
   methods: {
128
+    getDryWeight() {
129
+      if (this.dry_weight != null && this.dry_weight.id > 0) {
130
+        return this.dry_weight.dry_weight
131
+      } else {
132
+        if (this.last_predialysis != null && this.last_predialysis.id > 0) {
133
+          return this.last_predialysis.dry_weight
134
+        } else {
135
+          return ''
136
+        }
137
+      }
138
+    },
126
     getBeforeWeight(predialysis){
139
     getBeforeWeight(predialysis){
127
       if(predialysis.id > 0){
140
       if(predialysis.id > 0){
128
         if(predialysis.weight_before > 0) {
141
         if(predialysis.weight_before > 0) {