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

src/xt_pages/workforce/Patientshift.vue

@@ -142,26 +142,26 @@
                   <div>
                     <div style="margin: 10px 30px 10px 10px;background: rgb(74 211 235 / 51%);height: 110px;width: 125px;text-align: center;">
                       <span >{{ huanzhe.name}}({{getmode(huanzhe.mode_id)}})</span><br>
-                      <span style="font-size: 14px;margin-bottom: 5px;">
+                      <span style="font-size: 15px;margin-bottom: 5px;">
                         {{ huanzhe.zeng_fenqu }}-{{ huanzhe.zeng_chuang }}
                       </span><br>
-                      <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(huanzhe.boolen_id)}}</span><br>
-                      <span style="font-size: 13px;margin-bottom: 5px;">{{huanzhe.schedule_remark}}</span> 
+                      <span style="font-size: 15px;margin-bottom: 5px;">{{getBloodAccess(huanzhe.boolen_id)}}</span><br>
+                      <span style="font-size: 14px;margin-bottom: 5px;">{{huanzhe.schedule_remark}}</span> 
                     </div>
-                     <div style="margin-left: 10px;">{{getZoneName(xian_fenqu.zone_id)}}-{{xian_fenqu.number}}</div>
+                     <div style="margin-left: 13px;">{{getZoneName(xian_fenqu.zone_id)}}-{{xian_fenqu.number}}</div>
                   </div>
                   
                   <div>
                     <div style="margin: 10px 30px 10px 10px;background: rgb(74 197 235);height: 110px;width: 125px;text-align: center;">
                       <span >{{genghuan.name}}</span><span v-if="genghuan.mode_id !=''">({{genghuan.mode_id}})</span><br>
-                      <span style="font-size: 14px;margin-bottom: 5px;">
+                      <span style="font-size: 15px;margin-bottom: 5px;">
                         {{ genghuan.genghuan_fenqu }}-{{ genghuan.genghuan_chuang }}
                         <!-- A1区-6号床 -->
                       </span><br>
-                      <span style="font-size: 14px;margin-bottom: 5px;"></span>{{getBloodAccess(genghuan.g_boolen_id)}}<br>
-                      <span style="font-size: 13px;margin-bottom: 5px;">{{genghuan.genghuan_remark}}</span>
+                      <span style="font-size: 15px;margin-bottom: 5px;"></span>{{getBloodAccess(genghuan.g_boolen_id)}}<br>
+                      <span style="font-size: 14px;margin-bottom: 5px;">{{genghuan.genghuan_remark}}</span>
                     </div>
-                    <div style="margin-left: 10px;">{{getZoneName(g_xian_fenqu.zone_id)}}-{{g_xian_fenqu.number}}</div>
+                    <div style="margin-left: 13px;">{{getZoneName(g_xian_fenqu.zone_id)}}-{{g_xian_fenqu.number}}</div>
                   </div>
                 </div>
                
@@ -320,9 +320,9 @@
                                 <div>
                                   <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
                                   <span v-if="!hidder" >
-                                    <span style="font-size: 14px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
-                                    <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
-                                    <span style="font-size: 13px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
+                                    <span style="font-size: 15px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
+                                    <span style="font-size: 15px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
+                                    <span style="font-size: 14px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
                                   </span> 
                                 </div>
                               </div>

src/xt_pages/workforce/printOne.vue

@@ -59,7 +59,7 @@
                   <td :width="td_3_width" valign="top">
                     <div style="min-height: 80px">
                       <div class="proj">
-                        <div class="proj_item">
+                        <div class="proj_item" style="font-size:20px">
                           <p v-html="getPatientName(item.schedule_type,it.partition_id)" class="zone_name" style="font-size:20px">
                             
                           </p>
@@ -639,7 +639,7 @@ export default {
     },
     printAction: function() {
       const style =
-        '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+        '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 20px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 20px; line-height: 20px; } .zone_name { font-weight: 500; } }'
 
       printJS({
         printable: 'print_content',