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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -253,7 +253,7 @@
           >打印</el-button
         >
       </template>
-      <template v-if="org_template_info.template_id == 21">
+      <!-- <template v-if="org_template_info.template_id == 21">
         <el-button
           :loading="loading"
           size="small"
@@ -262,6 +262,39 @@
           type="primary"
           >打印</el-button
         >
+      </template> -->
+      <template
+        v-if="
+          org_template_info.template_id == 21 ||
+            org_template_info.template_id == 0
+        "
+      >
+      <div>
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisPage"
+            type="primary"
+            >打印全部</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisOnePage"
+            type="primary"
+            >打印纪录单</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisTwoPage"
+            type="primary"
+            >打印医嘱单</el-button
+          >
+        </div>
       </template>
       <template v-if="org_template_info.template_id == 22">
         <div>
@@ -930,6 +963,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if(this.org_template_info.template_id == 21){
+        printJS({
+          printable: "new-dialysis-1",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisTwoPage() {
@@ -967,6 +1007,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if(this.org_template_info.template_id == 21){
+        printJS({
+          printable: "new-dialysis-2",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     getNumber() {

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyOne.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="dialysis-print-box">
-    <div class="dialysis-print-order">
+    <div id='new-dialysis-1' class="dialysis-print-order">
       <div class="order-yy-name"></div>
       <div class="order-title">{{ orgname }} 血液净化治疗记录单</div>
       <table class="table-box" style="margin-top: 10px;">
@@ -953,7 +953,7 @@
       </div>
     </div>
     <div style="page-break-after: always;"></div>
-    <div class="dialysis-print-order">
+    <div id='new-dialysis-2' class="dialysis-print-order">
       <div class="order-yy-name"></div>
       <div class="order-title">血液净化记录单续页</div>
       <table class="print-table" border="1">