Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/router/modules/dialysis.js

@@ -413,18 +413,18 @@ export default {
         noCache: true
       }
     },
-    // {
-    //   path: '/dialysis/print/batch/sixtyFive',
-    //   component: () =>
-    //     import('@/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'dialysis_batch_sixtyFive',
-    //   meta: {
-    //     title: '批量打印',
-    //     noCache: true
-    //   }
-    // },
+    {
+      path: '/dialysis/print/batch/sixtyFive',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_sixtyFive',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     // {
     //   path: '/dialysis/print/batch/fiftythree',
     //   component: () =>

src/router/modules/patient.js

@@ -324,160 +324,160 @@ export default {
       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/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
-    }
-  },
+  // {//日常生活能力评估
+  //   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/dialysis/dialysisPrintOrder.vue

@@ -1979,7 +1979,7 @@ export default {
       }else if (this.org_template_info.template_id == 65 || this.org_template_info.template_id == 6) {
         console.log("进来")
         printJS({
-          printable: "dialysis-print-box-65",
+          printable: "dialysis-print-box",
           type: "html",
           style: style12,
           scanStyles: false,

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-button type="primary" @click="checkData">一键核对</el-button>
-    <div id="dialysis-print-box-1">
+    <div id="dialysis-print-box">
       <div
-        id="dialysis-print-box-1-1"
+        id="dialysis-print-box"
         class="dialysis-print-order print-template-two print_page_main_content"
       >
         <div style="display: inline-block; width: 100%; text-align: center">
@@ -3279,7 +3279,7 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@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}.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:14px}.dialysis-print-order .print-table-no{width:100%;text-align:left;border-collapse:collapse;font-size:14px} .dialysis-print-order .under_line {display: inline-block;border-bottom: 1px solid #999;text-align:left;white-space: nowrap;width: 50%;} .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;}';
+        '@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:14px}.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;}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({