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

           style: style2,
           scanStyles: false
         });
-      } else if (this.org_template_info.template_id == 1) {
+      } else if (this.org_template_info.template_id == 20) {
         printJS({
           printable: "dialysis-print-box",
           type: "html",