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/scheduleTablePrintTwo.vue

@@ -72,17 +72,16 @@
                 <template v-if="schedule_type ==1">
                   <td colspan="3" style="min-width:50px;" v-if="first_day == 1">
                     <span v-if="item.Mon_M.patient_id">
-                      <span>{{ item.Mon_M.patient }} </span><br/>
-                      <span >{{ item.Mon_M.mode_name }}</span><br/>
-                     
+                      <span>{{ item.Mon_M.patient }} </span>&nbsp;
+                      <span >{{ item.Mon_M.mode_name }}</span>&nbsp;
                       <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}
                       </span>
                     </span>
                   </td>
                   <td colspan="3" style="min-width:50px;"  v-if="second_day == 2">
                     <span v-if="item.Tue_M.patient_id">
-                        <span>{{ item.Tue_M.patient }} </span><br/>
-                        <span >{{ item.Tue_M.mode_name }}</span><br/>
+                        <span>{{ item.Tue_M.patient }} </span>&nbsp;
+                        <span >{{ item.Tue_M.mode_name }}</span>&nbsp;
                         <span v-if="org_id==0">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span>
                         <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}
                          
@@ -91,8 +90,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="three_day == 3">
                       <span v-if="item.Wed_M.patient_id">
-                        <span>{{ item.Wed_M.patient }} </span><br/>
-                          <span >{{ item.Wed_M.mode_name }}</span><br/>
+                        <span>{{ item.Wed_M.patient }} </span>&nbsp;
+                          <span >{{ item.Wed_M.mode_name }}</span>&nbsp;
                           <span v-if="org_id == 0">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span>
                           <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}
                             
@@ -101,8 +100,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="four_day == 4">
                       <span v-if="item.Thurs_M.patient_id">
-                        <span>{{ item.Thurs_M.patient }} </span><br/>
-                          <span >{{ item.Thurs_M.mode_name }}</span><br/>
+                        <span>{{ item.Thurs_M.patient }} </span>&nbsp;
+                          <span >{{ item.Thurs_M.mode_name }}</span>&nbsp;
                           <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>
                           <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}
                           
@@ -111,8 +110,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="five_day == 5">
                       <span v-if="item.Fri_M.patient_id">
-                        <span>{{ item.Fri_M.patient }} </span><br/>
-                          <span >{{ item.Fri_M.mode_name }}</span><br/>
+                        <span>{{ item.Fri_M.patient }} </span>&nbsp;
+                          <span >{{ item.Fri_M.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span>
                           <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}}
                             
@@ -121,8 +120,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="six_day == 6">
                       <span v-if="item.Sat_M.patient_id">
-                        <span>{{ item.Sat_M.patient }} </span><br/>
-                          <span >{{ item.Sat_M.mode_name }}</span><br/>
+                        <span>{{ item.Sat_M.patient }} </span>&nbsp;
+                          <span >{{ item.Sat_M.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span> 
                           <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}
                           
@@ -131,8 +130,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="seven_day == 7">
                       <span v-if="item.Sun_M.patient_id">
-                        <span>{{ item.Sun_M.patient }} </span><br/>
-                          <span >{{ item.Sun_M.mode_name }}</span><br/>
+                        <span>{{ item.Sun_M.patient }} </span>&nbsp;
+                          <span >{{ item.Sun_M.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span>
                           <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}
                           
@@ -144,8 +143,8 @@
                 <template v-if="schedule_type ==2">
                   <td colspan="3" style="min-width:50px;" v-if="first_day == 1">
                     <span v-if="item.Mon_A.patient_id">
-                      <span>{{ item.Mon_A.patient }} </span><br/>
-                      <span >{{ item.Mon_A.mode_name }}</span><br/>
+                      <span>{{ item.Mon_A.patient }} </span>&nbsp;
+                      <span >{{ item.Mon_A.mode_name }}</span>&nbsp;
                       <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span>
                       <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}
                       </span>
@@ -153,8 +152,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;"  v-if="second_day == 2">
                       <span v-if="item.Tue_A.patient_id">
-                        <span>{{ item.Tue_A.patient }} </span><br/>
-                          <span >{{ item.Tue_A.mode_name }}</span><br/>
+                        <span>{{ item.Tue_A.patient }} </span>&nbsp;
+                          <span >{{ item.Tue_A.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Tue_A.anticoagulant)}}</span>
                           <span v-show="showflag">{{item.Tue_A.dialysis_machine_name}}
                           
@@ -164,8 +163,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="three_day == 3">
                       <span v-if="item.Wed_A.patient_id">
-                        <span>{{ item.Wed_A.patient }} </span><br/>
-                          <span >{{ item.Wed_A.mode_name }}</span><br/>
+                        <span>{{ item.Wed_A.patient }} </span>&nbsp;
+                          <span >{{ item.Wed_A.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{getAnticoagulant(item.Wed_A.anticoagulant)}}</span>
                           <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}}
                           
@@ -174,8 +173,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="four_day == 4">
                       <span v-if="item.Thurs_A.patient_id">
