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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -354,6 +354,16 @@
           >打印</el-button
         >
       </template>
+       <template v-if="org_template_info.template_id == 26">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -559,6 +569,11 @@
             v-if="org_template_info.template_id == 25"
           >
           </DialysisPrintOrderTwentyFive>
+          <DialysisPrintOrderTwentySix
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 26"
+          >
+          </DialysisPrintOrderTwentySix>
         </div>
       </el-container>
     </div>
@@ -603,9 +618,11 @@ import DialysisPrintOrderTwentyTwo from "./template/DialysisPrintOrderTwentyTwo"
 import DialysisPrintOrderTwentyThree from "./template/DialysisPrintOrderTwentyThree";
 import DialysisPrintOrderTwentyFour from "./template/DialysisPrintOrderTwentyFour";
 import DialysisPrintOrderTwentyFive from "./template/DialysisPrintOrderTwentyFive";
+import DialysisPrintOrderTwentySix from "./template/DialysisPrintOrderTwentySix";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderTwentySix,
     DialysisPrintOrderTwentyFive,
     DialysisPrintOrderTwentyFour,
     DialysisPrintOrderTwentyThree,
@@ -973,6 +990,13 @@ export default {
           style: style5,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 12) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {