6月30日杨青

src/router/modules/dialysis.js

@@ -478,6 +478,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/Eleven',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_Eleven'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_nine',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/twelve',
       component: () =>

src/router/modules/patient.js

@@ -181,35 +181,39 @@ export default {
       title: 'CourseOfDiseaseManage',
       noCache: true
     }
-  }, {
+  },
+  {
       path: '/patients/sickhistory',
       component: () => import('@/xt_pages/user/sickHistory'),
       hidden: true,
       is_menu: false,
       name: 'sickHistory',
       meta: { title: 'sickHistory', noCache: true }
-    }, {
+  }, 
+  {
       path: '/patients/inspection_check',
       component: () => import('@/xt_pages/user/inspectionCheck'),
       hidden: true,
       is_menu: false,
       name: 'inspectionCheck',
       meta: { title: 'inspectionCheck', noCache: true }
-    },{
-      path: '/patients/ktv',
-      component: () => import('@/xt_pages/user/ktv'),
-      hidden: true,
-      is_menu: false,
-      name: 'ktv',
-      meta: { title: 'ktv', noCache: true }
-    },{
-      path: '/patients/physicalexamination',
-      component: () => import('@/xt_pages/user/Physicalexamination'),
-      hidden: true,
-      is_menu: false,
-      name: 'physicalexamination',
-      meta: { title: 'physicalexamination', noCache: true }
-    },
+  },
+  {
+    path: '/patients/ktv',
+    component: () => import('@/xt_pages/user/ktv'),
+    hidden: true,
+    is_menu: false,
+    name: 'ktv',
+    meta: { title: 'ktv', noCache: true }
+  },
+  {
+    path: '/patients/physicalexamination',
+    component: () => import('@/xt_pages/user/Physicalexamination'),
+    hidden: true,
+    is_menu: false,
+    name: 'physicalexamination',
+    meta: { title: 'physicalexamination', noCache: true }
+  },
   {
     path: '/patients/rescue',
     component: () => import('@/xt_pages/user/rescueRecord'),
@@ -254,17 +258,17 @@ export default {
       noCache: true
     }
   },
