Explorar el Código

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

csx hace 4 años
padre
commit
2c142c8e51

+ 1 - 1
build/cdn.json Ver fichero

@@ -1,3 +1,3 @@
1 1
 {
2
-  "version": "1.1.107"
2
+  "version": "1.1.124"
3 3
 }

+ 2 - 2
config/dev.env.js Ver fichero

@@ -4,9 +4,9 @@ const prodEnv = require('./prod.env')
4 4
 
5 5
 module.exports = merge(prodEnv, {
6 6
   NODE_ENV: '"development"',
7
-  BASE_API: '"https://api.xt.kuyicloud.com"'
7
+  // BASE_API: '"https://api.xt.kuyicloud.com"'
8 8
 
9
-  // BASE_API: '"http://api.xt.test.sgjyun.com"'
9
+  BASE_API: '"http://api.xt.test.sgjyun.com"'
10 10
    //http://api.xt.test.sgjyun.com http://localhost:9529
11 11
    // BASE_API: '"http://api.xt.test.sgjyun.com"'
12 12
   // BASE_API: '"https://api.xt.kuyicloud.com"'

+ 1 - 3
src/pages/main/dialog/PlaneDialog.vue Ver fichero

@@ -15,9 +15,7 @@
15 15
         <span
16 16
           class="success"
17 17
           @click="modify()"
18
-          v-if="
19
-            isPremission || this.$store.getters.user.user.id == this.creator
20
-          "
18
+          v-if="isPremission || this.$store.getters.user.user.id == this.creator"
21 19
           >修改</span
22 20
         >
23 21
       </div>

+ 4 - 0
src/pages/main/dialog/modify_order/modify_order_form.vue Ver fichero

@@ -368,6 +368,10 @@ export default {
368 368
     },
369 369
     didSelectDeliveryWay: function(index) {
370 370
       this.didCloseSingleOptionDialog();
371
+      if (index == -1) {
372
+        this.order.delivery_way = "";
373
+        return;
374
+      }
371 375
       this.order.delivery_way = this.delivery_way_options[index].name;
372 376
     },
373 377
     selectExecFrequencyAction: function() {

+ 11 - 3
src/pages/main/template/DialysisPrintOrderOne.vue Ver fichero

@@ -569,8 +569,10 @@
569 569
               <td>&nbsp;{{monitor.pulse_frequency?monitor.pulse_frequency:''}}</td>
570 570
               <td>&nbsp;{{monitor.breathing_rate?monitor.breathing_rate:''}}</td>
571 571
               <td>&nbsp;{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
572
-              <td>&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
573
-              <td>&nbsp;{{monitor.displacement_quantity?monitor.displacement_quantity:''}}</td>
572
+              <td v-if="isShowZero && monitor.operate_time">&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:0}}</td>
573
+              <td v-else>&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
574
+              <td v-if="isShowZero && monitor.operate_time">&nbsp;{{monitor.displacement_quantity?monitor.displacement_quantity:0}}</td>
575
+              <td v-else>&nbsp;{{monitor.displacement_quantity?monitor.displacement_quantity:''}}</td>
574 576
               <td>&nbsp;{{monitor.venous_pressure?monitor.venous_pressure:''}}</td>
575 577
               <td>&nbsp;{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:''}}</td>
576 578
               <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
@@ -606,7 +608,7 @@
606 608
                     <td width="70">
607 609
                       <div class="under-line">&nbsp;{{afterdialysis.actual_ultrafiltration?afterdialysis.actual_ultrafiltration:''}}</div>
608 610
                     </td>
609
-                    <td width="20">ml</td>
611
+                    <td width="20">L</td>
610 612
                     <td></td>
611 613
                     <td width="60">透后体重</td>
612 614
                     <td width="50">
@@ -1092,6 +1094,7 @@
1092 1094
         summary: {},
1093 1095
         receiverTreatmentAccess: {},
1094 1096
         org_template_info: {},
1097
+        isShowZero: false,
1095 1098
 
1096 1099
         doctor_advices: [],
1097 1100
         advice_groups: [],
@@ -1353,6 +1356,11 @@
1353 1356
             this.advices = response.data.data.advices;
1354 1357
             this.monitors = response.data.data.monitors;
1355 1358
             this.summary = response.data.data.summary;
1359
+            this.org_template_info = response.data.data.org_template_info
1360
+            // 配置超滤量和置换量是否要显示0还是空
1361
+            if(this.org_template_info.org_id == 9535){
1362
+              this.isShowZero = true
1363
+            }
1356 1364
 
1357 1365
             if (this.monitors.length < 8) {
1358 1366
               var nl = 8 - this.monitors.length;

+ 5 - 5
src/pages/main/template/DialysisPrintOrderSix.vue Ver fichero

@@ -371,11 +371,11 @@
371 371
                     <div v-if="prescription.anticoagulant != 1"  class="under_line" style="width: 50px;text-align: center;">
372 372
                       {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"0"}}
373 373
                     </div>
374
-                    <span v-if="prescription.anticoagulant == 5">ml</span>
375
-                    <span v-if="prescription.anticoagulant == 4">mg</span>
376
-                    <span v-if="prescription.anticoagulant == 3">iu</span>
377
-                    <span v-if="prescription.anticoagulant == 2">iu</span>
378
-                    <span v-if="prescription.anticoagulant == 1">mg</span>
374
+                    <span v-if="prescription.anticoagulant == 5">ml/h</span>
375
+                    <span v-if="prescription.anticoagulant == 4">mg/h</span>
376
+                    <span v-if="prescription.anticoagulant == 3">iu/h</span>
377
+                    <span v-if="prescription.anticoagulant == 2">iu/h</span>
378
+                    <span v-if="prescription.anticoagulant == 1">mg/h</span>
379 379
                   </div>
380 380
 
381 381
                   <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant == 5">

+ 5 - 5
src/pages/main/today/dialysisPrescription.vue Ver fichero

@@ -103,11 +103,11 @@
103 103
         <li v-if="isShow('维持')">
104 104
           <label>维持 : </label>
105 105
           <span class="content">{{anticoagulant_weichi != '0'?anticoagulant_weichi:""}}</span>
106
-          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_weichi != '0'?"iu":""}}</span>
107
-          <span class="unit" v-if="this.prescription.anticoagulant == 3">{{anticoagulant_weichi != '0'?"iu":""}}</span>
108
-          <span class="unit" v-if="this.prescription.anticoagulant == 1">{{anticoagulant_weichi != '0'?"mg":""}}</span>
109
-          <span class="unit" v-if="this.prescription.anticoagulant == 4">{{anticoagulant_weichi != '0'?"mg":""}}</span>
110
-          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_weichi != '0'?"ml":""}}</span>
106
+          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_weichi != '0'?"iu/h":""}}</span>
107
+          <span class="unit" v-if="this.prescription.anticoagulant == 3">{{anticoagulant_weichi != '0'?"iu/h":""}}</span>
108
+          <span class="unit" v-if="this.prescription.anticoagulant == 1">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
109
+          <span class="unit" v-if="this.prescription.anticoagulant == 4">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
110
+          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_weichi != '0'?"ml/h":""}}</span>
111 111
         </li>
