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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1044,6 +1044,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 84">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1576,6 +1588,10 @@
           <DialysisPrintOrdereightythree v-bind:childResponse="childResponse"
           v-if="org_template_info.template_id == 83">
           </DialysisPrintOrdereightythree>
+          <DialysisPrintOrdereightyfour v-bind:childResponse="childResponse"
+          v-if="org_template_info.template_id == 84">
+
+          </DialysisPrintOrdereightyfour>
         </div>
       </el-container>
     </div>
@@ -1677,6 +1693,7 @@ import DialysisPrintOrdereighty from './template/DialysisPrintOrdereighty'
 import DialysisPrintOrdereightyone from './template/DialysisPrintOrdereightyone'
 import DialysisPrintOrdereightytwo from './template/DialysisPrintOrdereightytwo'
 import DialysisPrintOrdereightythree from './template/DialysisPrintOrdereightythree'
+import DialysisPrintOrdereightyfour from './template/DialysisPrintOrdereightyfour'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1764,6 +1781,7 @@ export default {
     DialysisPrintOrdereightyone,
     DialysisPrintOrdereightytwo,
     DialysisPrintOrdereightythree,
+    DialysisPrintOrdereightyfour,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -2508,6 +2526,13 @@ export default {
           style: style17,
           scanStyles: false,
         });
+      } else if (this.org_template_info.template_id == 84) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style4,
+          scanStyles: false,
+        });
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({
@@ -2732,7 +2757,7 @@ export default {
             this.org_template_info = response.data.data.org_template_info;
           // }else{
           //   this.org_template_info = response.data.data.org_template_info;
-          //   this.org_template_info.template_id= 83
+          //   this.org_template_info.template_id= 84
           // }