Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/router/modules/dialysis.js

@@ -999,6 +999,18 @@ export default {
         noCache: true
       }
     },
+    {//74
+      path: '/dialysis/print/batch/seventyfour',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_seventyfour'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_seventyfour',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {//75
       path: '/dialysis/print/batch/seventyfive',
       component: () =>

src/xt_pages/dialysis/PatientBox.vue

@@ -864,7 +864,7 @@ export default {
         @include display-flex;
         @include align-items-center;
         .iconfont {
-          margin: 0 5px 0 0;
+          margin: 0 0px 0 0;
           font-size: 18px;
         }
       }

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -464,6 +464,15 @@
           type="primary"
           >批量打印</el-button>
       </template>
+      <template v-if="this.template_id == 74">
+        <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 == 75">
         <el-button
           size="small"
@@ -2249,6 +2258,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/seventytwo" });
       }else if (this.template_id == 73) {
         this.$router.push({ path: "/dialysis/print/batch/seventythree" });
+      }else if (this.template_id == 74) {
+        this.$router.push({ path: '/dialysis/print/batch/seventyfour' });
       }else if (this.template_id == 75) {
         this.$router.push({ path: "/dialysis/print/batch/seventyfive" });
       }else if (this.template_id == 76) {

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -952,6 +952,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 77">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1460,6 +1472,9 @@
           <DialysisPrintOrderSeventysix v-bind:childResponse="childResponse"
           v-if="org_template_info.template_id == 76">
           </DialysisPrintOrderSeventysix>
+          <DialysisPrintOrderSeventyseven v-bind:childResponse="childResponse"
+          v-if="org_template_info.template_id == 77">
+          </DialysisPrintOrderSeventyseven>
         </div>
       </el-container>
     </div>
@@ -1554,6 +1569,7 @@ import DialysisPrintOrderSeventythree from './template/DialysisPrintOrderSeventy
 import DialysisPrintOrderSop from './template/DialysisPrintOrderSop'
 import DialysisPrintOrderseventyfive from './template/DialysisPrintOrderseventyfive'
 import DialysisPrintOrderSeventysix from './template/DialysisPrintOrderSeventysix'
+import DialysisPrintOrderSeventyseven from './template/DialysisPrintOrderSeventyseven'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1634,6 +1650,7 @@ export default {
     DialysisPrintOrderSop,
     DialysisPrintOrderseventyfive,
     DialysisPrintOrderSeventysix,
+    DialysisPrintOrderSeventyseven,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -1815,7 +1832,7 @@ export default {
         '@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;}';
       const style2 =
         // 防止分页错位问题：table设置border: none；.tr设置page-break-inside:avoid; // 防止table数据太多，tr分页错乱 td设置border: 1px solid #000;// 防止部分分页的tr边框线没有
-        '@media print {.dialysis-print-order{width:960px;margin:0 auto} .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; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;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 ;} .row1{ border-left: 1px solid black;padding: 5px 5px;} .row2{ border-left:1px solid black; border-right:1px solid black; border-bottom:1px solid black;} .inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.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{page-break-inside:avoid;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 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: 3px 5px;line-height: 30px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
+        '@media print {.dialysis-print-order{width:960px;margin:0 auto} .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; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;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;} .row1{ border-left: 1px solid black;padding: 5px 5px;} .row2{ border-left:1px solid black; border-right:1px solid black; border-bottom:1px solid black;} .inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.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{page-break-inside:avoid;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 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: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
       const style3 =
         '@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;border-color: #000;}.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 #000;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 #000;text-align: center;white-space: nowrap; width: 50%;}';
       // const style3 =
@@ -2323,6 +2340,13 @@ export default {
           style: style2,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 77) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -1,12 +1,7 @@
 <template>
     <div id='prescriptionPrint'>
         <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
-            <span v-if="org_id == 10537 || org_id ==0">
-              <img
-                src="	https://kuyi.shengws.com/xuwenshou.jpg"
-                style="width: 100%"
-                alt=""/>
-            </span>
+           
             <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;" >
                 <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
                     <span>费别</span>
@@ -125,7 +120,6 @@
                     :src="setAdminUserES(item.creator,item.doctor)"
                     alt=""
                     srcset=""
-
                   />
                 </div>
                 <div style="width: 300px;">签章：</div>
@@ -159,12 +153,7 @@
                   </tr>
               </table>
             </div>
-            <span v-if="org_id == 10537 || org_id ==0">
-            <img
-              src="https://kuyi.shengws.com/xuwenwei.jpg"
-              style="width: 100%"
-              alt=""
-            /></span>
+            
         </div>
 
 

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -19,12 +19,18 @@
           style="width: 100%"
           alt=""
       /></span>
-      <span v-if="org_id == 10610 ||org_id ==0">
+      <span v-if="org_id == 10610 ">
         <img
           src="@/assets/img/penggang_top.jpg"
           style="width: 100%"
           alt=""
       /></span>
+      <span v-if="org_id == 10537 ||org_id ==0">
+        <img
+          src="	https://kuyi.shengws.com/xuwenshou.jpg"
+          style="width: 100%"
+          alt=""/>
+      </span>
       <div class="printTitle">
         治疗单
         <span
@@ -218,12 +224,18 @@
           style="width: 100%"
           alt=""
       /></span>
-      <span v-if="org_id == 10610 ||org_id ==0">
+      <span v-if="org_id == 10610 ">
         <img
           src="@/assets/img/penggang_bottom.jpg"
           style="width: 100%"
           alt=""
       /></span>
+      <span v-if="org_id == 10537 ||org_id ==0">
+      <img
+        src="https://kuyi.shengws.com/xuwenwei.jpg"
+        style="width: 100%"
+        alt=""
+      /></span>
       <div style="page-break-after: always"></div>
     </div>