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

src/xt_pages/dialysis/batch_print/batch_print_order_seventytwo.vue

@@ -1189,7 +1189,7 @@
                           <div style="flex: 0.9;border-right: 1px solid black;">跨膜压<br/>(mmHg)</div>
                           <div style="flex: 0.9;border-right: 1px solid black;">钠浓度<br/>(mmol/L)</div>
                           <div style="flex: 0.9;border-right: 1px solid black;">超滤量<br/>(ml)</div>
-                          <div style="flex: 1;border-right: 1px solid black;" v-if="record.prescription.mode_id == 2">置换液速度<br/>(ml/h)</div>
+                          <div style="flex: 1;border-right: 1px solid black;" v-if="record.prescription.mode_id == 2">置换液流量<br/>(ml/h)</div>
                           <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7 && record.prescription.anticoagulant != ''">肝素剩余量度(ml)</div>
                           <div style="flex: 2;">病情变化及处理</div>
                         </div>
@@ -1224,7 +1224,7 @@
                         {{ monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: ""}}
                       </div>
                       <div style="flex: 1;border-right: 1px solid black;" v-if="record.prescription.mode_id == 2">
-                        {{ monitor_record.replacement_speed ? monitor_record.replacement_speed : "" }}
+                        {{ monitor_record.displacement_flow_quantity ? monitor_record.displacement_flow_quantity : "" }}
                       </div>
                       <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7 && record.prescription.anticoagulant != ''">
 

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -3048,7 +3048,7 @@
             <div class="under_line" style="width: 120px;">
               <img
                 v-if="record.dialysis_order.url!=''"
-                style="height: 30px"
+                style="height: 40px"
                 :src="record.dialysis_order == null? 0: record.dialysis_order.url"
                 alt=""
                 srcset=""

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySeven.vue

@@ -311,7 +311,7 @@
                         <div
                           style="
                             display: flex;
-                            min-width: 180px;
+                            min-width: 150px;
                             border-right: 1px solid;
                           "
                         >
@@ -327,15 +327,10 @@
                             }}
                           </span>
                         </div>
-                        <div
-                          style="
-                            display: flex;
-                            border-right: 1px solid;
-                            padding: 0 10px;
-                            min-width: 180px;
-                          "
+                        <div style=" display: flex; border-right: 1px solid;
+                            padding-left: 10px; min-width: 180px;white-space: normal;"
                         >
-                          透析（滤）器：{{
+                          透析(滤)器：{{
                             prescription.dialyzer_perfusion_apparatus
                               ? prescription.dialyzer_perfusion_apparatus
                               : ""

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyTwo.vue

@@ -1118,7 +1118,7 @@
                       <div style="flex: 0.9;border-right: 1px solid black;">跨膜压<br/>(mmHg)</div>
                       <div style="flex: 0.9;border-right: 1px solid black;">钠浓度<br/>(mmol/L)</div>
                       <div style="flex: 0.9;border-right: 1px solid black;">超滤量<br/>(ml)</div>
-                      <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">置换液速度<br/>(ml/h)</div>
+                      <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">置换液流量<br/>(ml/h)</div>
                       <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name=='低分子肝素钠'">肝素剩余量度(ml)
                       </div>
                       <div style="flex: 2;">病情变化及处理</div>
@@ -1171,7 +1171,7 @@
                       {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}
                     </div>
                     <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">
-                      {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}
+                      {{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
                     </div>
                     <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name=='低分子肝素钠'">
 

src/xt_pages/dialysis/template/DialysisPrintOrderSeventysix.vue

@@ -71,7 +71,7 @@
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : "/"
               }}</span>
-              
+
             </div>
           </div>
           <div class="inline_block" v-if="org_id!=10460">
@@ -393,7 +393,7 @@
                         }}
                       </div>
                     </div>
-                  
+
                   </div>
                   <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                     <div
@@ -772,9 +772,8 @@
                             ? prescription.dialysis_dialyszers
                             : ""
                         }} &nbsp;&nbsp;
-                          {{prescription.dialysis_strainer ? prescription.dialysis_strainer :''}}
                         </span>
-
+                        {{prescription.dialysis_strainer ? prescription.dialysis_strainer :''}}
                         <!-- {{dialysisOrder.dialysis_dialyszers  }} -->
                       </div>
                       <!--  透析(滤)器合并取值 -->
@@ -860,7 +859,7 @@
                         }}
                        </span>
 
-                      
+
                       </div>
                       <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">ml</span>
                       <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">L</span>
@@ -982,7 +981,7 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
-                     
+
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px" v-if="prescription.anticoagulant != 1">
@@ -1010,7 +1009,7 @@
                           <span v-if="prescription.anticoagulant == 10">iu/h</span>
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
                           <span v-if="prescription.anticoagulant == 13">iu/h</span>