112 112
 
113 113
         <li v-if="isShow('总量')&&this.prescription.anticoagulant != 5">

+ 16 - 1
src/store/modules/globalConfig.js Ver fichero

@@ -408,7 +408,7 @@ const global_config = {
408 408
       },
409 409
       5: {
410 410
         id: 5,
411
-        name: '枸橼酸钠',
411
+        name: '4%枸橼酸钠',
412 412
         type: 1,
413 413
         shouji: -1,
414 414
         weichi: 1,
@@ -421,6 +421,21 @@ const global_config = {
421 421
         gaimingcheng_unit: 'ml/h',
422 422
         gaijiliang_unit: ''
423 423
       },
424
+      // 6: {
425
+      //   id: 6,
426
+      //   name: '3%枸橼酸钠',
427
+      //   type: 1,
428
+      //   shouji: -1,
429
+      //   weichi: 1,
430
+      //   zongliang: -1,
431
+      //   gaimingcheng: 1,
432
+      //   gaijiliang: 1,
433
+      //   shouji_unit: '',
434
+      //   weichi_unit: 'ml/h',
435
+      //   zongliang_unit: '',
436
+      //   gaimingcheng_unit: 'ml/h',
437
+      //   gaijiliang_unit: ''
438
+      // }
424 439
     },
425 440
     anticoagulants_set: {
426 441
       type: 2,