-                        <span>{{ item.Thurs_A.patient }} </span><br/>
-                          <span >{{ item.Thurs_A.mode_name }}</span><br/>
+                        <span>{{ item.Thurs_A.patient }} </span>&nbsp;
+                          <span >{{ item.Thurs_A.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span> 
 
                           <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}
@@ -185,8 +184,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="five_day == 5">
                       <span v-if="item.Fri_A.patient_id">
-                        <span>{{ item.Fri_A.patient }} </span><br/>
-                          <span >{{ item.Fri_A.mode_name }}</span><br/>
+                        <span>{{ item.Fri_A.patient }} </span>&nbsp;
+                          <span >{{ item.Fri_A.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span> 
                           <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}}
                             
@@ -195,8 +194,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="six_day == 6">
                       <span v-if="item.Sat_A.patient_id">
-                        <span>{{ item.Sat_A.patient }} </span><br/>
-                          <span >{{ item.Sat_A.mode_name }}</span><br/>
+                        <span>{{ item.Sat_A.patient }} </span>&nbsp;
+                          <span >{{ item.Sat_A.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span> 
                           <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}
                             
@@ -205,8 +204,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="seven_day == 7">
                       <span v-if="item.Sun_A.patient_id">
-                        <span>{{ item.Sun_A.patient }} </span><br/>
-                          <span >{{ item.Sun_A.mode_name }}</span><br/>
+                        <span>{{ item.Sun_A.patient }} </span>&nbsp;
+                          <span >{{ item.Sun_A.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{getAnticoagulant(item.Sun_A.anticoagulant)}}</span>
                           <span v-show="showflag">{{item.Sun_A.dialysis_machine_name}}
                           
@@ -219,8 +218,8 @@
                 <template v-if="schedule_type ==3">
                   <td colspan="3" style="min-width:50px;" v-if="first_day == 1">
                     <span v-if="item.Mon_N.patient_id">
-                      <span>{{ item.Mon_N.patient }} </span><br/>
-                      <span >{{ item.Mon_N.mode_name }}</span><br/>
+                      <span>{{ item.Mon_N.patient }} </span>&nbsp;
+                      <span >{{ item.Mon_N.mode_name }}</span>&nbsp;
                       <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span>
                       <span v-show="showflag">{{item.Mon_N.dialysis_machine_name}}
                       </span>
@@ -228,8 +227,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;"  v-if="second_day == 2">
                       <span v-if="item.Tue_N.patient_id">
-                        <span>{{ item.Tue_N.patient }} </span><br/>
-                          <span >{{ item.Tue_N.mode_name }}</span><br/>
+                        <span>{{ item.Tue_N.patient }} </span>&nbsp;
+                          <span >{{ item.Tue_N.mode_name }}</span>&nbsp;
                           <span v-if="org_id==0">{{getAnticoagulant(item.Tue_N.anticoagulant)  }}</span>
                           <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}
                             
@@ -238,8 +237,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="three_day == 3">
                       <span v-if="item.Wed_N.patient_id">
-                        <span>{{ item.Wed_N.patient }} </span><br/>
-                          <span >{{ item.Wed_N.mode_name }}</span><br/>
+                        <span>{{ item.Wed_N.patient }} </span>&nbsp;
+                          <span >{{ item.Wed_N.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>
                           <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}}
                           
@@ -248,8 +247,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="four_day == 4">
                       <span v-if="item.Thurs_N.patient_id">
-                        <span>{{ item.Thurs_N.patient }} </span><br/>
-                          <span >{{ item.Thurs_N.mode_name }}</span><br/>
+                        <span>{{ item.Thurs_N.patient }} </span>&nbsp;
+                          <span >{{ item.Thurs_N.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span> 
                           <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}
                           
@@ -258,8 +257,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="five_day == 5">
                       <span v-if="item.Fri_N.patient_id">
-                        <span>{{ item.Fri_N.patient }} </span><br/>
-                          <span >{{ item.Fri_N.mode_name }}</span><br/>
+                        <span>{{ item.Fri_N.patient }} </span>&nbsp;
+                          <span >{{ item.Fri_N.mode_name }}</span>&nbsp;
                           <span v-if="org_id == 0">{{getAnticoagulant(item.Fri_N.anticoagulant)  }}</span>
                           <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}}
                             
@@ -268,8 +267,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="six_day == 6">
                       <span v-if="item.Sat_N.patient_id">
-                        <span>{{ item.Sat_N.patient }} </span><br/>
-                          <span >{{ item.Sat_N.mode_name }}</span><br/>
+                        <span>{{ item.Sat_N.patient }} </span>&nbsp;
+                          <span >{{ item.Sat_N.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span> 
                           <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}
                           
@@ -278,8 +277,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="seven_day == 7">
                       <span v-if="item.Sun_N.patient_id">
-                        <span>{{ item.Sun_N.patient }} </span><br/>
-                          <span >{{ item.Sun_N.mode_name }}</span><br/>
+                        <span>{{ item.Sun_N.patient }} </span>&nbsp;
+                          <span >{{ item.Sun_N.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_N.anticoagulant ) }}</span>
                           <span v-show="showflag">{{item.Sun_N.dialysis_machine_name}}