Browse Source

修改bug相关

csx 5 years ago
parent
commit
0f1c2f772f

+ 1 - 1
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: '"http://api.xt.kuyicloud.com"'
4
+  BASE_API: '"http://api.xt.test.sgjyun.com"'
5
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
5
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
6
 }
6
 }

+ 2 - 2
src/pages/main/Print.vue View File

1100
                     <td width="70">
1100
                     <td width="70">
1101
                       <div class="under-line">&nbsp;{{afterdialysis.actual_ultrafiltration?afterdialysis.actual_ultrafiltration:''}}</div>
1101
                       <div class="under-line">&nbsp;{{afterdialysis.actual_ultrafiltration?afterdialysis.actual_ultrafiltration:''}}</div>
1102
                     </td>
1102
                     </td>
1103
-                    <td width="20">ml</td>
1103
+                    <td width="20">L</td>
1104
                     <td></td>
1104
                     <td></td>
1105
                     <td width="60">透后体重</td>
1105
                     <td width="60">透后体重</td>
1106
                     <td width="50">
1106
                     <td width="50">
2461
   .mainContent {
2461
   .mainContent {
2462
   margin: 0 0 0 1.58rem;
2462
   margin: 0 0 0 1.58rem;
2463
   }
2463
   }
2464
-</style>
2464
+</style>

+ 1 - 1
src/pages/main/PrintIndex.vue View File

1116
                     <td width="70">
1116
                     <td width="70">
1117
                       <div class="under-line">&nbsp;{{afterdialysis.actual_ultrafiltration?afterdialysis.actual_ultrafiltration:''}}</div>
1117
                       <div class="under-line">&nbsp;{{afterdialysis.actual_ultrafiltration?afterdialysis.actual_ultrafiltration:''}}</div>
1118
                     </td>
1118
                     </td>
1119
-                    <td width="20">ml</td>
1119
+                    <td width="20">L</td>
1120
                     <td></td>
1120
                     <td></td>
1121
                     <td width="60">透后体重</td>
1121
                     <td width="60">透后体重</td>
1122
                     <td width="50">
1122
                     <td width="50">

+ 9 - 6
src/pages/main/dialog/DoubleDialog.vue View File

60
           </div>
60
           </div>
61
         </div>
61
         </div>
62
 
62
 
63
+
64
+
63
         <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="130px">
65
         <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="130px">
64
 
66
 
65
           <p style="margin: 10px 0 10px 13px;" v-if="doubleReview.creater != 0">{{getFirstCheckDesc()}} </p>
67
           <p style="margin: 10px 0 10px 13px;" v-if="doubleReview.creater != 0">{{getFirstCheckDesc()}} </p>
119
         created_time: 0,
121
         created_time: 0,
120
         updated_time: 0,
122
         updated_time: 0,
121
         check_time:0,
123
         check_time:0,
124
+        first_check_time:0,
122
       },
125
       },
123
       check_time:new Date(),
126
       check_time:new Date(),
124
       check_time_str:'',
127
       check_time_str:'',
176
       this.doubleReview.updated_time = this.record.updated_time;
179
       this.doubleReview.updated_time = this.record.updated_time;
177
       this.doubleReview.modifier = this.record.modifier;
180
       this.doubleReview.modifier = this.record.modifier;
178
       this.doubleReview.check_time = this.record.check_time;
181
       this.doubleReview.check_time = this.record.check_time;
182
+      this.doubleReview.first_check_time = this.record.first_check_time;
179
 
183
 
180
     }
184
     }
181
 
185
 
200
       this.check_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}" +":00");
204
       this.check_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}" +":00");
201
     },
205
     },
202
     selectCheckTimeAction: function() {
206
     selectCheckTimeAction: function() {
203
-      if(this.record.modifier == 0) {
204
         this.$refs.start_time_picker.open();
207
         this.$refs.start_time_picker.open();
205
-      }
206
     },
208
     },
207
     checkInf: function() {},
209
     checkInf: function() {},
208
     // initData(doubleReview, patient, doctor) {
210
     // initData(doubleReview, patient, doctor) {
225
           return false;
227
           return false;
