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

                     <td colspan="3" style="width:130px;height:40px">
                       执行时间
                     </td>
-                    <!-- <td style="width:60px;height:60px">
-              <p style="height:20px;line-height:20px">核对</p>
-            </td>
-            <td style="width:60px;height:40px">
-              <p style="height:20px;line-height:20px">上次透后体重</p>
-            </td>
-            <td style="width:60px;height:40px">
-              {{
-                assessmentafter.weight_after
-                  ? assessmentafter.weight_after
-                  : "0"
-              }}kg
-            </td> -->
+             
                   </tr>
 
                   <tr

src/xt_pages/dialysis/bloodPresssWatch.vue

           type="primary"
           >批量打印</el-button>
       </template>
-         <template v-if="this.template_id == 53">
+      <template v-if="this.template_id == 53">
         <el-button
           size="small"
           icon="el-icon-printer"

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

                           <tr>
                               <td width='70'>抗凝方式</td>
                               <td width='100'>
-                                  <label-box :isChecked="prescription.anticoagulant == 3 ? true : false" showValue="低分子肝素"></label-box>
-                                  <label-box :isChecked="prescription.anticoagulant == 4 ? true : false" showValue="阿加曲班"></label-box>
-                                  <label-box :isChecked="prescription.anticoagulant == 5 ? true : false" showValue="枸橼酸钠"></label-box>
-                                  <label-box :isChecked="prescription.anticoagulant == 6 ? true : false" showValue="低分子肝素钙"></label-box>
-                                  <label-box :isChecked="prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box>
-                                  <label-box :isChecked="prescription.anticoagulant == 8 ? true : false" showValue="依诺肝素"></label-box>
-                                  <label-box :isChecked="prescription.anticoagulant == 9 ? true : false" showValue="达肝素"></label-box>
-                                  <label-box :isChecked="prescription.anticoagulant == 10 ? true : false" showValue="体外抗凝"></label-box>
-                                  <label-box :isChecked="prescription.anticoagulant == 11 ? true : false" showValue="那屈肝素"></label-box>
-                                  <label-box :isChecked="prescription.anticoagulant == 12 ? true : false" showValue="无抗凝剂"></label-box>
-                                  <label-box :isChecked="prescription.anticoagulant == 13 ? true : false" showValue="那屈肝素钙"></label-box>
+                                <span v-if="prescription.anticoagulant == 3"><label-box :isChecked="prescription.anticoagulant == 3 ? true : false" showValue="低分子肝素"></label-box></span>  
+                                <span v-if="prescription.anticoagulant == 4"><label-box :isChecked="prescription.anticoagulant == 4 ? true : false" showValue="阿加曲班"></label-box></span>  
+                                <span v-if="prescription.anticoagulant == 5"> <label-box :isChecked="prescription.anticoagulant == 5 ? true : false" showValue="枸橼酸钠"></label-box></span> 
+                                <span v-if="prescription.anticoagulant == 6"> <label-box :isChecked="prescription.anticoagulant == 6 ? true : false" showValue="低分子肝素钙"></label-box></span> 
+                                <span v-if="prescription.anticoagulant == 7"> <label-box :isChecked="prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box></span> 
+                                <span v-if="prescription.anticoagulant == 8"> <label-box :isChecked="prescription.anticoagulant == 8 ? true : false" showValue="依诺肝素"></label-box></span>  
+                                <span v-if="prescription.anticoagulant == 9"> <label-box :isChecked="prescription.anticoagulant == 9 ? true : false" showValue="达肝素"></label-box></span> 
+                                <span v-if="prescription.anticoagulant == 10"><label-box :isChecked="prescription.anticoagulant == 10 ? true : false" showValue="体外抗凝"></label-box></span>  
+                                <span v-if="prescription.anticoagulant == 11"> <label-box :isChecked="prescription.anticoagulant == 11 ? true : false" showValue="那屈肝素"></label-box></span>  
+                                <span v-if="prescription.anticoagulant == 12"><label-box :isChecked="prescription.anticoagulant == 12 ? true : false" showValue="无抗凝剂"></label-box></span>  
+                                <span v-if="prescription.anticoagulant == 13"><label-box :isChecked="prescription.anticoagulant == 13 ? true : false" showValue="那屈肝素钙"></label-box></span>  
                               </td>
                               <!-- <td width='100'>
                                   <div class="under-line">

src/xt_pages/management/home.vue

                                    <el-col :span="8">
                                       <el-form-item label="空气滤网清洁:">
                                         <el-checkbox v-model="userform.clean">清洁</el-checkbox>
-                                      <span class="warn" v-show="warnShowThree">您已一个月未清洁,请检查</span>
+                                      <span class="warn" v-show="warnShowThree">您已三个月未清洁,请检查</span>
                                       </el-form-item>
                                      </el-col>
                                    <el-col :span="8">

src/xt_pages/workforce/components/tableWeeks.vue

             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

       <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>
                   
                     分区/床号：
                     <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>
                  
                 </div>
               
-              </div>
+                </div> 
+              <!-- </div> -->
            </div>
           </div>
         </div>
   -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{