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

@@ -736,13 +736,7 @@
                             </td>
                           </tr>
                         </template>
-                        <tr>
-                          <td height="32px"></td>
-                          <td colspan="2"></td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                        </tr>
+                        
                         <!-- <tr v-for="(advice, advice_index) in record.his_project" :key="advice_index" v-if="org_id == 0 || org_id ==10206">
                         <td height="32px;padding:1px 1px">
                             <span v-if="advice.start_time">

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -765,13 +765,7 @@
                           }}</span>
                         </td>
                       </tr>
-                      <tr>
-                        <td height="32px"></td>
-                        <td colspan="2"></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                      </tr>
+                     
                      <!-- <tr
                         v-for="(advice, advice_index) in projectsOne"
                         :key="advice_index"

src/xt_pages/workforce/scheduleTablePrintTwo.vue

@@ -7,10 +7,12 @@
       </div>
       <div class="tab" style="margin-top: 10px;" v-if="org_id!=10742">
         <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0" 
-          style='width: 100%;table-layout:fixed;text-align: center;word-break: break-all;word-wrap: break-word;font-weight: 500;'>
+          style='width: 100%;table-layout:fixed;text-align: center;word-break: break-all;word-wrap: break-word;font-size: 15px;'>
           <tr>
-            <td rowspan="2" width="100">分区</td>
-            <td rowspan="2" width="100">机号</td>
+            <td rowspan="2" v-if="org_id !=10721">分区</td>
+            <td rowspan="2" v-if="org_id !=10721">机号</td>
+            <td rowspan="2" width="100" v-if="org_id ==10721">分区</td>
+            <td rowspan="2" width="100" v-if="org_id ==10721">机号</td>
             <td colspan="3" v-if="first_day == 1">周一({{ weekTitle[0] }})</td>
             <td colspan="3" v-if="second_day == 2">周二({{ weekTitle[1] }})</td>
             <td colspan="3" v-if="three_day == 3">周三({{ weekTitle[2] }})</td>
@@ -298,18 +300,18 @@
             <template v-if="schedule_type == 0 && org_id != 10721 ">
               <td style="min-width:50px;" v-if="first_day == 1">
                 <span v-if="item.Mon_M.patient_id">
-                  <span>{{ item.Mon_M.patient }}</span>
+                  <span>{{ item.Mon_M.patient }}</span><br />
                   <span v-if="item.Mon_M.mode_id != 1">{{ item.Mon_M.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Mon_M.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Mon_M.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Mon_M.dialysis_machine_name }}
                   </span>
                 </span>
               </td>
               <td style="min-width:50px;" v-if="first_day == 1">
                 <span v-if="item.Mon_A.patient_id">
-                  <span>{{ item.Mon_A.patient }} </span>
+                  <span>{{ item.Mon_A.patient }} </span><br />
                   <span v-if="item.Mon_A.mode_id != 1">{{ item.Mon_A.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Mon_A.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Mon_A.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Mon_A.dialysis_machine_name }}
 
                   </span>
@@ -317,9 +319,9 @@
               </td>
               <td style="min-width:50px;" v-if="first_day == 1">
                 <span v-if="item.Mon_N.patient_id">
-                  <span>{{ item.Mon_N.patient }} </span>
+                  <span>{{ item.Mon_N.patient }} </span><br />
                   <span v-if="item.Mon_N.mode_id != 1">{{ item.Mon_N.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Mon_N.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Mon_N.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Mon_N.dialysis_machine_name }}
 
                   </span>
@@ -327,9 +329,9 @@
               </td>
               <td style="min-width:50px;" v-if="second_day == 2">
                 <span v-if="item.Tue_M.patient_id">
-                  <span>{{ item.Tue_M.patient }} </span>
+                  <span>{{ item.Tue_M.patient }} </span><br />
                   <span v-if="item.Tue_M.mode_id != 1">{{ item.Tue_M.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Tue_M.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Tue_M.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Tue_M.dialysis_machine_name }}
 
                   </span>
@@ -337,9 +339,9 @@
               </td>
               <td style="min-width:50px;" v-if="second_day == 2">
                 <span v-if="item.Tue_A.patient_id">
-                  <span>{{ item.Tue_A.patient }} </span>
+                  <span>{{ item.Tue_A.patient }} </span><br />
                   <span v-if="item.Tue_A.mode_id != 1">{{ item.Tue_A.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Tue_A.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Tue_A.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Tue_A.dialysis_machine_name }}
 
                   </span>
@@ -348,9 +350,9 @@
               </td>
               <td style="min-width:50px;" v-if="second_day == 2">
                 <span v-if="item.Tue_N.patient_id">
