Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -180,6 +180,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 16">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container ">
       <!--<div class="order-print-btn"-->
@@ -273,6 +283,10 @@
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id == 15"
       ></DialysisPrintOrderFifteen>
+      <DialysisPrintOrderSixteen
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 16"
+      ></DialysisPrintOrderSixteen>
     </div>
   </div>
 </template>
@@ -299,10 +313,12 @@ import DialysisPrintOrderTwelve from "./template/DialysisPrintOrderTwelve";
 import DialysisPrintOrderThirteen from "./template/DialysisPrintOrderThirteen";
 import DialysisPrintOrderFourteen from "./template/DialysisPrintOrderFourteen";
 import DialysisPrintOrderFifteen from "./template/DialysisPrintOrderFifteen";
+import DialysisPrintOrderSixteen from "./template/DialysisPrintOrderSixteen";
 
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderSixteen,
     DialysisPrintOrderFifteen,
     DialysisPrintOrderFourteen,
     DialysisPrintOrderThirteen,
@@ -554,6 +570,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 16){
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {