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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -179,6 +179,14 @@
         v-if="org_template_info.template_id == 8"
       >
       </DialysisPrintOrderEight>
+
+      <!--<DialysisPrintOrderTen></DialysisPrintOrderTen>-->
+      <DialysisPrintOrderTen
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 10"
+      ></DialysisPrintOrderTen>
+
+
     </div>
   </div>
 </template>
@@ -198,10 +206,12 @@ import DialysisPrintOrderSix from "./template/DialysisPrintOrderSix";
 import DialysisPrintOrderSeven from "./template/DialysisPrintOrderSeven";
 import DialysisPrintOrderEight from "./template/DialysisPrintOrderEight";
 import print from "print-js";
+import DialysisPrintOrderTen from './template/DialysisPrintOrderTen'
 
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderTen,
     DialysisPrintOrderOne,
     DialysisPrintOrderTwo,
     DialysisPrintOrderThree,
@@ -210,6 +220,7 @@ export default {
     DialysisPrintOrderSix,
     DialysisPrintOrderSeven,
     DialysisPrintOrderEight,
+
     LabelBox,
     BreadCrumb
   },
@@ -399,6 +410,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 10) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {