Selaa lähdekoodia

修改上次透后体重

csx 4 vuotta sitten
vanhempi
commit
20c85b2c8d

+ 1 - 1
build/cdn.json Näytä tiedosto

@@ -1,3 +1,3 @@
1 1
 {
2
-  "version": "1.1.257"
2
+  "version": "1.1.258"
3 3
 }

+ 2 - 2
config/prod.env.js Näytä tiedosto

@@ -1,9 +1,9 @@
1 1
 "use strict";
2 2
 module.exports = {
3 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 7
   // http://api.xt.test.sgjyun.com
8 8
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
9 9
 };

+ 5 - 1
src/pages/main/dialog/PrescriptionDialog.vue Näytä tiedosto

@@ -384,7 +384,9 @@
384 384
             v-if="isShow('置换液')"
385 385
             v-show="huShow"
386 386
           >
387
-            <label class="name" for="knj">置换液</label>
387
+            <label class="name" for="knj" v-if="this.$store.getters.user.template_info.template_id != 6">置换液</label>
388
+            <label class="name" for="knj" v-if="this.$store.getters.user.template_info.template_id == 6">置换方式</label>
389
+
388 390
             <div class="content">
389 391
               <span
390 392
                 class="text"
@@ -394,6 +396,8 @@
394 396
             </div>
395 397
           </div>
396 398
 
399
+
400
+
397 401
           <div class="item" v-if="isShow('置换液总量')" v-show="totalShow">
398 402
             <label class="name" for="knj">置换液总量(L)</label>
399 403
             <div class="content">

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

@@ -60,7 +60,7 @@
60 60
         <label class="name" for="txms">上次透后体重(kg)</label>
61 61
         <div class="content">
62 62
           <span class="text" id="txms">{{
63
-            last_record.weight_after
63
+           getLastAfterWeight(last_record)
64 64
           }}</span>
65 65
         </div>
66 66
       </div>
@@ -93,7 +93,9 @@ export default {
93 93
   },
94 94
   props: {
95 95
     predialysis: {
96
-      type: Object
96
+      type: Object,
97
+      default: null
98
+
97 99
     },
98 100
     visibility: {
99 101
       type: Boolean,
@@ -137,6 +139,19 @@ export default {
137 139
           return ''
138 140
         }
139 141
       }
142
+    },getLastAfterWeight(record){
143
+
144
+      if(record.id > 0){
145
+        if(record.weight_after > 0) {
146
+          let additional_weight = 0
147
+          if(this.predialysis.additional_weight != undefined){
148
+            additional_weight = this.predialysis.additional_weight
149
+          }
150
+          return parseFloat(record.weight_after - additional_weight).toFixed(1);
151
+        }else{
152
+          return ''
153
+        }
154
+      }
140 155
     },
141 156
     cancle: function() {
142 157
       this.$emit("menu-msg-tip");

+ 7 - 7
src/pages/main/today/dialysisPrescription.vue Näytä tiedosto

@@ -11,10 +11,7 @@
11 11
           <label>透析模式 :</label>
12 12
           <span class="content">{{dialysis_mode}}</span>
13 13
         </li>
14
-        <li v-if="isShow('透析模式')">
15
-          <label>透析模式 :</label>
16
-          <span class="content">{{dialysis_mode}}</span>
17
-        </li>
14
+
18 15
         <li v-if="isShow('目标超滤量')">
19 16
           <label>目标超滤量 :</label>
20 17
           <span class="content">{{target_ultrafiltration != '0'?target_ultrafiltration:''}}</span>
@@ -183,8 +180,8 @@
183 180
 
184 181
         <li v-if="isShow('置换液总量')">
185 182
           <label>置换液总量: </label>
186
-          <span class="content">{{this.prescription.displace_liqui_value ? this.prescription.displace_liqui_value:''}}</span>
187
-          <span class="unit">{{this.prescription.displace_liqui_value?"L":""}}</span>
183
+          <span class="content">{{getDisplaceLiquiValue() != '0'? getDisplaceLiquiValue():''}}</span>
184
+          <span class="unit">{{getDisplaceLiquiValue() !='0'?"L":""}}</span>
188 185
 
189 186
         </li>
190 187
 
@@ -429,7 +426,7 @@
429 426
             displace_liqui_part = displace_liqui[i].name
430 427
           }
431 428
         }
432
-        return displace_liqui_part + displace_liqui_value + 'L'
429
+        return displace_liqui_part
433 430
       },
434 431
       ultrafiltration: function () {
435 432
         var v = this.getValueStr('ultrafiltration', 'ultrafiltration')
@@ -456,6 +453,9 @@
456 453
       }
457 454
     },
458 455
     methods: {
456
+      getDisplaceLiquiValue:function(){
457
+        return this.getValueStr('displace_liqui_value', 'displace_liqui_value')
458
+      },
459 459
       isShow (name) {
460 460
         var filedList = this.$store.getters.user.fileds
461 461
         for (let i = 0; i < filedList.length; i++) {