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_eighty.vue

@@ -13,11 +13,7 @@
     </div>
     <div class="app-container">
       <div id="print_content">
-        <div
-          v-for="(record, t) in records"
-          :key="t"
-          class="print_page_main_content"
-        >
+        <div v-for="(record, t) in records" :key="t" class="print_page_main_content" style="font-family:SimSun;">
           <div style="display: inline-block; width: 100%; text-align: center">
             <div class="order-yy-name"
               style="letter-spacing: 0;
@@ -51,13 +47,13 @@
               </div>
               岁
             </div>
-            <div class="inline_block" v-if="record.receive_assessment.condition!=1" style="flex: 1;">
+            <div class="inline_block" v-if="record.receive_assessment.condition!=1" style="flex: 0.9;">
                 门诊:
                 <div class="under_line" style="width: 30px; text-align: center">
                   <check-box :checked="record.patient.source == 1"></check-box>
                 </div>
               </div>
-            <div class="inline_block" v-if="record.receive_assessment.condition==1" style="flex: 1;">
+            <div class="inline_block" v-if="record.receive_assessment.condition==1" style="flex: 0.9;">
               住院:
               <div class="under_line" style="width: 30px; text-align: center">
                 <check-box :checked="record.patient.source == 1"></check-box>
@@ -75,13 +71,13 @@
                 {{ record.device_number.number }}
               </div>
             </div>
-            <div class="inline_block" style="flex: 1;">
+            <div class="inline_block" style="flex: 1.1;">
               透析号:
               <div class="under_line" style="width: 70px; text-align: center">
                 {{ record.patient.dialysis_no }}
               </div>
             </div>
-            <div class="inline_block" style="flex: 1;">
+            <div class="inline_block" style="flex: 1.1;">
               住院号:
               <div
                 class="under_line"
@@ -1399,8 +1395,7 @@
  
                       <div class="inline_block" style="flex: 1">
                         下机护士:
-                        <div
-                          class="under_line"
+                        <div class="under_line"
                           style="width: 80px; text-align: center"
                         >
                           <span
@@ -1438,20 +1433,19 @@
                         </div>
                       </div>
 
-                      <div class="inline_block" style="flex: 1">
-                        上机时间
-                        <div class="under_line" style="width: 65%; text-align: center">
+                      <div class="inline_block" style="flex: 1.1">
+                        上机时间:
+                        <div class="under_line" style="width: 64%; text-align: center">
                           <span style="height: 30px;display: inline-block;"></span>
-                          
                           <span v-if="record.dialysis_order !=null">
                             {{getTime(record.dialysis_order.start_time, "{y}-{m}-{d} {h}:{i}") ? 
                             getTime(record.dialysis_order.start_time, "{y}-{m}-{d} {h}:{i}") :''}} 
                           </span>
                         </div>
                       </div>
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex: 1.1">
                         下机时间:
-                        <div class="under_line" style="width: 65%; text-align: center">
+                        <div class="under_line" style="width: 64%; text-align: center">
                           <span style="height: 30px; display: inline-block">
                           </span>
                           <span v-if="record.dialysis_order!=null">

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -4,8 +4,7 @@
     <el-button type="primary" @click="toUpload">一键上传</el-button>
 
     <div id="dialysis-print-box-1"  ref="pdfContent">
-      <div
-        id="dialysis-print-box-1-1"
+      <div id="dialysis-print-box-1-1" style="font-family:SimSun;"
         class="dialysis-print-order print-template-two print_page_main_content"
       >
         <div style="display: inline-block; width: 100%; text-align: center">
@@ -74,13 +73,13 @@
               }}</span>
             </div>
           </div>
-          <div class="inline_block" style="flex: 1;">
+          <div class="inline_block" style="flex: 1.1;">
             透析号:
             <div class="under_line" style="width: 70px; text-align: center">
               {{ patientInfo.dialysis_no }}
             </div>
           </div>
-          <div class="inline_block" style="flex: 1;">
+          <div class="inline_block" style="flex: 1.1;">
             住院号:
             <div class="under_line" style="width: 70px;text-align: left">
               {{ receiverTreatmentAccess.admission_number ? receiverTreatmentAccess.admission_number :'/' }}
@@ -1290,10 +1289,10 @@
                         />
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1">
-                       上机时间
+                    <div class="inline_block" style="flex: 1.1">
+                       上机时间:
                       <div class="under_line"
-                        style="width: 65%; text-align: center"
+                        style="width: 64%; text-align: center"
                       >
                         <span style="height: 30px;display: inline-block;">
                           
@@ -1305,10 +1304,10 @@
                         
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 1.1">
                       下机时间:
                       <div class="under_line"
-                        style="width: 65%; text-align: center"
+                        style="width: 64%; text-align: center"
                       >
                         <span style="height: 30px; display: inline-block">
                         </span>

src/xt_pages/user/components/PatientDetail.vue

@@ -1268,8 +1268,8 @@
         </div>
       </div>
       <div id="print-info-box" v-else>
-        <div class="print_main_content" style="margin-top: 70px;">
-          <div class="order_title" style="font-size: 25px;font-weight: 600;">{{ orgname }}<br/>血液净化治疗患者首次门诊病历</div>
+        <div class="print_main_content" style="font-family:SimSun;">
+          <div class="order_title" style="font-size: 26px;font-weight: 600;">{{ orgname }}<br/>血液净化治疗患者首次门诊病历</div>
           <div >
             <table >
               <tbody>
@@ -1379,7 +1379,6 @@
                     ></div>
                   </td>
                 </tr>
-
                 <tr>
                   <td>
                     <div class="td_proj_title">既<br />往<br />史</div>