-                          
+
                       </span>
                     </div>
                     <div
@@ -1077,7 +1076,7 @@
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
-                      
+
                     </span>
                     </div>
 
@@ -1198,7 +1197,7 @@
                           </span>
                         </td>
                         <td>{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : '' }}</td>
-                        
+
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
@@ -1265,9 +1264,9 @@
                         <td style="font-size: 16px" colspan="2" width="45%">
                           医嘱内容
                         </td>
-                        
+
                         <td style="font-size: 16px" width="10%">医生签名</td>
-                      
+
                         <td style="font-size: 16px" width="10%">执行人签名</td>
                         <td style="font-size: 16px" width="10%">时间</td>
 
@@ -1429,7 +1428,7 @@
                     ? patientInfo.DialysisSchedule.device_zone.name
                     : "/"
                 }}</span>
-                
+
               </div>
             </div>
             <div class="inline_block" >
@@ -1520,7 +1519,7 @@
                     医嘱内容
                   </td>
                   <td style="font-size: 15px" width="10%">医生签名</td>
-                 
+
                   <td style="font-size: 15px" width="10%">执行人签名</td>
                   <td style="font-size: 15px" width="10%">时间</td>
                 </tr>
@@ -1583,7 +1582,7 @@
                     />
                   </td>
 
-                  
+
                   <td height="32px">
                     <span
                       v-if="setAdminUserES(advice.execution_staff) == ''"

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -287,48 +287,42 @@
                     </div>
                   </div>
                   <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;">
-                    <div
-                      class="inline_block"
-                      style="flex: 1"
-                    >
+                    <div class="inline_block" style="width: 19%;">
                       穿刺方式：
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 80px; text-align: center"
                         v-if="predialysis.puncture_way == ''"
                       >
                         /
                       </div>
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 80px; text-align: center"
                         v-if="predialysis.puncture_way.indexOf('绳梯') > -1"
                       >
                         绳梯
                       </div>
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 80px; text-align: center"
                         v-if="predialysis.puncture_way.indexOf('扣眼') > -1"
                       >
                         扣眼
                       </div>
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 80px; text-align: center"
                         v-if="predialysis.puncture_way.indexOf('区域') > -1"
                       >
                         区域
                       </div>
                     </div>
-                    <div
-                      class="inline_block"
-                      style="margin-left: 10px; flex: 1"
-                    >
+                    <div class="inline_block" style="width: 19%;">
                       穿刺针：
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 80px; text-align: center"
                       >
                         {{
                           predialysis.puncture_needle
@@ -337,7 +331,7 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="margin-left: 1px; flex: 1">
+                    <div class="inline_block" style="width: 20%;">
                       透析时间：
                       <div
                         class="under_line"
@@ -362,7 +356,7 @@
                       </div>
                       min
                     </div>
-                    <div class="inline_block" style="flex: 1;margin-left: 10px;">
+                    <div class="inline_block" style="width: 15%;">
                       透析机号：
                       <div
                         class="under_line"
@@ -377,14 +371,11 @@
                         }}
                       </div>
                     </div>
-                    <div
-                      class="inline_block"
-                      style="flex: 1"
-                    >
+                    <div class="inline_block" style="width: 25%;">
                       透析机型：
                       <div
                         class="under_line"
-                        style="width: 50px; text-align: center"
+                        style="width: 100px; text-align: center"
                       >
                        {{predialysis.machine_type ? predialysis.machine_type : ""}}
                       </div>
@@ -830,8 +821,10 @@
                             : ""
                         }}
                         </span>
-
-                        {{dialysisOrder.dialysis_dialyszers  }}
+                        <span v-if="dialysisOrder != null">
+                          {{dialysisOrder.dialysis_dialyszers  }}
+                        </span>
+                        
                       </div>
                       <!--  透析(滤)器合并取值 -->
                        <div v-if="org_id==10414"
@@ -860,8 +853,10 @@
                             : "/"
                         }}
                          </span>
-                         {{dialysisOrder.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
-
+                         <span v-if="dialysisOrder != null">
+                          {{dialysisOrder.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
+                         </span>
+                         
                       </div>
                     </div>
 
@@ -2609,12 +2604,12 @@
         </div>
 
          <!-- 患者签名 -->
-         <div style="position: relative; left: 70%;top: 50px;width: 288px;">
+         <div style="position: relative; left: 70%;top: 50px;">
           患者签名：
           <div class="under_line" style="width: 120px;">
             <img
               v-if="dialysisOrder.url!=''"
-              style="height: 30px"
+              style="height: 40px"
               :src="dialysisOrder == null? 0: dialysisOrder.url"
               alt=""
               srcset=""