-    {
-      path: '/physique/print',
-      component: () => import('@/xt_pages/user/physiqueprintingtwo'),
-      hidden: true,
-      is_menu: false,
-      name: 'physiqueprintingtwo',
-      meta: {
-        title: 'physiqueprintingtwo',
-        noCache: true
-      }
-    },
+  {
+    path: '/physique/print',
+    component: () => import('@/xt_pages/user/physiqueprintingtwo'),
+    hidden: true,
+    is_menu: false,
+    name: 'physiqueprintingtwo',
+    meta: {
+      title: 'physiqueprintingtwo',
+      noCache: true
+    }
+  },
   {
     path: '/patient/patient/templateSummary/print',
     component: () => import('@/xt_pages/user/templateSummaryPrint'),
@@ -319,7 +323,161 @@ export default {
       title: 'firstDiseasePrint',
       noCache: true
     }
-  }
+  },
+  {//评估工具/跌倒评估
+    path: '/patients/patient/:id/Fallassessment',
+    component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'Fallassessment',
+    meta: {
+      title: 'firstDiseasePrint',
+      noCache: true
+    }
+  },
+  {//小儿跌倒风险评估
+    path: '/patients/patient/:id/pediatricFallAssessment',
+    component: () => import('@/xt_pages/user/evaluationtool/pediatricFallAssessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'pediatricFallAssessment',
+    meta: {
+      title: 'pediatricFallAssessment',
+      noCache: true
+    }
+  },
+  {//压疮风险评估
+    path: '/patients/patient/:id/pressuresore',
+    component: () => import('@/xt_pages/user/evaluationtool/pressuresore'),
+    hidden: true,
+    is_menu: false,
+    name: 'pressuresore',
+    meta: {
+      title: 'pressuresore',
+      noCache: true
+    }
+  },
+  {//oh压疮评估
+    path: '/patients/patient/:id/OHpressuresore',
+    component: () => import('@/xt_pages/user/evaluationtool/OHpressuresore'),
+    hidden: true,
+    is_menu: false,
+    name: 'OHpressuresore',
+    meta: {
+      title: 'OHpressuresore',
+      noCache: true
+    }
+  },
 
+  {//日常生活能力评估
+    path: '/patients/patient/:id/dailyLife',
+    component: () => import('@/xt_pages/user/evaluationtool/dailyLife'),
+    hidden: true,
+    is_menu: false,
+    name: 'dailyLife',
+    meta: {
+      title: 'dailyLife',
+      noCache: true
+    }
+  },
+  {//导管脱落风险评估
+    path: '/patients/patient/:id/Cathetershedding',
+    component: () => import('@/xt_pages/user/evaluationtool/Cathetershedding'),
+    hidden: true,
+    is_menu: false,
+    name: 'Cathetershedding',
+    meta: {
+      title: 'Cathetershedding',
+      noCache: true
+    }
+  },
+  {//RASS及疼痛评估
+    path: '/patients/patient/:id/RassAssessment',
+    component: () => import('@/xt_pages/user/evaluationtool/RassAssessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'RassAssessment',
+    meta: {
+      title: 'RassAssessment',
+      noCache: true
+    }
+  },
+  {//营养状况评估
+    path: '/patients/patient/:id/nourishmentAssessment',
+    component: () => import('@/xt_pages/user/evaluationtool/nourishmentAssessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'nourishmentAssessment',
+    meta: {
+      title: 'nourishmentAssessment',
+      noCache: true
+    }
+  },
+  {//约束告知单
+    path: '/patients/patient/:id/Constraintnotification',
+    component: () => import('@/xt_pages/user/evaluationtool/Constraintnotification'),
+    hidden: true,
+    is_menu: false,
+    name: 'Constraintnotification',
+    meta: {
+      title: 'Constraintnotification',
+      noCache: true
+    }
+  },
+  {//心理评估
+    path: '/patients/patient/:id/mindAssessment',
+    component: () => import('@/xt_pages/user/evaluationtool/mindAssessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'mindAssessment',
+    meta: {
+      title: 'mindAssessment',
+      noCache: true
+    }
+  },
+  {//瘙痒评估
+    path: '/patients/patient/:id/pruritusAssessment',
+    component: () => import('@/xt_pages/user/evaluationtool/pruritusAssessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'pruritusAssessment',
+    meta: {
+      title: 'pruritusAssessment',
+      noCache: true
+    }
+  },
+  {//血液透析患者评估
+    path: '/patients/patient/:id/hemodialysis',
+    component: () => import('@/xt_pages/user/evaluationtool/hemodialysis'),
+    hidden: true,
+    is_menu: false,
+    name: 'hemodialysis',
+    meta: {
+      title: 'hemodialysis',
+      noCache: true
+    }
+  },
+  {//Glasgow昏迷评分量表
+    path: '/patients/patient/:id/Glasgow',
+    component: () => import('@/xt_pages/user/evaluationtool/Glasgow'),
+    hidden: true,
+    is_menu: false,
+    name: 'Glasgow',
+    meta: {
+      title: 'Glasgow',
+      noCache: true
+    }
+  },
+  {//肌力评估表
+    path: '/patients/patient/:id/Muscleforce',
+    component: () => import('@/xt_pages/user/evaluationtool/Muscleforce'),
+    hidden: true,
+    is_menu: false,
+    name: 'Muscleforce',
+    meta: {
+      title: 'Muscleforce',
+      noCache: true
+    }
+  },
   ]
 }

src/xt_pages/Dialysisanalysis/albumin/albuminall.vue

@@ -135,14 +135,6 @@ export default{
           value: 157,
           name: "达标值患者"
         },
-        // {
-        //   value: 149,
-        //   name: "广东"
-        // },
-        // {
-        //   value: 147,
-        //   name: "湖南"
-        // }
             
             ],
             pieName: [],

src/xt_pages/data/printTemplate/prescriptionPrint.vue

@@ -55,7 +55,6 @@
         :url-list="imgs"
       ></el-image-viewer>
 
-    </div>
   </div>
 </template>
 

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue

@@ -1323,6 +1323,7 @@
                           <tr
                             v-for="(monitor_record, j) in record.monitor_records"
                             :key="j"
+                            
                           >
                             <td>
                               {{
@@ -1415,7 +1416,11 @@
                             </td>
                             <!-- 1:9肝素盐水剩余量 -->
                             <td>
-                              
+                              {{
+                              monitor_record.dicarbonate
+                                ? monitor_record.dicarbonate
+                                : ""
+                            }}
                             </td>
                             <!-- 体温 -->
                             <td >
@@ -1427,11 +1432,18 @@
                             </td>
                             <!-- 签名 -->
                             <td>
-                                <span v-if="setAdminUserES(monitor_record, 'monitoring_nurse') == ''">
+                                <!-- <span v-if="setAdminUserES(monitor_record, 'monitoring_nurse') == ''">
                                     {{ getAdminUser(monitor_record, 'monitoring_nurse') }}
                                 </span>
                                 <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
                                     <img style="height:30px;" :src="setAdminUserES(monitor_record, 'monitoring_nurse')" alt srcset />
+                                </span> -->
+
+                                <span v-if="setAdminUserES(monitor_record, 'creator') == ''">
+                                    {{ getAdminUser(monitor_record, 'creator') }}
+                                </span>
+                                <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                                    <img style="height:30px;" :src="setAdminUserES(monitor_record, 'creator')" alt srcset />
                                 </span>
                             </td>
                           </tr>

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

@@ -47,7 +47,7 @@
                         </div>
                       </td>
                       <td>岁</td>
-
+                      <td width="10"></td>
                       <td width="50">门诊号:</td>
                       <td width="150">
                         <div class="under-line">
@@ -72,44 +72,60 @@
                         </div>
                       </td>
                       <td width="30"></td>
-                      <!-- <td width="80">治疗日期:</td>
-                    <td width="120">
-                      <div class="under-line">
-                        &nbsp;<span>{{
-                          getTime(record.schedule_date, "{y}-{m}-{d}")
-                        }}</span>
+                      
+                    </tr>
+                  </tbody>
+                </table>
+                <table class="table-box" style="margin-top: 10px;">
+                  <tbody>
+                    <tr>
+                      <td width="90">传染病标志:</td>
+                      <td width="80">
+                        <div class="under-line">&nbsp;{{InfectiousDiseases?InfectiousDiseases:'阴性'}}</div>
+                      </td>
+                      <td width="10"></td>
+                      <td width="110">上次透析时间:</td>
+                      <td width="120">
+                        <div class="under-line">&nbsp;
+                          <!-- {{last_order?getTime(last_order.dialysis_date, "{y}-{m}-{d}"):''}} -->
+                        </div>
+                      </td>
+                      <td width="10"></td>
+                      <td width="120">本次透析时间:
+                        
+                      </td>
+                      <td width="120">
+                        <div class="under-line">&nbsp;
+                          <span style="width:30px;text-align:left;">
+                          {{ record.assessment_after_dislysis.actual_treatment_hour ? 
+                          record.assessment_after_dislysis.actual_treatment_hour : '' }}
+                        </span>h
+                        <span style="width:30px;text-align:left;">
+                          {{ record.assessment_after_dislysis.actual_treatment_minute ? 
+                          record.assessment_after_dislysis.actual_treatment_minute : '' }}
+                        </span>min
                       </div>
-                    </td> -->
+                      </td>
+                      <td width="10"></td>
+                      <td width="80">透析次数:
+                      </td>
+                      <td width="120">
+                        <div class="under-line">&nbsp;
+                          {{
+                            record.patient.total_dialysis +
+                            record.patient.user_sys_before_count
+                              ? record.patient.total_dialysis +
+                                record.patient.user_sys_before_count
+                              : "/"
+                          }}
+                        </div>
+                      </td>
+                      <td></td>
                     </tr>
                   </tbody>
                 </table>
-                <!-- <table class="table-box" style="margin-top: 10px;">
-          <tbody>
-            <tr>
-              <td width="90">传染病标志:</td>
-              <td width="80">
-                <div class="under-line">{{InfectiousDiseases?InfectiousDiseases:'阴性'}}</div>
-              </td>
-              <td width="10"></td>
-              <td width="110">上次透析时间:</td>
-              <td width="120">
-                <div class="under-line">&nbsp;{{last_order?getTime(last_order.dialysis_date, "{y}-{m}-{d}"):''}}</div>
-              </td>
-              <td width="10"></td>
-              <td width="110">本次透析时间:</td>
-              <td width="120">
-                <div class="under-line">&nbsp;{{ queryParams.xtdate }}</div>
-              </td>
-              <td width="10"></td>
-              <td width="80">透析次数:</td>
-              <td width="120">
-                <div class="under-line">&nbsp;{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</div>
-              </td>
-              <td></td>
-            </tr>
-          </tbody>
-        </table> -->
-                <table class="table-box" style="margin-top: 10px">
+               
+                <table class="table-box" style="margin-top: 10px;margin-bottom: 10px;" >
                   <tbody>
                     <tr>
                       <td width="80">床位号:</td>
@@ -566,8 +582,8 @@
                         <table class="table-box">
                           <tbody>
                             <tr>
-                              <td width="70">通路类型:</td>
-                              <td width="210">
+                              <td width="69">通路类型:</td>
+                              <td width="212">
                                 <div>
                                   <label-box
                                     :isChecked="
@@ -603,7 +619,7 @@
                                 </div>
                               </td>
 
-                              <td width="70">穿刺方法:</td>
+                              <td width="68">穿刺方法:</td>
                               <td width="180">
                                 <div>
                                   <label-box
@@ -670,8 +686,8 @@
                                 </div>
                               </td>
 
-                              <td width="50">导管:</td>
-                              <td width="130">
+                              <td width="40">导管:</td>
+                              <td width="120">
                                 <div>
                                   <label-box
                                     :isChecked="
@@ -3196,6 +3212,7 @@ import { jsGetAge, uParseTime } from "@/utils/tools";
 import { getDataConfig } from "@/utils/data";
 import LabelBox from "../printItem/LabelBox";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+// import { getDialysisRecord } from '@/api/dialysis';
 import print from "print-js";
 export default {
   name: "BatchPrintOrder",
@@ -3254,6 +3271,12 @@ export default {
         "心衰",
         "腹痛",
       ],
+      // queryParams: {
+      //   xtdate: '',
+      //   xtno: '',
+      //   patient_id:0,
+      // },
+      // last_order:{}
     };
   },
   created() {
@@ -3292,16 +3315,18 @@ export default {
         dialysateFormulationOptions[key];
     }
 
-    //   const xtdate = this.$route.query && this.$route.query.xtdate;
-    //   const xtno = this.$route.query && this.$route.query.xtno;
-    //   if (typeof (xtdate) == "string" && xtdate.length > 0 && typeof (xtno) == "string" && xtno.length > 0) {
-    //     this.queryParams.xtdate = xtdate;
-    //     this.queryParams.xtno = xtno;
-    //     this.getDialysisRecord();
-    //   } else {
-    //     this.$message.error("参数不齐");
-    //     return false;
-    //   }
+      // const xtdate = this.$route.query && this.$route.query.xtdate;
+      // const xtno = this.$route.query && this.$route.query.xtno;
+      // console.log('zxcvbvbvb');
+      // // if (typeof (xtdate) == "string" && xtdate.length > 0 && typeof (xtno) == "string" && xtno.length > 0) {
+      //   console.log('asdxvbcvbxc');
+      //   this.queryParams.xtdate = xtdate;
+      //   this.queryParams.xtno = xtno;
+      //   this.getDialysisRecord();
+      // } else {
+      //   this.$message.error("参数不齐");
+      //   return false;
+      // }
   },
   mounted() {
     console.log(this.records);
@@ -3651,10 +3676,12 @@ export default {
       }
     },
     printAction: function () {
+     
       const style =
         '@media print { .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 14px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 0 0; page-break-after: always; } .print_page_main_content .order-yy-name { margin: auto; text-align: center; font-size: 20px; letter-spacing: 5px;} .print_page_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .row { font-size: 14px; line-height: 20px; padding: 5px 0; } .inline_block { display: inline-block; } .under_line { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .flex { display: -webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex; align-items: center; -webkit-align-items: center; box-align: center; -moz-box-align: center; -webkit-box-align: center; text-align: center; -webkit-justify-content: space-between; justify-content: space-between; -moz-box-pack: space-between; -webkit--moz-box-pack: space-between; box-pack: space-between; } .print_page_main_content .proj_table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } .print_page_main_content .proj_table tbody tr td { border: 1px solid; font-size: 16px; padding: 10px 8px; line-height: 30px; } .print_page_main_content .proj_table .inside_table { width: 100%; border: hidden; border-collapse: collapse; } .print_page_main_content .proj_table .inside_table tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 8px 5px; line-height: 25px; } }.es-img{height: 20px; }.advice-name{text-align: left !important;line-height: 16px !important;}.advice-children{display:flex;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 2px;position: absolute;}';
       const style2 =
-        '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}';
+       // font-weight:600;
+        '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}';
       printJS({
         printable: "print_content",
         type: "html",
@@ -3778,6 +3805,21 @@ export default {
         return record[key] == target_value;
       }
     },
+    // getDialysisRecord() {
+    //   this.loading = true
+    //   this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
+    //   getDialysisRecord(this.queryParams).then(response => {
+    //     if (response.data.state === 1) {
+          
+    //       this.last_order = response.data.data.last_order
+    //       console.log('sdfas',this.last_order);
+    //     } else {
+    //       this.loading = false
+    //       this.$message.error('请求数据失败')
+    //       return false
+    //     }
+    //   })
+    // },
   },
 };
 </script>
@@ -3802,7 +3844,7 @@ export default {
   text-align: center;
   font-size: 23px;
   line-height: 40px;
-  font-weight: 500;
+  /* font-weight: 500; */
 }
 
 .row {
@@ -3974,7 +4016,7 @@ export default {
 
 .dialysis-print-order .order-title {
   margin: auto;
-  font-weight: 600;
+  /* font-weight: 600; */
   text-align: center;
   font-size: 22px;
   padding: 10px 20px 20px 20px;
@@ -4014,7 +4056,7 @@ export default {
 }
 
 .dialysis-print-order .radio-lebel-box {
-  font-weight: 400;
+  /* font-weight: 400; */
   cursor: pointer;
 }
 
@@ -4125,7 +4167,7 @@ export default {
 
 .dialysis-print-order .order-title {
   margin: auto;
-  font-weight: 600;
+  /* font-weight: 600; */
   text-align: center;
   font-size: 22px;
   padding: 10px 20px 20px 20px;
@@ -4165,7 +4207,7 @@ export default {
 }
 
 .dialysis-print-order .radio-lebel-box {
-  font-weight: 400;
+  /* font-weight: 400; */
   cursor: pointer;
 }
 

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -130,6 +130,15 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 11">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
       <template v-if="this.template_id == 12">
         <el-button
           size="small"
@@ -219,7 +228,7 @@
           >批量打印</el-button
         >
       </template>
-      <!-- <template v-if="this.template_id == 27">
+      <template v-if="this.template_id == 27">
         <el-button
           size="small"
           icon="el-icon-printer"
@@ -228,7 +237,7 @@
           type="primary"
           >批量打印</el-button
         >
-      </template> -->
+      </template>
       <template v-if="this.template_id == 28">
         <el-button
           size="small"
@@ -392,7 +401,7 @@
           type="primary"
           >批量打印</el-button>
       </template>
-
+      
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -2073,6 +2082,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/eight" });
       } else if (this.template_id == 9) {
         this.$router.push({ path: "/dialysis/print/batch/nine" });
+      }else if (this.template_id == 11) {
+        this.$router.push({ path: "/dialysis/print/batch/Eleven" });
       } else if (this.template_id == 12) {
         this.$router.push({ path: "/dialysis/print/batch/twelve" });
       } else if (this.template_id == 13) {
@@ -2125,7 +2136,7 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/sixtyOne" });
       }else if (this.template_id == 62) {
         this.$router.push({ path: "/dialysis/print/batch/sixtyTwo" });
-      }else if (this.template_id == 65) {//dialysis/print/batch/sixtyFive
+      }else if (this.template_id == 65) {
         this.$router.push({ path: "/dialysis/print/batch/sixtyFive" });
       }
 

src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue

@@ -212,24 +212,26 @@
 
       </el-form-item>
 
-      <el-form-item
-        label-width="150px"
-        label="跌倒风险预防措施: "
-        :prop="isName('跌倒风险预防措施')"
-        :rules="isCheckmust('跌倒风险预防措施')"
-        v-if="isShow('跌倒风险预防措施')"
-      >
-        <!-- isFalldown prop="precautionTwo" @change="precautionchange" isCheckmust('跌倒风险预防措施') :prop="isName('跌倒风险预防措施')" :rules="isCheckmust('跌倒风险预防措施')"
-           [{required: true, message: '请选择跌倒风险预防措施', trigger: 'change'}]-->
-        <el-checkbox-group v-model="precautionTwo" @change="precautionchange">
-          <el-checkbox
-            v-for="item in precaution_arr"
-            :label="item.name"
-            :key="item.id"
-            >{{ item.name }}</el-checkbox
-          >
-        </el-checkbox-group>
-      </el-form-item>
+      <div style="position: relative;">
+        <span v-if="isrequired" style="color: red;position: absolute;top: 10px;">*</span>
+        <el-form-item
+          label-width="138px"
+          label="跌倒风险预防措施: "
+          prop="precautionTwo"
+          :rules="isCheckmust('跌倒风险预防措施')"
+          v-if="isShow('跌倒风险预防措施')"
+          style="display: inline-block;"
+        >
+          <el-checkbox-group v-model="precautionTwo" @change="precautionchange" >
+            <el-checkbox
+              v-for="item in precaution_arr"
+              :label="item.name"
+              :key="item.id"
+              >{{ item.name }}</el-checkbox
+            >
+          </el-checkbox-group>
+        </el-form-item>
+      </div>
 
       <el-form-item
         label-width="200px"
@@ -499,8 +501,9 @@ export default {
     },
     // 复选框跌倒风险措施
     precautionchange(){
-
+      console.log('12345566',this.precautionTwo.length);
       if(this.precautionTwo.length>0){
+        console.log('asdfasdfas',this.precautionTwo.length);
         this.$refs.receiveTreatmentAsses.clearValidate('precautionTwo');
       }
     },
@@ -607,7 +610,6 @@ export default {
             if(this.precautionTwo.length<=0){
               this.isrequired=false
               return [{ required: true, message: `请输入${name}`,trigger: ['blur','change'] }];
-
             }
             this.precautionchange()
             this.isrequired=true

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1625,8 +1625,7 @@ export default {
           scanStyles: false,
         });
       } else if (
-        this.org_template_info.template_id == 2
-       
+        this.org_template_info.template_id == 2     
       ) {
         printJS({
           printable: "dialysis-print-box-1",
@@ -1908,16 +1907,14 @@ export default {
           style: style,
           scanStyles: false,
         });
-      } else if (
-        this.org_template_info.template_id == 43
-      ) {
+      } else if (this.org_template_info.template_id == 43) {
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
           style: style2,
           scanStyles: false,
         });
-      }else if (this.org_template_info.template_id == 44) {
+      } else if (this.org_template_info.template_id == 44) {
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -378,7 +378,6 @@
                             }}
                             </span>
                         </td >
-
                         <td style=" ">
                             <span v-if="getTime(monitor.operate_time) != ''">
                                 &nbsp;{{
@@ -444,10 +443,12 @@
 
                         <!-- <td style=" "> {{ getTime(monitor.operate_time, "{h}:{i}") }}</td> -->
                         <td style=" ">
-                          <span style="word-break: break-all;word-wrap: break-word;">
-
-                              {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{monitor.result}}
-                          </span>
+                          <!-- <span style="display:inline-block;word-break: break-all;word-wrap: break-word; text-align: left;text-indent:2em;">
+                            {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{monitor.result}}
+                          </span> -->
+                          <div style="word-break: break-all;word-wrap: break-word; text-align: left;text-indent:2em;">
+                            {{ monitor.symptom }} {{ monitor.dispose }} {{monitor.result}}
+                          </div>
                         </td>
                         <!-- <td>
                           <span v-if="
@@ -481,7 +482,6 @@
                           />
                         </td> -->
                       </tr>
-                    
                   </table>
                 </td>
               </tr>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -2079,6 +2079,7 @@ export default {
             this.AlPanel = this.anticoagulantsConfit[thisALID]
           }
           this.last_order = response.data.data.last_order
+          console.log('123454576576',response.data.data);
           this.advices = response.data.data.advices
           this.monitors = response.data.data.monitors
           console.log('透析监测', this.monitors)
@@ -2375,7 +2376,9 @@ export default {
 
     const xtdate = this.$route.query && this.$route.query.xtdate
     const xtno = this.$route.query && this.$route.query.xtno
+    
     if (typeof xtdate === 'string' && xtdate.length > 0 && typeof xtno === 'string' && xtno.length > 0) {
+      
       this.queryParams.xtdate = xtdate
       this.queryParams.xtno = xtno
       this.getDialysisRecord()

src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue

@@ -16,7 +16,7 @@
                 <div v-if="list.otherCostTotal">其他费 {{ list.otherCostTotal }}</div>
                 <div v-if="list.materialCostTotal">材料费 {{ list.materialCostTotal }}</div>
             </div>
-            <div :style="{position: 'absolute',top:(190 + (index * 660))  + 'px',left:300+ 'px'}">
+            <div :style="{position: 'absolute',top:(190 + (index * 660))  + 'px',left:280+ 'px'}">
                 <div v-for="item in list.order_info.slice(index * 10,(index * 10) + pageArr[index])">
                     <span style="display:inline-block;width:200px;">
                         <span v-if="item.advice.id == 0">

src/xt_pages/stock/stockInOrderAdd.vue

@@ -58,6 +58,7 @@
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
                     style="width:160px;"
+                    :popper-append-to-body="true"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -1013,7 +1014,8 @@
     background: #6fb5fa;
   }
 .el-autocomplete-suggestion{
-    width: 400px !important;
+    /* width: 400px !important; */
+    width: auto !important;
   }
 
 

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -97,13 +97,28 @@
                     placeholder="请输入耗材名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
-                    style="width:150px;"
+                    :popper-append-to-body="true"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
                     <div class="name">{{item.good_name +"  " +item.specification_name + "  "+  item.manufacturer}}</div>
                   </template>
-                 </el-autocomplete>
+                </el-autocomplete>
+
+                 <!-- <el-autocomplete
+                    v-model="scope.row.good_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="true"
+                    placeholder="请输入耗材名称"
+                    @select="handleSelect"
+                    :popper-append-to-body="true"
+                  >
+                  
+                  <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{item.good_name +"  " +item.specification_name + "  "+  item.manufacturer}}</div>
+                  </template>
+                 </el-autocomplete> -->
               </el-form-item>
             </template>
           </el-table-column>
@@ -111,10 +126,7 @@
             <template slot="header" slot-scope="scope">
               <span>耗材类型</span>
             </template>
-
             <template slot-scope="scope">
-
-
               <el-form-item style="padding-top: 20px">
                 <el-input
                   placeholder="请输入耗材类型"
@@ -125,7 +137,6 @@
             </template>
           </el-table-column>
 
-
           <el-table-column width="140" align="center">
             <template slot="header" slot-scope="scope">
               <span>规格&单位<span style="color: red">*</span></span>
@@ -230,8 +241,6 @@
             </template>
           </el-table-column>
 
-
-
           <el-table-column label="总价"  width="80" align="center">
             <template slot-scope="scope">
               {{ calculate(scope.row.price * scope.row.count) }}
@@ -312,8 +321,6 @@
             </template>
           </el-table-column>
 
-
-
           <el-table-column label="备注"  width="150" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
@@ -1057,8 +1064,9 @@ export default {
 .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
   background: #6fb5fa;
 }
-s.el-autocomplete-suggestion{
-  width: 400px !important;
+.el-autocomplete-suggestion{
+  // width: 400px !important;
+  width: auto !important;
 }
 ::-webkit-scrollbar{
   height: 20px;

src/xt_pages/user/components/PatientSidebar.vue

@@ -203,7 +203,68 @@ export default {
             },
           ]
         },
-
+        {
+          name: '5',
+          label: '评估工具',
+          children: [
+            {
+              name: '5-1',
+              label: '跌倒评估'
+            },
+            {
+              name: '5-2',
+              label: '小儿跌倒风险评估'
+            },
+            {
+              name: '5-3',
+              label: '压疮风险评估'
+            },
+            {
+              name: '5-4',
+              label: 'OH压疮评估'
+            },
+            {
+              name: '5-5',
+              label: '日常生活能力评估'
+            },
+            {
+              name: '5-6',
+              label: '导管脱离风险评估'
+            },
+            {
+              name: '5-7',
+              label: 'RASS及疼痛评估'
+            },
+            {
+              name: '5-8',
+              label: '营养状况评估'
+            },
+            {
+              name: '5-9',
+              label: '约束告知单'
+            },
+            {
+              name: '5-10',
+              label: '心理评估'
+            },
+            {
+              name: '5-11',
+              label: '瘙痒评估'
+            },
+            {
+              name: '5-12',
+              label: '血液透析患者评估'
+            },
+            {
+              name: '5-13',
+              label: 'Glasgow昏迷评分量表'
+            },
+            {
+              name: '5-14',
+              label: '肌力评估表'
+            },
+          ]
+        },
       ],
       name:""
     }
@@ -245,27 +306,64 @@ export default {
         this.$router.push({
           path: '/patients/patient/' + this.id + '/proeducation'
         })
-      }else if (name == '1-7'){
+      } else if (name == '1-7'){
         this.$router.push({path:'/patients/patient/'+this.id+'/vascularAccess'})
-      }else if (name == '1-8'){
+      } else if (name == '1-8'){
         this.$router.push({path:'/patients/patients/'+this.id+'/inspectionInfectious'})
-      }else if (name == '1-9'){
+      } else if (name == '1-9'){
         this.$router.push({path:'/patient/patient/'+this.id+'/templateSummary'})
-      }else if(name == '1-10'){
+      } else if(name == '1-10'){
         this.$router.push({path:'/patient/patient/'+this.id+'/hospitalSummary'})
-      }else if(name == '1-11'){
+      } else if(name == '1-11'){
         this.$router.push({path:'/patient/patient/'+this.id+'/firstDisease'})
-      }else if(name == '3-1'){
+      } else if(name == '3-1'){
         this.$router.push({ path: '/patients/sickhistory?id=' + this.id })
 
       } else if(name == '3-2'){
         this.$router.push({path:'/patients/physicalexamination?id='+this.id})
 
-      }else if(name == '4-1'){
+      } else if(name == '4-1'){
         this.$router.push({path:'/patients/inspection_check?id='+this.id})
-      }else if(name == '4-3'){
+      } else if(name == '4-3'){
         this.$router.push({path:'/patients/ktv?id='+this.id})
-      }
+      } else if (name == '5-1') {
+        this.$router.push({
+          path: '/patients/patient/'+ this.id +'/Fallassessment'
+        })
+      } else if (name == '5-2') {
+        this.$router.push({
+          path: '/patients/patient/' + this.id + '/pediatricFallAssessment'
+        })
+      } else if (name == '5-3') {
+        this.$router.push({
+          path: '/patients/patient/' + this.id + '/pressuresore'
+        })
+      } else if (name == '5-4') {
+        this.$router.push({
+          path: '/patients/patient/' + this.id + '/OHpressuresore'
+        })
+      } else if (name == '5-5'){
+        this.$router.push({path:'/patients/patient/'+this.id+'/dailyLife'})
+      } else if (name == '5-6'){
+        this.$router.push({path:'/patients/patient/'+this.id+'/Cathetershedding'})
+      } else if (name == '5-7'){
+        this.$router.push({path:'/patients/patient/'+this.id+'/RassAssessment'})
+      } else if(name == '5-8'){
+        this.$router.push({path:'/patients/patient/'+this.id+'/nourishmentAssessment'})
+      } else if(name == '5-9'){
+        this.$router.push({path:'/patients/patient/'+this.id+'/Constraintnotification'})
+      } else if(name == '5-10'){
+        this.$router.push({ path: '/patients/patient/' + this.id+'/mindAssessment'})
+      } else if(name == '5-11'){
+        this.$router.push({path:'/patients/patient/' + this.id+'/pruritusAssessment'})
+
+      } else if(name == '5-12'){
+        this.$router.push({path:'/patients/patient/' + this.id+'/hemodialysis'})
+      } else if(name == '5-13'){
+        this.$router.push({path:'/patients/patient/' + this.id+'/Glasgow'})
+      } else if(name == '5-14'){
+        this.$router.push({path:'/patients/patient/' + this.id+'/Muscleforce'})
+      } 
     },
     changePatient(value) {
       console.log(value)
@@ -397,7 +495,7 @@ export default {
       }
        else if (patientKey == '1-5') {
         this.$router.push({ path: '/patients/rescue?id=' + this.id })
-      }else if (patientKey == '2-1') {
+      } else if (patientKey == '2-1') {
         this.$router.push({
           path: '/patients/patient/' + this.id + '/dialysisSolution'
         })
@@ -413,7 +511,7 @@ export default {
         this.$router.push({
           path: '/patients/patient/' + this.id + '/proeducation'
         })
-      }else if (patientKey == '3-1') {
+      } else if (patientKey == '3-1') {
         this.$router.push({ path: '/patients/sickhistory?id=' + this.id })
       }
 

src/xt_pages/user/dialysisSolution.vue

@@ -243,9 +243,6 @@
 
     </div>
 
-
-
-
     <el-dialog
       :title="isEdit ? '编辑透析处方' : '新增透析处方'"
       :visible.sync="dialogVisible"
@@ -806,9 +803,6 @@
       v-on:dialog-cancle="innerDialogCancle">
     </multi-select-box>
 
-
-
-
     <el-dialog
       :visible.sync="startDialogVisible"
       width="1010px"

src/xt_pages/user/hospitalSummary.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="patient-container">
-    <patient-sidebar :id="patient_id" defaultActive="1-9"></patient-sidebar>
+    <patient-sidebar :id="patient_id" defaultActive="1-10"></patient-sidebar>
     <div v-loading="loading">
       <div class="patient-app-container advice-container app-container">
 

src/xt_pages/user/inspection.vue

@@ -167,12 +167,24 @@
             <el-row>
               <template v-for="(item, index) in items">
                 <el-col :span="7" :key="index">
-                  <div style="width: 400px">
+                  <div style=" margin: 5px;">
                     <el-row>
-                      <img  :src="item.value" alt="">
+                      <el-col :span="8" style="width: 100%;height: 100%;" >
+                        <div @click="imgClicks(item.value)">
+                          <el-tooltip
+                            class="item"
+                            effect="dark"
+                            :hide-after="2000"
+                            content="点击查看大图"
+                            placement="top-start"
+                            >
+                              <img :src="item.value" alt="">
+                            </el-tooltip>
+                        </div>
+                      </el-col>
                     </el-row>
                     <el-row>
-                      <div style="word-break: break-all;word-wrap: break-word">{{item.item_name}}</div>
+                      <div style="word-break: break-all;word-wrap: break-word; text-align:center">{{item.item_name}}</div>
                     </el-row>
                   </div>
                 </el-col>
@@ -375,12 +387,19 @@
         </el-button>
       </div>
     </el-dialog>
+
+    <el-image-viewer
+        v-if="showViewer"
+        :on-close="closeViewer"
+        :url-list="imgs"
+      ></el-image-viewer>
   </div>
 
 </template>
 
 <script>
 import PatientSidebar from './components/PatientSidebar'
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 import { getToken } from '@/api/qiniu'
 
 import {
@@ -396,9 +415,11 @@ import { getFileExtension, uParseTime } from '@/utils/tools'
 
 export default {
   name: 'Inspection',
-  components: { PatientSidebar },
+  components: { PatientSidebar, ElImageViewer},
   data() {
     return {
+      showViewer:false,
+      imgs:[],
       total: 0,
       qiniuDomain: 'https://images.shengws.com/',
       isPic:false,
@@ -443,6 +464,15 @@ export default {
     }
   },
   methods: {
+    imgClicks(val){
+      console.log('asdasgg',val);
+      this.imgs = []
+      this.imgs.push(val)
+      this.showViewer = true
+    },
+    closeViewer(){
+      this.showViewer = false
+    },
     beforeAvatarUpload(file) {
       // const isJPG = file.type === "image/jpeg";
       var fileType = file.type
@@ -633,7 +663,8 @@ export default {
 
       }
 
-    }, openPic() {
+    }, 
+    openPic() {
       if (this.project == null) {
         this.$message.error('请先选择项目')
         return false
@@ -888,7 +919,8 @@ export default {
           return false
         }
       })
-    }, submitEditPicNew() {
+    }, 
+    submitEditPicNew() {
       if (this.form.imgs.length == 0) {
         this.$message.error('未上传图片')
         return false
@@ -925,7 +957,8 @@ export default {
         })
       this.formLoading = false
 
-    },deletePic(item,index){
+    },
+    deletePic(item,index){
       if(item.id == 0){
         this.form.imgs.splice(index,1)
       }else{

src/xt_pages/user/patient.vue

@@ -162,7 +162,7 @@
       </span>
     </el-dialog>
 
-    </div>
+  </div>
 
 </template>
 

src/xt_pages/workforce/appointment.vue

@@ -130,7 +130,6 @@
                         :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone"
                          title="" @event1="changePartition"
                          @event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay">
-
         <div class="position">
           <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
           <div>

src/xt_pages/workforce/components/editTableData.vue

@@ -131,14 +131,17 @@
             :header-cell-style="{
             backgroundColor: 'rgb(245, 247, 250)',
             color: '#606266',
+            border: '1px solid aqua',
           }"
             :fit="true"
             :data="scheduleZone"
             @cell-click="clickThis"
+            @cell-mouse-enter="hoverMouse"
             @cell-dblclick="dblclickThis"
             :span-method="objectSpanMethod"
             :summary-method="getSummaries"
             :cell-class-name="cellClass"
+            :cell-style ='cellstyle'
             :row-class-name="tableRowClassName"
             show-summary
             sum-text="总数"
@@ -152,6 +155,7 @@
               min-width="60"
               align="center"
               fixed
+              style="border-bottom: 1px solid aqua;"
           ></el-table-column>
           <el-table-column
               prop="cut"
@@ -159,8 +163,8 @@
               min-width="50"
               align="center"
               fixed
-          >
-        </el-table-column>
+              style="border-bottom: 1px solid aqua;"
+          ></el-table-column>
           <el-table-column
               :label="'周一 (' + weekTitle[0] + ')'"
               v-if="isShowOne"
@@ -1686,7 +1690,7 @@
       </span>
     </el-dialog>
     
-</div>
+  </div>
 </template>
 
 <script>
@@ -1917,7 +1921,7 @@ export default {
       partitions: [],
       partitions_two: [],
       jihaos_two: [],
-
+      subzone:[],
       jihaos: [],
       weekTitle: ["", "", "", "", "", "", ""],
       isShowOne: true,
@@ -3392,7 +3396,7 @@ export default {
           return false;
         }
         var partitions = response.data.data.partitions;
-
+        this.subzone = response.data.data.partitions;
         this.theWeek.thisWeek = response.data.data.theWeek;
 
         this.theWeek.lastWeek = this.theWeek.thisWeek - 1;
@@ -3654,7 +3658,16 @@ export default {
         this.scheduleZone.sort(this.compare("sort"));
       });
     },
-
+    // 高亮
+    hoverMouse(row, column, cell, event) {
+      console.log('sdf12344565');
+      if (row[column.property].schedule_id > 0) {
+        let patient_id = row[column.property].patient_id
+        this.patient_id_hover = patient_id
+      } else {
+        this.patient_id_hover = -1
+      }
+    },
     // 单元格的 className 的回调方法
     cellClass({ row, column, rowIndex, columnIndex }) {
       // 传染病区机器橙色背景
@@ -3662,10 +3675,19 @@ export default {
         //
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
+      if(columnIndex==1 ){  
+        return 'border_bott ' 
+      }
+      if(columnIndex==0){
+        return 'border_left'
+      }
       if (columnIndex == 0 || columnIndex == 1 || columnIndex == 23) {
         return "";
       } else {
         if (this.weekTime == "lastWeek") {
+          if(column.label == '晚' ){
+            return 'evening_border schedule-table-cell-disable'
+          }
           if (
               row[column.property].patient_id > 0 &&
               row[column.property].patient_id == this.patient_id_hover
@@ -3683,11 +3705,15 @@ export default {
                 row[column.property].patient_id == this.patient_id_hover
             ) {
               return "hover-td schedule-table-cell-disable";
-            } else {
-              return "schedule-table-cell-disable";
+            } 
+            if(column.label == '晚'){
+              return 'evening_border schedule-table-cell-disable'
             }
-            // return "schedule-table-cell-disable";
+            return "schedule-table-cell-disable";
           } else {
+            if(column.label == '晚' ){
+                return 'evening_border'
+            }
             if (
                 row[column.property].patient_id > 0 &&
                 row[column.property].patient_id == this.patient_id_hover
@@ -3698,6 +3724,9 @@ export default {
             }
           }
         }else{
+          if(column.label == '晚' ){
+                return 'evening_border '
+          }
           if (
               row[column.property].patient_id > 0 &&
               row[column.property].patient_id == this.patient_id_hover
@@ -3710,6 +3739,18 @@ export default {
       }
       return "";
     },
+    // 单元格的 style 的回调方法
+    cellstyle({ row, column, rowIndex, columnIndex }){
+      // 分区蓝线
+      for(let i=0;i<this.subzone.length;i++){
+        const subslice=this.subzone[i].jihaos.slice(-1)
+        // console.log('这是row',subslice);
+        if(row.zone_id==subslice[0].zone_id && row.jihao_id == subslice[0].id ){
+          // console.log('33333333333');
+          return 'border-top: 1px solid aqua;'
+        }
+      } 
+    },
     // 单元格的患者名称的回调方法
     patientClass({row,column, rowIndex,columnIndex}){
       if(this.cur_info.patient_id == row.id){
@@ -4847,40 +4888,40 @@ export default {
     },
     // 单击选中患者
     clickThis(row, column, cell, event) {
-        if (row[column.property].schedule_id > 0) {
-            this.cur_info.patient_id=row[column.property].patient_id
-            this.cur_info.mode_id=row[column.property].mode_id
-            this.patient_id_hover = this.cur_info.patient_id;
-            this.cur_info.patient_name = row[column.property].patient
-            this.cur_info.mode_name = row[column.property].mode_name
-            // console.log('row的数据',row[column.property]);
+      if (row[column.property].schedule_id > 0) {
+          this.cur_info.patient_id=row[column.property].patient_id
+          this.cur_info.mode_id=row[column.property].mode_id
+          this.patient_id_hover = this.cur_info.patient_id;
+          this.cur_info.patient_name = row[column.property].patient
+          this.cur_info.mode_name = row[column.property].mode_name
+          // console.log('row的数据',row[column.property]);
 
-        } else {
-          var week = this.weekDay(column.property);
-        if (week[0] == -1 || week[1] == -1) {
-          return false;
-        }
-        if (this.toDay > this.weekDays[week[0] - 1]) {
-          return false;
-        }
-        this.currentData.schedule_date = this.weekDays[week[0] - 1];
-        this.currentData.schedule_type = week[1];
-        this.currentData.bed_id = row.jihao_id;
-        this.currentData.partition_id = row.zone_id;
-        this.currentData.schedule_week = week[0];
-        this.currentData.type_name = this.dayType(week[1]);
-        this.currentData.zone_name = row.area;
-        this.currentData.bed_name = row.cut;
-        this.currentData.partition_type = row.zone_type;
-          this.patient_id_hover = -1;
-          this.currentData.mode_id = 1;
-          this.currentData.id = 0;
-          this.currentData.patient_id = 0;
-          this.currentData.patient = "";
-          this.currentData.contagions = [];
-          this.getSchedulePatients();
-          this.dialogTableVisible = true;
-        }
+      } else {
+        var week = this.weekDay(column.property);
+      if (week[0] == -1 || week[1] == -1) {
+        return false;
+      }
+      if (this.toDay > this.weekDays[week[0] - 1]) {
+        return false;
+      }
+      this.currentData.schedule_date = this.weekDays[week[0] - 1];
+      this.currentData.schedule_type = week[1];
+      this.currentData.bed_id = row.jihao_id;
+      this.currentData.partition_id = row.zone_id;
+      this.currentData.schedule_week = week[0];
+      this.currentData.type_name = this.dayType(week[1]);
+      this.currentData.zone_name = row.area;
+      this.currentData.bed_name = row.cut;
+      this.currentData.partition_type = row.zone_type;
+        this.patient_id_hover = -1;
+        this.currentData.mode_id = 1;
+        this.currentData.id = 0;
+        this.currentData.patient_id = 0;
+        this.currentData.patient = "";
+        this.currentData.contagions = [];
+        this.getSchedulePatients();
+        this.dialogTableVisible = true;
+      }
     },
     // 双击有内容的单元格
     dblclickThis(row, column, cell, event){
@@ -5827,7 +5868,9 @@ textarea{
   white-space: normal !important;
 
 }
-
+// .el-table--medium td, .el-table--medium th {
+//     padding: 5px 0 !important;
+// }
 // 动态样式
 .schedule-table-cell-disable {
   background-color: rgb(245, 245, 245) !important;
@@ -5892,6 +5935,17 @@ textarea{
 .infectious {
   color: red !important;
 }
+.border_bott{
+  border-left: 1px solid aqua !important;
+  border-right: 1px solid aqua !important;
+}
+.border_left{
+  border-left: 1px solid aqua !important;
+}
+ 
+.evening_border{
+  border-right: 1px solid aqua !important;
+}
 .Infectious_disease{
   background-color: red !important;
   color: white;

src/xt_pages/workforce/components/tableData.vue

@@ -230,7 +230,8 @@
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
+          color: '#606266',
+          border: '1px solid aqua',
         }"
         :fit="true"
         :data="scheduleZone"
@@ -239,35 +240,39 @@
         @cell-mouse-enter="hoverMouse"
         :summary-method="getSummaries"
         show-summary
-        :row-class-name="tableRowClassName"
         :cell-class-name="cellClass"
+        :cell-style ='cellstyle'
         sum-text="总数"
         :height="tableContainHeight"
         ref="table"
         style="table-layout: fixed;"
       >
-
+<!--  -->
         <el-table-column
           prop="area"
           label="分区"
           width="50"
           align="center"
           fixed
-        ></el-table-column>
+          style="border-bottom: 1px solid aqua;"
+        >
+        </el-table-column>
         <el-table-column
           prop="cut"
           label="机号"
           align="center"
           min-width="40"
           fixed
+          style="border-bottom: 1px solid aqua;"
         ></el-table-column>
         <el-table-column
           :label="' 周一(' + weekTitle[0] + ')'"
           v-if="isShowOne"
           align="center"
+          
         >
         <!-- :width="flexColumnWidth('Mon_M',scheduleZone)" -->
-          <el-table-column  prop="Mon_M" label="上" min-width="40" align="center"  v-if="isShowShangWu">
+          <el-table-column  prop="Mon_M" label="上" min-width="40" align="center"  v-if="isShowShangWu" >
             <schedule-item
               slot-scope="scope"
               :schedule-detail="scope.row.Mon_M"
@@ -285,7 +290,7 @@
               :schedulMode="modename_value"
             ></schedule-item>
           </el-table-column>
-          <el-table-column prop="Mon_N" label="晚" min-width="40" align="center"  v-if="isShowWanShang">
+          <el-table-column prop="Mon_N" label="晚" min-width="40" align="center"  v-if="isShowWanShang" >
             <schedule-item
               slot-scope="scope"
               :schedule-detail="scope.row.Mon_N"
@@ -793,6 +798,7 @@ export default {
      // scheduleZone: this.scheduleZoneProp,
       scheduleZoneRow: -1,
       partitions: [],
+      subzone:[],
       jihaos: [],
       weekTitle: ["", "", "", "", "", "", ""],
       weekList: ["", "", "", "", "", "", ""],
@@ -808,7 +814,6 @@ export default {
         mode_id: 0,
         type_name: "",
         bed_name: "",
-
         partition_type: 0,
         contagions: [],
         patient: ""
@@ -839,15 +844,11 @@ export default {
         ],
         bed_id: [{ required: true, message: "请选择透析机", trigger: "blur" }]
       },
-
       weekday: 0,
-
       creating_schedule: false,
       changing_mode: false,
       changing_bed: false,
-
       tableHeight: document.documentElement.clientHeight,
-
       origin_schedules: [],
       origin_device_numbers: [],
       zone_device_map: {},
@@ -1074,8 +1075,10 @@ export default {
           if (response.data.state == 0) {
             return false
           }
-          console.log("触发232332323232",response.data.data)
+          // console.log("触发232332323232",response.data.data)
           var partitions = response.data.data.partitions
+          this.subzone = response.data.data.partitions
+          // this.subzone.push(response.data.data.partitions)
           console.log("partitions",partitions)
           this.theWeek.thisWeek = response.data.data.theWeek
           // this.theWeek.historyWeek=this.theWeek.thisWeek - 2
@@ -1326,18 +1329,27 @@ export default {
           console.log("34455555566666",this.scheduleZone)
         })
      },
-
+    //  单元格样式的回调
     cellClass({ row, column, rowIndex, columnIndex }) {
-
+      
       if(columnIndex==1&&row.zone_type!=1){
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
-
+      // 机号蓝线
+      if(columnIndex==1 ){  
+        return 'border_bott ' 
+      }
+      if(columnIndex==0){
+        return 'border_left'
+      }
       if (columnIndex == 0 || columnIndex == 1 || columnIndex == 23) {
         return "";
       } else {
         if (this.weekTime == "lastWeek") {
-          if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover){
+          if(column.label == '晚' ){
+            return 'evening_border schedule-table-cell-disable'
+          }
+          if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover ){
             return 'hover-td schedule-table-cell-disable'
           }else {
             return 'schedule-table-cell-disable'
@@ -1345,36 +1357,53 @@ export default {
           // return "schedule-table-cell-disable";
         } else if (this.weekTime == "thisWeek") {
           var weekday = Math.floor((columnIndex - 2) / 3 + 1);
+          // 判断日期
           if (weekday < this.weekday) {
-            if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover){
+            // console.log('这是row',row);
+            if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover ){
               return 'hover-td schedule-table-cell-disable'
-            }else {
-              return 'schedule-table-cell-disable'
             }
-            // return "schedule-table-cell-disable";
-          }else {
+            if(column.label == '晚'){
+              return 'evening_border schedule-table-cell-disable'
+            }
+            return "schedule-table-cell-disable";
+          }else{
+            // 分日期
+            if(column.label == '晚' ){
+                return 'evening_border'
+            }
             if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover){
               return 'hover-td '
             }else {
               return ''
             }
           }
+        } else {
+          if(column.label == '晚' ){
+            return 'evening_border'
+          }
         }
       }
       return "";
     },
-    // SubmitSearch() {
-    //   this.patientQuery.keywords = this.searchKey;
-    //   this.getSchedulePatients();
-    // },
+    cellstyle({ row, column, rowIndex, columnIndex }){
+      // 分区蓝线
+      for(let i=0;i<this.subzone.length;i++){
+        const subslice=this.subzone[i].jihaos.slice(-1)
+        console.log('这是row',subslice);
+        if(row.zone_id==subslice[0].zone_id && row.jihao_id == subslice[0].id ){
+          // console.log('33333333333');
+          return 'border-top: 1px solid aqua;'
+        }
+      } 
+    },
+   
     changeSearchContagion(id) {
       this.patientQuery.contagion = id;
       this.getSchedulePatients();
     },
-    // changeSearchSchedule(id) {
-    //   this.patientQuery.schedule = id;
-    //   this.getSchedulePatients();
-    // },
+   
+    // 合计
     getSummaries(param) {
       const { columns, data } = param;
       const sums = [];
@@ -2523,6 +2552,7 @@ export default {
         });
     },
     hoverMouse(row, column, cell, event) {
+      // console.log('sdf12344565');
       if (row[column.property].schedule_id > 0) {
         let patient_id = row[column.property].patient_id
         this.patient_id_hover = patient_id
@@ -3239,13 +3269,7 @@ export default {
       this.searchTableVisible = false;
       this.msDialogVisible = true;
     },
-    tableRowClassName({ row, rowIndex }) {
-      if (row.zone_type == 1) {
-        return 'table-row-new-class schedule-table-row'
-      } else {
-        return 'table-row-new-class schedule-table-row backPurple'
-      }
-    },
+   
     // 分区
     getAllZones() {
       getAllZones().then(response => {
@@ -3300,6 +3324,14 @@ export default {
       })();
     };
   },
+  computed: {
+    // 计算属性，为最后一项数据添加边框样式
+    lastItemStyle() {
+      return {
+        border: '1px solid red', // 边框样式
+      };
+    },
+  },
 
 };
 </script>
@@ -3353,7 +3385,7 @@ textarea{
 }
 
 .schedule-table-cell-disable {
-  background-color: rgb(245, 245, 245) !important;
+  background-color: rgb(248, 241, 241) !important;
 }
 
 #table_data {
@@ -3403,7 +3435,20 @@ textarea{
   .Infectious_disease{
     background-color: red !important;
     color: white;
+    border-left: 1px solid aqua;
+    border-right: 1px solid aqua;
+  }
+  .border_bott{
+    border-left: 1px solid aqua;
+    border-right: 1px solid aqua;
+  }
+  .border_left{
+    border-left: 1px solid aqua;
+  }
+  .evening_border{
+    border-right: 1px solid aqua;
   }
+  
 }
 .backPurple{
   color: #f32424 !important;

src/xt_pages/workforce/printOne.vue

@@ -53,7 +53,7 @@
               <tbody>
                 <tr v-for="(it, i) in item.zones" :key="i">
                   <td :width="td_1_width">
-                    <span v-if="hiddenFlag == false">总人数: {{getZonePatient(it.partition_id,item.schedule_type)}}<span v-if="getZonePatient(it.partition_id,item.schedule_type)>0">人</span><br></br></span> 
+                    <span v-if="hiddenFlag == false">总人数: {{getZonePatient(it.partition_id,item.schedule_type)}}<span v-if="getZonePatient(it.partition_id,item.schedule_type)>0">人</span><br/></span> 
                     {{ getZoneName(it.partition_id) }}
                   </td>
                   <td :width="td_3_width" valign="top">

src/xt_pages/workforce/scheduleTablePrint.vue

@@ -1,9 +1,11 @@
 <template>
     <div>
+      
       <el-button style="float:right;" type="primary" @click="printAction">打印</el-button>
 
 <!--      <el-button type="primary" @click="printAction">打印</el-button>-->
-        <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0">
+      <div class="print_main_content">
+        <table v-if="$route.query.week_date ==''" id="scheduleTable" class="scheduleTable" border="1" cellspacing="0">
             <tr>
                 <td rowspan="2">分区</td>
                 <td rowspan="2">机号</td>
@@ -14,7 +16,7 @@
                 <td colspan="3">周五({{ weekTitle[4] }})</td>
                 <td colspan="3">周六({{ weekTitle[5] }})</td>
                 <td colspan="3">周日({{ weekTitle[6] }})</td>
-                <td>总数</td>
+                <td rowspan="2">总数</td>
             </tr>
             <tr>
                 <td>上午</td>
@@ -40,139 +42,304 @@
                 <td>晚上</td>
             </tr>
             <tr v-for="(item,index) in scheduleZone" :key="index">
-                <td style="min-width:50px;">{{ item.area }}</td>
-                <td style="min-width:50px;">{{ item.cut }}</td>
-                <td style="min-width:50px;">
+                <td style="min-width:40px;">{{ item.area }}</td>
+                <td style="min-width:40px;">{{ item.cut }}</td>
+                <td style="min-width:40px;">
                     <span v-if="item.Mon_M.patient_id">
-                        <div>{{ item.Mon_M.patient }} </div>
-                        <div v-if="item.Mon_M.mode_name != 'HD'">
-                            {{ item.Mon_M.mode_name }}
-                     </div>
+                        <span>{{ item.Mon_M.patient }}</span>
+                        <span>{{ item.Mon_M.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
+                <td style="min-width:40px;">
                     <span v-if="item.Mon_A.patient_id">
-                        <div>{{ item.Mon_A.patient }} </div>
-                        <div v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</div>
+                       
+                        <span>{{ item.Mon_A.patient }}</span>
+                        <span>{{ item.Mon_A.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
+                <td style="min-width:40px;">
                     <span v-if="item.Mon_N.patient_id">
-                        <div>{{ item.Mon_N.patient }}</div>
-                        <div v-if="item.Mon_N.mode_name != 'HD'">{{ item.Mon_N.mode_name }}</div>
+                        
+                        <span>{{ item.Mon_N.patient }}</span>
+                        <span>{{ item.Mon_N.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
+                <td style="min-width:40px;">
                     <span v-if="item.Tue_M.patient_id">
-                        <div>{{ item.Tue_M.patient }}</div>
-                        <div v-if="item.Tue_M.mode_name != 'HD'">{{ item.Tue_M.mode_name }}</div>
+                        
+                        <span>{{ item.Tue_M.patient }}</span>
+                        <span>{{ item.Tue_M.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
+                <td style="min-width:40px;">
                     <span v-if="item.Tue_A.patient_id">
-                        <div>{{ item.Tue_A.patient }}</div>
-                        <div v-if="item.Tue_A.mode_name != 'HD'">{{ item.Tue_A.mode_name }}</div>
+                        
+                        <span>{{ item.Tue_A.patient }}</span>
+                        <span>{{ item.Tue_A.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
+                <td style="min-width:40px;">
                     <span v-if="item.Tue_N.patient_id">
-                        <div>{{ item.Tue_N.patient }}</div>
-                        <div v-if="item.Tue_N.mode_name != 'HD'">{{ item.Tue_N.mode_name }}</div>
+                        
+                        <span>{{ item.Tue_N.patient }}</span>
+                        <span>{{ item.Tue_N.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
+                <td style="min-width:40px;">
                     <span v-if="item.Wed_M.patient_id">
-                        <div>{{ item.Wed_M.patient }}</div>
-                        <div v-if="item.Wed_M.mode_name != 'HD'">{{ item.Wed_M.mode_name }}</div>
+                        
+                        <span>{{ item.Wed_M.patient }}</span>
+                        <span>{{ item.Wed_M.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
+                <td style="min-width:40px;">
                     <span v-if="item.Wed_A.patient_id">
-                        <div>{{ item.Wed_A.patient }}</div>
-                        <div v-if="item.Wed_A.mode_name != 'HD'">{{ item.Wed_A.mode_name }}</div>
+                        <span>{{ item.Wed_A.patient }}</span>
+                        <span>{{ item.Wed_A.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
+                <td style="min-width:40px;">
                     <span v-if="item.Wed_N.patient_id">
-                        <div>{{ item.Wed_N.patient }}</div>
-                        <div v-if="item.Wed_N.mode_name != 'HD'">{{ item.Wed_N.mode_name }}</div>
+                        <span>{{ item.Wed_N.patient }}</span>
+                        <span>{{ item.Wed_N.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
-                    <span v-if="item.Thurs_M.patient_id">
-                        <div>{{ item.Thurs_M.patient }}</div>
-                        <div v-if="item.Thurs_M.mode_name != 'HD'">{{ item.Thurs_M.mode_name }}</div>
+                <td style="min-width:40px;">
+                    <span v-if="item.Thurs_M.patient_id">     
+                        <span>{{ item.Thurs_M.patient }}</span>
+                        <span>{{ item.Thurs_M.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
-                    <span v-if="item.Thurs_A.patient_id">
-                        <div>{{ item.Thurs_A.patient }}</div>
-                        <div v-if="item.Thurs_A.mode_name != 'HD'">{{ item.Thurs_A.mode_name }}</div>
+                <td style="min-width:40px;">
+                    <span v-if="item.Thurs_A.patient_id">                   
+                        <span>{{ item.Thurs_A.patient }}</span>
+                        <span>{{ item.Thurs_A.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
-                    <span v-if="item.Thurs_N.patient_id">
-                        <div>{{ item.Thurs_N.patient }}</div>
-                        <div v-if="item.Thurs_N.mode_name != 'HD'">{{ item.Thurs_N.mode_name }}</div>
+                <td style="min-width:40px;">
+                    <span v-if="item.Thurs_N.patient_id">           
+                        <span>{{ item.Thurs_N.patient }}</span>
+                        <span>{{ item.Thurs_N.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
-                    <span v-if="item.Fri_M.patient_id">
-                        <div>{{ item.Fri_M.patient }}</div>
-                        <div v-if="item.Fri_M.mode_name != 'HD'">{{ item.Fri_M.mode_name }}</div>
+                <td style="min-width:40px;">
+                    <span v-if="item.Fri_M.patient_id">                  
+                        <span>{{ item.Fri_M.patient }}</span>
+                        <span>{{ item.Fri_M.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
-                    <span v-if="item.Fri_A.patient_id">
-                        <div>{{ item.Fri_A.patient }}</div>
-                        <div v-if="item.Fri_A.mode_name != 'HD'">{{ item.Fri_A.mode_name }}</div>
+                <td style="min-width:40px;">
+                    <span v-if="item.Fri_A.patient_id">                     
+                        <span>{{ item.Fri_A.patient }}</span>
+                        <span>{{ item.Fri_A.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
-                    <span v-if="item.Fri_N.patient_id">
-                        <div>{{ item.Fri_N.patient }}</div>
-                        <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
+                <td style="min-width:40px;">
+                    <span v-if="item.Fri_N.patient_id">                      
+                        <span>{{ item.Fri_N.patient }}</span>
+                        <span>{{ item.Sat_M.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
-                    <span v-if="item.Sat_M.patient_id">
-                        <div>{{ item.Sat_M.patient }}</div>
-                        <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
+                <td style="min-width:40px;">
+                    <span v-if="item.Sat_M.patient_id">                      
+                        <span>{{ item.Sat_M.patient }}</span>
+                        <span>{{ item.Sat_M.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
-                    <span v-if="item.Sat_A.patient_id">
-                        <div>{{ item.Sat_A.patient }}</div>
-                        <div v-if="item.Sat_A.mode_name != 'HD'">{{ item.Sat_A.mode_name }}</div>
+                <td style="min-width:40px;">
+                    <span v-if="item.Sat_A.patient_id">                       
+                        <span>{{ item.Sat_A.patient }}</span>
+                        <span>{{ item.Sat_A.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
+                <td style="min-width:40px;">
                     <span v-if="item.Sat_N.patient_id">
-                        <div>{{ item.Sat_N.patient }}</div>
-                        <div v-if="item.Sat_N.mode_name != 'HD'">{{ item.Sat_N.mode_name }}</div>
+                        <span>{{ item.Sat_N.patient }}</span>
+                        <span>{{ item.Sat_N.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
+                <td style="min-width:40px;">
                     <span v-if="item.Sun_M.patient_id">
-                        <div>{{ item.Sun_M.patient }}</div>
-                        <div v-if="item.Sun_M.mode_name != 'HD'">{{ item.Sun_M.mode_name }}</div>
+                        <span>{{ item.Sun_M.patient }}</span>
+                        <span>{{ item.Sun_M.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
+                <td style="min-width:40px;">
                     <span v-if="item.Sun_A.patient_id">
-                        <div>{{ item.Sun_A.patient }}</div>
-                        <div v-if="item.Sun_A.mode_name != 'HD'">{{ item.Sun_A.mode_name }}</div>
+                        <span>{{ item.Sun_A.patient }}</span>
+                        <span>{{ item.Sun_A.mode_name }}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;">
+                <td style="min-width:40px;">
                     <span v-if="item.Sun_N.patient_id">
-                        <div>{{ item.Sun_N.patient }}</div>
-                        <div v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }}</div>
+                        <span>{{ item.Sun_N.patient }}</span>
+                        <span>{{ item.Sun_N.mode_name }}</span>
                     </span>
                 </td>
                 <td>{{item.total}}</td>
             </tr>
         </table>
+        <!-- 选择天数打印 -->
+        <table 
+            v-if="$route.query.week_date !=''" 
+            id="scheduleTable" class="scheduleTable" 
+            border="1" cellspacing="0"
+            style="margin: auto;"
+        >
+            <tr>
+                <td rowspan="2">分区</td>
+                <td rowspan="2">机号</td>
+                <td colspan="3" v-if="$route.query.week_date =='周一'">周一({{ weekTitle[0] }})</td>
+                <td colspan="3" v-if="$route.query.week_date =='周二'">周二({{ weekTitle[1] }})</td>
+                <td colspan="3" v-if="$route.query.week_date =='周三'">周三({{ weekTitle[2] }})</td>
+                <td colspan="3" v-if="$route.query.week_date =='周四'">周四({{ weekTitle[3] }})</td>
+                <td colspan="3" v-if="$route.query.week_date =='周五'">周五({{ weekTitle[4] }})</td>
+                <td colspan="3" v-if="$route.query.week_date =='周六'">周六({{ weekTitle[5] }})</td>
+                <td colspan="3" v-if="$route.query.week_date =='周日'">周日({{ weekTitle[6] }})</td>
+                <td rowspan="2">总数</td>
+            </tr>
+            <tr v-for="index in week_date.length" :key="index">
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+            </tr>
+            <tr v-for="(item,index) in scheduleZone" :key="index">
+                <td style="min-width:180px;">{{ item.area }}</td>
+                <td style="min-width:180px;">{{ item.cut }}</td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周一'">
+                    <span v-if="item.Mon_M.patient_id ">
+                        <span>{{ item.Mon_M.patient }}</span>
+                        <span>{{ item.Mon_M.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周一'">
+                    <span v-if="item.Mon_A.patient_id ">
+                        <span>{{ item.Mon_A.patient }}</span>
+                        <span>{{ item.Mon_A.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周一'">
+                    <span v-if="item.Mon_N.patient_id ">
+                        <span>{{ item.Mon_N.patient }}</span>
+                        <span>{{ item.Mon_N.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周二'">
+                    <span v-if="item.Tue_M.patient_id">
+                        
+                        <span>{{ item.Tue_M.patient }}</span>
+                        <span>{{ item.Tue_M.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周二'">
+                    <span v-if="item.Tue_A.patient_id ">
+                        
+                        <span>{{ item.Tue_A.patient }}</span>
+                        <span>{{ item.Tue_A.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周二'">
+                    <span v-if="item.Tue_N.patient_id ">
+                        
+                        <span>{{ item.Tue_N.patient }}</span>
+                        <span>{{ item.Tue_N.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周三'">
+                    <span v-if="item.Wed_M.patient_id ">
+                        
+                        <span>{{ item.Wed_M.patient }}</span>
+                        <span>{{ item.Wed_M.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周三'">
+                    <span v-if="item.Wed_A.patient_id ">
+                        <span>{{ item.Wed_A.patient }}</span>
+                        <span>{{ item.Wed_A.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周三'">
+                    <span v-if="item.Wed_N.patient_id ">
+                        <span>{{ item.Wed_N.patient }}</span>
+                        <span>{{ item.Wed_N.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周四'">
+                    <span v-if="item.Thurs_M.patient_id ">     
+                        <span>{{ item.Thurs_M.patient }}</span>
+                        <span>{{ item.Thurs_M.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周四'">
+                    <span v-if="item.Thurs_A.patient_id ">                   
+                        <span>{{ item.Thurs_A.patient }}</span>
+                        <span>{{ item.Thurs_A.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周四'">
+                    <span v-if="item.Thurs_N.patient_id ">           
+                        <span>{{ item.Thurs_N.patient }}</span>
+                        <span>{{ item.Thurs_N.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周五'">
+                    <span v-if="item.Fri_M.patient_id">                  
+                        <span>{{ item.Fri_M.patient }}</span>
+                        <span>{{ item.Fri_M.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周五'">
+                    <span v-if="item.Fri_A.patient_id ">                     
+                        <span>{{ item.Fri_A.patient }}</span>
+                        <span>{{ item.Fri_A.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周五'">
+                    <span v-if="item.Fri_N.patient_id ">                      
+                        <span>{{ item.Fri_N.patient }}</span>
+                        <span>{{ item.Sat_M.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周六'">
+                    <span v-if="item.Sat_M.patient_id ">                      
+                        <span>{{ item.Sat_M.patient }}</span>
+                        <span>{{ item.Sat_M.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周六'">
+                    <span v-if="item.Sat_A.patient_id ">                       
+                        <span>{{ item.Sat_A.patient }}</span>
+                        <span>{{ item.Sat_A.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周六'">
+                    <span v-if="item.Sat_N.patient_id ">
+                        <span>{{ item.Sat_N.patient }}</span>
+                        <span>{{ item.Sat_N.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周日'">
+                    <span v-if="item.Sun_M.patient_id ">
+                        <span>{{ item.Sun_M.patient }}</span>
+                        <span>{{ item.Sun_M.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周日'">
+                    <span v-if="item.Sun_A.patient_id ">
+                        <span>{{ item.Sun_A.patient }}</span>
+                        <span>{{ item.Sun_A.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:180px;" v-if="$route.query.week_date =='周日'">
+                    <span v-if="item.Sun_N.patient_id ">
+                        <span>{{ item.Sun_N.patient }}</span>
+                        <span>{{ item.Sun_N.mode_name }}</span>
+                    </span>
+                </td>
+                <td style="min-width:60px;">{{item.total}}</td>
+            </tr>
+        </table>
+      </div>
     </div>
 </template>
 
@@ -252,14 +419,13 @@ export default {
 
         }else{
              newList = [1,2,3,4,5,6,7]
-
             this.week_date = newList.join(",")
 
         }
 
     },
     methods:{
-         getAllZones(){
+        getAllZones(){
            getAllZones().then(response=>{
              if(response.data.state == 1){
                 var zones = response.data.data.zones
@@ -682,7 +848,6 @@ export default {
                     });
                     var newArr= [{"area":"总数","cut":0,"Fri_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_A":{mode_id:0,mode_name:"",patient:"",patient_id:"1"},"Mon_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"jihao_id":"","total":"","zone_id":"","zone_type":"","sort":""}]
 
-
                      for(let i=0;i<newArr.length;i++){
                        for(let j=0;j<this.scheduleCountList.length;j++){
                             newArr[i].cut = this.total
@@ -856,8 +1021,8 @@ export default {
             return [weekArr[week], typeArr[schedule_type]];
         },
         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:14px;} .scheduleTable tr td{text-align: center;padding: 5px 0px;min-width:40px;}}'
+            // const style = '@media print { #scheduleTable{font-size:14px;} .scheduleTable tr td{text-align: center;padding: 5px;min-width:40px;}}'
             printJS({
             printable: 'scheduleTable',
             type: 'html',
@@ -922,7 +1087,11 @@ export default {
 </script>
 
 
-<style lang="scss">
+<style lang="scss" scoped>
+// .print_main_content{
+//     width: 960px;
+//     margin: 0 auto;
+// }
 td{
     text-align: center;
     padding: 5px;