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,6 +253,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 21">
+        <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"-->
@@ -437,6 +447,10 @@
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 20"
           ></DialysisPrintOrderTwenty>
+          <DialysisPrintOrderTwentyOne
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 21"
+          ></DialysisPrintOrderTwentyOne>
         </div>
       </el-container>
     </div>
@@ -476,10 +490,12 @@ import DialysisPrintOrderSeventeen from "./template/DialysisPrintOrderSeventeen"
 import DialysisPrintOrderEighteen from "./template/DialysisPrintOrderEighteen";
 import DialysisPrintOrderNineteen from "./template/DialysisPrintOrderNineteen";
 import DialysisPrintOrderTwenty from "./template/DialysisPrintOrderTwenty";
+import DialysisPrintOrderTwentyOne from "./template/DialysisPrintOrderTwentyOne";
 
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderTwentyOne,
     DialysisPrintOrderTwenty,
     DialysisPrintOrderNineteen,
     DialysisPrintOrderEighteen,
@@ -806,6 +822,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 21) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       } 
     },
     printThisOnePage() {