Преглед изворни кода

Merge branch 'master' of http://git.shengws.com/csx/Vue_New

csx пре 5 година
родитељ
комит
c6349c5b49
1 измењених фајлова са 4 додато и 5 уклоњено
  1. 4 5
      src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

+ 4 - 5
src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue Прегледај датотеку

498
                   <td> {{ monitor.breathing_rate ? monitor.breathing_rate : "" }} </td>
498
                   <td> {{ monitor.breathing_rate ? monitor.breathing_rate : "" }} </td>
499
                   <td> {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }} </td>
499
                   <td> {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }} </td>
500
                   <td> {{ monitor.venous_pressure ? monitor.venous_pressure : "" }} </td>
500
                   <td> {{ monitor.venous_pressure ? monitor.venous_pressure : "" }} </td>
501
-                  <td v-if="dialysisOrder && (monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time )" > {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
502
-                  <td v-if="dialysisOrder && (monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time " > {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }} </td>
501
+                  <td v-if=" monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time " > {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
502
+                  <td v-if=" monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time " > {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }} </td>
503
                   <!--<td> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }} </td>-->
503
                   <!--<td> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }} </td>-->
504
                   <!--<td> {{ monitor.sodium_concentration ? monitor.sodium_concentration : ""  }} </td>-->
504
                   <!--<td> {{ monitor.sodium_concentration ? monitor.sodium_concentration : ""  }} </td>-->
505
-                  <td v-if="dialysisOrder && monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time " > {{  monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </td>
506
-                  <td v-if="dialysisOrder && monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time " > {{ monitor.ultrafiltration_volume  ? monitor.ultrafiltration_volume : 0 }} </td>
505
+                  <td v-if=" monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time " > {{  monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </td>
506
+                  <td v-if=" monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time " > {{ monitor.ultrafiltration_volume  ? monitor.ultrafiltration_volume : 0 }} </td>
507
                   <td v-if=" (prescription.mode_id == 2 || prescription.mode_id == 5) && monitor.operate_time > dialysisOrder.end_time " width="50" > {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }} </td>
507
                   <td v-if=" (prescription.mode_id == 2 || prescription.mode_id == 5) && monitor.operate_time > dialysisOrder.end_time " width="50" > {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }} </td>
508
                   <td v-if=" (prescription.mode_id == 2 || prescription.mode_id == 5) && monitor.operate_time <= dialysisOrder.end_time " width="50" > {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }} </td>
508
                   <td v-if=" (prescription.mode_id == 2 || prescription.mode_id == 5) && monitor.operate_time <= dialysisOrder.end_time " width="50" > {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }} </td>
509
                   <td> {{ monitor.heparin ? monitor.heparin : "" }} </td>
509
                   <td> {{ monitor.heparin ? monitor.heparin : "" }} </td>
1255
           return ''
1255
           return ''
1256
         }
1256
         }
1257
         if (id in this.operatorMaps) {
1257
         if (id in this.operatorMaps) {
1258
-          console.log(this.operatorMaps[id].url)
1259
           return this.operatorMaps[id].url
1258
           return this.operatorMaps[id].url
1260
         } else {
1259
         } else {
1261
           return ''
1260
           return ''