4月7日打印单样式问题

src/xt_pages/workforce/components/tableWeeks.vue

@@ -907,7 +907,7 @@
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
           })
         }
-        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340){
+        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340 && this.org_id != 0){
           var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -18,22 +18,25 @@
       <div id="print_content">
         <div class="print_main_content">
           <div class="table_panel" v-loding="loading"  element-loading-text="拼命加载中">
-            <div v-for="(main_collection,index) in scheduleData" :key="index" :class="(org_id == 9671 || org_id == 10340) && parseInt((index+1)%8) == 0  ? 'page-break-after':''">
-             
-
-              <div class="signPrint" style="font-size:16px;">
-                <div style="font-size:24px;font-weight: 400;">姓名:
-                  <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
-                  <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
-                  <span v-if="type ==1 && printObj.name == 1">（{{ main_collection.patient.dialysis_no }}，
-                  <span> {{getGender(main_collection.patient.gender)}}，</span> 
-                    {{getNewAge(main_collection.patient.id_card_no) }}岁）</span> 
-                  <span v-if="type ==2 && printObj.name == 1">（{{ main_collection.dialysis_no }}，
-                  <span>{{getGender(main_collection.gender) }}，</span>  
-                    {{getNewAge(main_collection.id_card_no) }}岁）</span> 
-                  
-                </div>
-                <div class="printCell">
+            <div v-for="(main_collection,index) in scheduleData" :key="index" :class="(org_id == 9671 || org_id == 10340) && parseInt((index+1)%8) == 0  ? 'page-break-after':''"
+            style="display: inline-block; width: 42%; margin: 0px 35px 20px; 
+            border: 1px solid black;
+            box-sizing: border-box;">
+              <!-- <div style="display: flex;justify-content: space-between;flex-wrap: wrap;">
+                box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 20px rgba(0, 0, 0, 0.06) inset; -->
+                <div class="signPrint" style="font-size:16px;  ">
+                  <div style="font-size:24px;font-weight: 400;">姓名:
+                    <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
+                    <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
+                    <span v-if="type ==1 && printObj.name == 1">（{{ main_collection.patient.dialysis_no }}，
+                    <span> {{getGender(main_collection.patient.gender)}}，</span> 
+                      {{getNewAge(main_collection.patient.id_card_no) }}岁）</span> 
+                    <span v-if="type ==2 && printObj.name == 1">（{{ main_collection.dialysis_no }}，
+                    <span>{{getGender(main_collection.gender) }}，</span>  
+                      {{getNewAge(main_collection.id_card_no) }}岁）</span> 
+                    
+                  </div>
+               <div class="printCell">
                   透析模式:
                     <span>{{getModeId(main_collection.mode_id)}}</span>
                   
@@ -186,9 +189,6 @@
                     分区/床号：
                     <span  style="width:auto;">{{main_collection.zone.name}}/</span>
                     {{ main_collection.number.number }}
-                    <!-- <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
-                    <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
-                    <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span> -->
                   </span>
                  
                 </div>
@@ -203,7 +203,8 @@
                  
                 </div>
               
-              </div>
+                </div> 
+              <!-- </div> -->
            </div>
           </div>
         </div>
@@ -815,8 +816,8 @@
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
   -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-  margin-bottom: 20px;
-  padding: 20px 10px;
+  // margin-bottom: 20px;
+  padding: 20px 5px;
 }
 .printCell{
   span{