Преглед на файлове

Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

28169 преди 1 седмица
родител
ревизия
0669d90770
променени са 2 файла, в които са добавени 1036 реда и са изтрити 1029 реда
  1. 13 6
      src/pages/main/template/DialysisPrintOrderThirtyOne.vue
  2. 1023 1023
      src/pages/main/template/DialysisPrintOrdereightyone.vue

+ 13 - 6
src/pages/main/template/DialysisPrintOrderThirtyOne.vue Целия файл

@@ -350,6 +350,13 @@
350 350
           <div class="inline_block under_line" style="width:100px;text-align: center;">
351 351
             {{ receiverTreatmentAccess.precaution ? receiverTreatmentAccess.precaution : '' }}
352 352
           </div> -->
353
+          <div v-if="org_id==10727||org_id==0" style="display: inline-block;width: 250px;">
354
+            换药护士
355
+            <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
356
+              <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.change_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.change_nurse)}}</span>
357
+              <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.change_nurse)" alt="" srcset="" v-else>
358
+            </div>
359
+          </div>
353 360
         </div>
354 361
         <div class="row">
355 362
           上机医生
@@ -451,8 +458,6 @@
451 458
                 <td width="40">UF/hr</td>
452 459
                 <td width="200">病情变化处理方式及结果</td>
453 460
               </tr>
454
-
455
-
456 461
               <tr v-for="monitor in monitors" :key="monitor.id">
457 462
                 <td style="height:40px;line-height:40px">&nbsp;
458 463
                   {{getTime(monitor.operate_time,'{h}:{i}')}}
@@ -463,12 +468,12 @@
463 468
                 <td>&nbsp;{{monitor.pulse_frequency?monitor.pulse_frequency:''}}</td>
464 469
                 <td>&nbsp;{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
465 470
                 <td>&nbsp;{{monitor.venous_pressure?monitor.venous_pressure:''}}/{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}</td>
466
-                <td>&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
471
+                <td>&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:'0'}}</td>
467 472
                 <td>&nbsp;{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:''}}</td>
468 473
                 <td>&nbsp;{{monitor.conductivity?monitor.conductivity:''}}</td>
469 474
                 <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
470 475
                 <!-- <td>&nbsp; <span v-if="monitor.operate_time"> {{ monitor.dialysate_flow ? monitor.dialysate_flow : "" }} </span></td> -->
471
-                <td>&nbsp;{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
476
+                <td>&nbsp;{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:'0'}}</td>
472 477
                 <td>
473 478
                   <span v-if="monitor.symptom"> {{ monitor.symptom }} </span>
474 479
                   <span v-if="monitor.dispose"> {{ "  " + monitor.dispose }} </span>
@@ -520,7 +525,7 @@
520 525
                       <td width="60" style="text-align:left;border:none;">
521 526
                         <div>
522 527
                           <span class="under_line" style="width:50px;display:inline-block">
523
-                            {{ afterdialysis.actual_displacement ? afterdialysis.actual_displacement : "" }}
528
+                            {{ afterdialysis.actual_displacement ? afterdialysis.actual_displacement : "/" }}
524 529
                           </span>L
525 530
                         </div>
526 531
                       </td>
@@ -576,7 +581,7 @@
576 581
                       <td width="70" style="text-align:left;border:none;">
577 582
                         <div>
578 583
                           <span class="under_line" style="width:50px;display:inline-block">
579
-                            {{ afterdialysis.is_eat == 1 && afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '' }}
584
+                            {{ afterdialysis.is_eat == 1 && afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '/' }}
580 585
                           </span>g
581 586
                         </div>
582 587
                       </td>
@@ -847,6 +852,7 @@ export default {
847 852
       displaceLiquiPartOptions: [],
848 853
       arterial_tube:[],
849 854
       intravenous_tube:[],
855
+      org_id:''
850 856
     }
851 857
   },
852 858
   methods: {
@@ -1680,6 +1686,7 @@ export default {
1680 1686
     }
1681 1687
   },
1682 1688
   created () {
1689
+    this.org_id = this.$store.getters.user.org.id
1683 1690
     var xtuser = this.$store.getters.user
1684 1691
     this.orgname = xtuser.org.org_name
1685 1692
     // this.orgname = "遂溪方济医院";

Файловите разлики са ограничени, защото са твърде много
+ 1023 - 1023
src/pages/main/template/DialysisPrintOrdereightyone.vue