Browse Source

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

XMLWAN 4 years ago
parent
commit
14f9e58a21

+ 24 - 0
src/xt_pages/dialysis/dialysisPrintOrder.vue View File

354
           >打印</el-button
354
           >打印</el-button
355
         >
355
         >
356
       </template>
356
       </template>
357
+       <template v-if="org_template_info.template_id == 26">
358
+        <el-button
359
+          :loading="loading"
360
+          size="small"
361
+          icon="el-icon-printer"
362
+          @click="printThisPage"
363
+          type="primary"
364
+          >打印</el-button
365
+        >
366
+      </template>
357
     </div>
367
     </div>
358
     <div class="app-container" style="min-height:0;">
368
     <div class="app-container" style="min-height:0;">
359
       <!--<div class="order-print-btn"-->
369
       <!--<div class="order-print-btn"-->
559
             v-if="org_template_info.template_id == 25"
569
             v-if="org_template_info.template_id == 25"
560
           >
570
           >
561
           </DialysisPrintOrderTwentyFive>
571
           </DialysisPrintOrderTwentyFive>
572
+          <DialysisPrintOrderTwentySix
573
+            v-bind:childResponse="childResponse"
574
+            v-if="org_template_info.template_id == 26"
575
+          >
576
+          </DialysisPrintOrderTwentySix>
562
         </div>
577
         </div>
563
       </el-container>
578
       </el-container>
564
     </div>
579
     </div>
603
 import DialysisPrintOrderTwentyThree from "./template/DialysisPrintOrderTwentyThree";
618
 import DialysisPrintOrderTwentyThree from "./template/DialysisPrintOrderTwentyThree";
604
 import DialysisPrintOrderTwentyFour from "./template/DialysisPrintOrderTwentyFour";
619
 import DialysisPrintOrderTwentyFour from "./template/DialysisPrintOrderTwentyFour";
605
 import DialysisPrintOrderTwentyFive from "./template/DialysisPrintOrderTwentyFive";
620
 import DialysisPrintOrderTwentyFive from "./template/DialysisPrintOrderTwentyFive";
621
+import DialysisPrintOrderTwentySix from "./template/DialysisPrintOrderTwentySix";
606
 export default {
622
 export default {
607
   name: "dialysisPrintOrder",
623
   name: "dialysisPrintOrder",
608
   components: {
624
   components: {
625
+    DialysisPrintOrderTwentySix,
609
     DialysisPrintOrderTwentyFive,
626
     DialysisPrintOrderTwentyFive,
610
     DialysisPrintOrderTwentyFour,
627
     DialysisPrintOrderTwentyFour,
611
     DialysisPrintOrderTwentyThree,
628
     DialysisPrintOrderTwentyThree,
973
           style: style5,
990
           style: style5,
974
           scanStyles: false
991
           scanStyles: false
975
         });
992
         });
993
+      } else if (this.org_template_info.template_id == 12) {
994
+        printJS({
995
+          printable: "dialysis-print-box",
996
+          type: "html",
997
+          style: style,
998
+          scanStyles: false
999
+        });
976
       }
1000
       }
977
     },
1001
     },
978
     printThisOnePage() {
1002
     printThisOnePage() {

File diff suppressed because it is too large
+ 2123 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderTwentySix.vue