Bladeren bron

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

28169 7 maanden geleden
bovenliggende
commit
957d7f688f

+ 2 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_seventynine.vue Bestand weergeven

146
                   <tr>
146
                   <tr>
147
                     <td colspan="2">
147
                     <td colspan="2">
148
                       <div style="line-height:30px;">
148
                       <div style="line-height:30px;">
149
-                      <span>目标脱水量: {{ record.prescription.prescription_water ? record.prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
150
-                      <span>处方脱水量: {{ record.prescription.target_ultrafiltration ? record.prescription.target_ultrafiltration : "" }} </span>L &nbsp;&nbsp;
149
+                      <span>目标脱水量: {{ record.prescription.target_ultrafiltration ? record.prescription.target_ultrafiltration : "" }} </span>L &nbsp;&nbsp;
150
+                      <span>处方脱水量: {{ record.prescription.prescription_water ? record.prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
151
                       <span>透析液流量: {{ record.prescription.dialysate_flow ? record.prescription.dialysate_flow : "" }} </span>ml/h
151
                       <span>透析液流量: {{ record.prescription.dialysate_flow ? record.prescription.dialysate_flow : "" }} </span>ml/h
152
                       </div>
152
                       </div>
153
                     </td>
153
                     </td>

+ 2 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue Bestand weergeven

125
             <tr>
125
             <tr>
126
               <td colspan="2">
126
               <td colspan="2">
127
                 <div style="line-height:30px;">
127
                 <div style="line-height:30px;">
128
-                 <span>目标脱水量: {{ prescription.prescription_water ? prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
129
-                 <span>处方脱水量: {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }} </span>L &nbsp;&nbsp;
128
+                 <span>目标脱水量: {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }} </span>L &nbsp;&nbsp;
129
+                 <span>处方脱水量: {{ prescription.prescription_water  ? prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
130
                  <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} </span>ml/h
130
                  <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} </span>ml/h
131
                 </div>
131
                 </div>
132
               </td>
132
               </td>