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

src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue

@@ -518,7 +518,7 @@
                 {{predialysis.blood_access_part_opera_id == item.id ? item.name :''}}
                 </span>
                 部位：
-                {{predialysis.blood_access_part_id ? '' : predialysis.blood_access_part_id}}&nbsp;&nbsp;
+                {{predialysis.blood_access_part_id ? predialysis.blood_access_part_id : ''}}&nbsp;&nbsp;
 
                 内瘘：{{predialysis.internal_fistula == ""?'无':predialysis.internal_fistula}}
                 <!-- <label-box
@@ -2383,6 +2383,57 @@ export default {
       if (bloodAccessParOpera[i].name == "直穿") {
         arrtwo.push(bloodAccessParOpera[i]);
       }
+      if (bloodAccessParOpera[i].name == "动脉直穿") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "动静脉直穿") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "带隧道带绦纶套股静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "带隧道带绦纶套锁骨下静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "带隧道带绦纶套颈内静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "无绦纶套股静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "无绦纶套锁骨下静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "无绦纶套颈内静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "直线型移植血管动静脉内瘘") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "自体动静脉内瘘") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "袢型移植血管动静脉内瘘") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "静脉直穿") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "AVG") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "自体内瘘") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "AVF") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "颈内静脉") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "股静脉") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
       if (bloodAccessParOpera[i].name == "人造血管") {
         arrtwo.push(bloodAccessParOpera[i]);
       }

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/index.vue

@@ -79,7 +79,7 @@ export default {
 
       }else{
         const style =
-        '@media print {#prescription-print{font-size:14px;page-break-after:always;}.prescription-print:last-child {page-break-after: auto;}.prescription-print{font-size: 14px;}.printTitle{font-size: 18px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;padding:0 10px;}.infoTitle div{width: 300px;margin-bottom:5px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;}.prescriptionBox{padding:0 10px;min-height:380px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; padding:0 10px;margin:5px 0;} .actionBar div{width:150px;}}';
+        '@media print {#prescription-print{font-size:14px;page-break-after:always;}.prescription-print:last-child {page-break-after: auto;}.prescription-print{font-size: 14px;page-break-after:always;}.printTitle{font-size: 18px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;padding:0 10px;}.infoTitle div{width: 300px;margin-bottom:5px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;}.prescriptionBox{padding:0 10px;min-height:380px;}.doctor_style{border:none;}.doctor_style tr{page-break-inside:avoid;}.doctor_style tr td{border:1px solid #000}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; padding:0 10px;margin:5px 0;} .actionBar div{width:150px;}}';
         printJS({
           printable: "prescriptionPrint",
           type: "html",

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/printOne.vue

@@ -1,7 +1,7 @@
 <template>
   <div id='prescriptionPrint'>
     <div v-for="(i,index) in printData">
-      <div id='prescription-print' class="prescription-print" v-for="(item,index) in i.prescriptions" :key="index" v-if="item.project.length > 0">
+      <div id='prescription-print' class="prescription-print" style="page-break-after:always;" v-for="(item,index) in i.prescriptions" :key="index" v-if="item.project.length > 0">
         <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>
@@ -94,8 +94,8 @@
           <div>费用：{{ getTotalOne(item.project).toFixed(2) ? getTotalOne(item.project).toFixed(2) : '' }}元</div>
         </div>
 
-        <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
-          <tr>
+        <table class="doctor_style" style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
+          <tr style="page-break-inside:avoid;">
             <td style="width:16%;">治疗时间</td>
             <td style="width:16%;"></td>
             <td style="width:16%;"></td>
@@ -496,4 +496,12 @@ export default {
 .actionBar div {
   width: 150px;
 }
+.doctor_style {
+  tr{
+    page-break-inside:avoid;
+    td{
+      border: 1px solid #000;
+    }
+  }
+}
 </style>