-                  <span>{{ item.Tue_N.patient }} </span>
+                  <span>{{ item.Tue_N.patient }} </span><br />
                   <span v-if="item.Tue_N.mode_id != 1">{{ item.Tue_N.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Tue_N.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Tue_N.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Tue_N.dialysis_machine_name }}
 
                   </span>
@@ -358,9 +360,9 @@
               </td>
               <td style="min-width:50px;" v-if="three_day == 3">
                 <span v-if="item.Wed_M.patient_id">
-                  <span>{{ item.Wed_M.patient }} </span>
+                  <span>{{ item.Wed_M.patient }} </span><br />
                   <span v-if="item.Wed_M.mode_id != 1">{{ item.Wed_M.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Wed_M.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Wed_M.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Wed_M.dialysis_machine_name }}
 
                   </span>
@@ -368,19 +370,17 @@
               </td>
               <td style="min-width:50px;" v-if="three_day == 3">
                 <span v-if="item.Wed_A.patient_id">
-                  <span>{{ item.Wed_A.patient }} </span>
+                  <span>{{ item.Wed_A.patient }} </span><br />
                   <span v-if="item.Wed_A.mode_id != 1">{{ item.Wed_A.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Wed_A.anticoagulant) }}</span>
-                  <span v-show="showflag">{{ item.Wed_A.dialysis_machine_name }}
-
-                  </span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Wed_A.anticoagulant) }}</span> -->
+                  <span v-show="showflag">{{ item.Wed_A.dialysis_machine_name }}</span>
                 </span>
               </td>
               <td style="min-width:50px;" v-if="three_day == 3">
                 <span v-if="item.Wed_N.patient_id">
-                  <span>{{ item.Wed_N.patient }} </span>
+                  <span>{{ item.Wed_N.patient }} </span><br />
                   <span v-if="item.Wed_N.mode_id != 1">{{ item.Wed_N.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Wed_N.dialysis_machine_name }}
 
                   </span>
@@ -388,9 +388,9 @@
               </td>
               <td style="min-width:50px;" v-if="four_day == 4">
                 <span v-if="item.Thurs_M.patient_id">
-                  <span>{{ item.Thurs_M.patient }} </span>
+                  <span>{{ item.Thurs_M.patient }} </span><br />
                   <span v-if="item.Thurs_M.mode_id != 1">{{ item.Thurs_M.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Thurs_M.dialysis_machine_name }}
 
                   </span>
@@ -398,7 +398,7 @@
               </td>
               <td style="min-width:50px;" v-if="four_day == 4">
                 <span v-if="item.Thurs_A.patient_id">
-                  <span>{{ item.Thurs_A.patient }} </span>
+                  <span>{{ item.Thurs_A.patient }} </span><br />
                   <span v-if="item.Thurs_A.mode_id != 1">{{ item.Thurs_A.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_A.anticoagulant) }}</span>
 
@@ -409,9 +409,9 @@
               </td>
               <td style="min-width:50px;" v-if="four_day == 4">
                 <span v-if="item.Thurs_N.patient_id">
-                  <span>{{ item.Thurs_N.patient }} </span>
+                  <span>{{ item.Thurs_N.patient }} </span><br />
                   <span v-if="item.Thurs_N.mode_id != 1">{{ item.Thurs_N.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Thurs_N.dialysis_machine_name }}
 
                   </span>
@@ -419,9 +419,9 @@
               </td>
               <td style="min-width:50px;" v-if="five_day == 5">
                 <span v-if="item.Fri_M.patient_id">