226
         } else {
228
         } else {
227
           Toast.success("提交成功");
229
           Toast.success("提交成功");
228
-          this.doubleReview.created_time =
229
-            response.data.data.doubleCheck.created_time;
230
+
230
           this.doubleReview.creater = response.data.data.doubleCheck.creater;
231
           this.doubleReview.creater = response.data.data.doubleCheck.creater;
231
           this.doubleReview.check_time =
232
           this.doubleReview.check_time =
232
             response.data.data.doubleCheck.check_time;
233
             response.data.data.doubleCheck.check_time;
234
+          this.doubleReview.first_check_time =
235
+            response.data.data.doubleCheck.first_check_time;
233
           this.doubleReview.modifier = response.data.data.doubleCheck.modifier;
236
           this.doubleReview.modifier = response.data.data.doubleCheck.modifier;
234
 
237
 
235
           for (const key in response.data.data.doubleCheck) {
238
           for (const key in response.data.data.doubleCheck) {
244
     },
247
     },
245
     getFirstCheckDesc: function() {
248
     getFirstCheckDesc: function() {
246
       let time = uParseTime(
249
       let time = uParseTime(
247
-        this.doubleReview.created_time,
250
+        this.doubleReview.first_check_time,
248
         "{y}-{m}-{d}  {h}:{i}"
251
         "{y}-{m}-{d}  {h}:{i}"
249
       );
252
       );
250
       if (this.doubleReview.creater <= 0) {
253
       if (this.doubleReview.creater <= 0) {
277
     getScondCheckDesc: function() {
280
     getScondCheckDesc: function() {
278
       let time = uParseTime(
281
       let time = uParseTime(
279
         this.doubleReview.check_time,
282
         this.doubleReview.check_time,
280
-        "{y}-{m}-{d} {h}:{i}"+":00"
283
+        "{y}-{m}-{d} {h}:{i}"
281
       );
284
       );
282
       if (this.doubleReview.modifier <= 0) {
285
       if (this.doubleReview.modifier <= 0) {
283
         return "";
286
         return "";

+ 1 - 1
src/pages/main/today/assessmentAfter.vue View File

17
         <li>
17
         <li>
18
           <label for="sjcll">实际超滤量: </label>
18
           <label for="sjcll">实际超滤量: </label>
19
           <span class="content" id="sjcll">{{actual_ultrafiltration?actual_ultrafiltration:''}}</span>
19
           <span class="content" id="sjcll">{{actual_ultrafiltration?actual_ultrafiltration:''}}</span>
20
-          <span class="unit">{{actual_ultrafiltration?"ml":''}}</span>
20
+          <span class="unit">{{actual_ultrafiltration?"L":''}}</span>
21
         </li>
21
         </li>
22
         <li>
22
         <li>
23
           <label for="nx">透析器凝血 : </label>
23
           <label for="nx">透析器凝血 : </label>

+ 29 - 4
src/pages/main/today/dialysisPrescription.vue View File

201
     },
201
     },
202
     kalium: function() {
202
     kalium: function() {
203
       var v = this.getValueStr("kalium", "kalium")
203
       var v = this.getValueStr("kalium", "kalium")
204
-      return v.length == 0 ? "0" : v
204
+      v = this.getFloat(v)
205
+      return v == 0 ? "0":v
205
     },
206
     },
206
     replacement_total:function(){
207
     replacement_total:function(){
207
       var v = this.getValueStr("replacement_total", "replacement_total")
208
       var v = this.getValueStr("replacement_total", "replacement_total")
239
     },
240
     },
240
     sodium: function() {
241
     sodium: function() {
241
       var v = this.getValueStr("sodium", "sodium")
242
       var v = this.getValueStr("sodium", "sodium")
242
-      return v.length == 0 ? "0" : v
243
+      console.log(v)
244
+      v = this.getFloat(v)
245
+      console.log(v)
246
+      return v == 0 ? "0":v
243
     },
247
     },
244
     glucose: function() {
248
     glucose: function() {
245
       var v = this.getValueStr("glucose", "glucose")
249
       var v = this.getValueStr("glucose", "glucose")
288
       return v.length == 0 ? "0" : v
292
       return v.length == 0 ? "0" : v
289
     },
293
     },
290
     calcium: function() {
294
     calcium: function() {
295
+
291
       var v = this.getValueStr("calcium", "calcium")
296
       var v = this.getValueStr("calcium", "calcium")
292
-      return v.length == 0 ? "0" : v
297
+      v = this.getFloat(v)
298
+      return v == 0 ? "0":v
299
+
300
+
293
     },
301
     },
294
     // dry_weight: function() {
302
     // dry_weight: function() {
295
     //   var v = this.getValueStr("dry_weight", "dry_weight")
303
     //   var v = this.getValueStr("dry_weight", "dry_weight")
385
         }
393
         }
386
         return this.solution[skey] + ""
394
         return this.solution[skey] + ""
387
       }
395
       }
388
-    },
396
+    }, getFloat: function(x) {
397
+      if (x != '.') {
398
+        var f = Math.round(x * 100) / 100;
399
+        var s = f.toString();
400
+        var rs = s.indexOf('.');
401
+        if (rs <= 0) {
402
+          rs = s.length;
403
+          s += '.';
404
+        }
405
+        while (s.length <= rs + 1) {
406
+          s += '0';
407
+        }
408
+        return s;
409
+      } else {
410
+        return '0.0';
411
+      }
412
+
413
+    }
389
   }
414
   }
390
 };
415
 };
391
 </script>
416
 </script>