-                  <span>{{ item.Fri_M.patient }} </span>
+                  <span>{{ item.Fri_M.patient }} </span><br />
                   <span v-if="item.Fri_M.mode_id != 1">{{ item.Fri_M.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span> -->
                   <span v-show="showflag">{{ item.Fri_M.dialysis_machine_name }}
 
                   </span>
@@ -429,9 +429,9 @@
               </td>
               <td style="min-width:50px;" v-if="five_day == 5">
                 <span v-if="item.Fri_A.patient_id">
-                  <span>{{ item.Fri_A.patient }} </span>
+                  <span>{{ item.Fri_A.patient }} </span><br />
                   <span v-if="item.Fri_A.mode_id != 1">{{ item.Fri_A.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Fri_A.dialysis_machine_name }}
 
                   </span>
@@ -439,9 +439,9 @@
               </td>
               <td style="min-width:50px;" v-if="five_day == 5">
                 <span v-if="item.Fri_N.patient_id">
-                  <span>{{ item.Fri_N.patient }} </span>
+                  <span>{{ item.Fri_N.patient }} </span><br />
                   <span v-if="item.Fri_N.mode_id != 1">{{ item.Fri_N.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Fri_N.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Fri_N.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Fri_N.dialysis_machine_name }}
 
                   </span>
@@ -449,9 +449,9 @@
               </td>
               <td style="min-width:50px;" v-if="six_day == 6">
                 <span v-if="item.Sat_M.patient_id">
-                  <span>{{ item.Sat_M.patient }} </span>
+                  <span>{{ item.Sat_M.patient }} </span><br />
                   <span v-if="item.Sat_M.mode_id != 1">{{ item.Sat_M.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Sat_M.dialysis_machine_name }}
 
                   </span>
@@ -459,9 +459,9 @@
               </td>
               <td style="min-width:50px;" v-if="six_day == 6">
                 <span v-if="item.Sat_A.patient_id">
-                  <span>{{ item.Sat_A.patient }} </span>
+                  <span>{{ item.Sat_A.patient }} </span><br />
                   <span v-if="item.Sat_A.mode_id != 1">{{ item.Sat_A.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Sat_A.dialysis_machine_name }}
 
                   </span>
@@ -469,9 +469,9 @@
               </td>
               <td style="min-width:50px;" v-if="six_day == 6">
                 <span v-if="item.Sat_N.patient_id">
-                  <span>{{ item.Sat_N.patient }} </span>
+                  <span>{{ item.Sat_N.patient }} </span><br />
                   <span v-if="item.Sat_N.mode_id != 1">{{ item.Sat_N.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Sat_N.dialysis_machine_name }}
 
                   </span>
@@ -479,9 +479,9 @@
               </td>
               <td style="min-width:50px;" v-if="seven_day == 7">
                 <span v-if="item.Sun_M.patient_id">
-                  <span>{{ item.Sun_M.patient }} </span>
+                  <span>{{ item.Sun_M.patient }} </span><br />
                   <span v-if="item.Sun_M.mode_id != 1">{{ item.Sun_M.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Sun_M.dialysis_machine_name }}
 
                   </span>
@@ -489,9 +489,9 @@
               </td>
               <td style="min-width:50px;" v-if="seven_day == 7">
                 <span v-if="item.Sun_A.patient_id">
-                  <span>{{ item.Sun_A.patient }} </span>
+                  <span>{{ item.Sun_A.patient }} </span><br />
                   <span v-if="item.Sun_A.mode_id != 1">{{ item.Sun_A.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Sun_A.anticoagulant) }}</span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Sun_A.anticoagulant) }}</span> -->
                   <span v-show="showflag">{{ item.Sun_A.dialysis_machine_name }}
 
                   </span>
@@ -500,12 +500,10 @@
               </td>
               <td style="min-width:50px;" v-if="seven_day == 7">
                 <span v-if="item.Sun_N.patient_id">
-                  <span>{{ item.Sun_N.patient }} </span>
+                  <span>{{ item.Sun_N.patient }} </span><br />
                   <span v-if="item.Sun_N.mode_id != 1">{{ item.Sun_N.mode_name }}</span><br />
-                  <span v-if="org_id == 0">{{ getAnticoagulant(item.Sun_N.anticoagulant) }}</span>
-                  <span v-show="showflag">{{ item.Sun_N.dialysis_machine_name }}
-
-                  </span>
+                  <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Sun_N.anticoagulant) }}</span> -->
+                  <span v-show="showflag">{{ item.Sun_N.dialysis_machine_name }} </span>
                 </span>
               </td>
             </template>
@@ -663,7 +661,7 @@
           </tr>
         </table>
       </div>
-      <div class="tab" style="margin-top: 10px;" v-if="org_id==10742 || org_id==0">
+      <div class="tab" style="margin-top: 10px;" v-if="org_id==10742">
         <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0" 
           style='width: 100%;table-layout:fixed;text-align: center;word-break: break-all;word-wrap: break-word;font-size: 14px;'>
           <tr>
@@ -952,7 +950,7 @@
               </td> -->
             </template>
 
-            <template v-if="schedule_type == 0 && (org_id == 10742 ||org_id ==0)">
+            <template v-if="schedule_type == 0">
               <td style="min-width:50px;" v-if="first_day == 1">
                 <span v-if="item.Mon_M.patient_id">
                   <span>{{ item.Mon_M.patient }}</span><br/>
@@ -1993,7 +1991,7 @@ export default {
     },
     printAction: function () {
       // const style = '@media print {#scheduleTable{font-size:16px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
-      const style = '@media print {#scheduleTable{font-size:16px;} .scheduleTable td{padding: 5px 0;} }'
+      const style = '@media print {#scheduleTable{font-size:14px;} .scheduleTable td{padding: 5px 0;} }'
       const style1 = '@media print {#scheduleTable{font-size:20px;font-weight: 500;} .scheduleTable td{padding: 5px;} }'
       if (this.org_id != 10721 ) {
         printJS({