瀏覽代碼

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

XMLWAN 4 年之前
父節點
當前提交
d761131bd9
共有 2 個文件被更改,包括 2042 次插入0 次删除
  1. 23 0
      src/xt_pages/dialysis/dialysisPrintOrder.vue
  2. 2019 0
      src/xt_pages/dialysis/template/DialysisPrintOrderTwentyOne.vue

+ 23 - 0
src/xt_pages/dialysis/dialysisPrintOrder.vue 查看文件

253
           >打印</el-button
253
           >打印</el-button
254
         >
254
         >
255
       </template>
255
       </template>
256
+      <template v-if="org_template_info.template_id == 21">
257
+        <el-button
258
+          :loading="loading"
259
+          size="small"
260
+          icon="el-icon-printer"
261
+          @click="printThisPage"
262
+          type="primary"
263
+          >打印</el-button
264
+        >
265
+      </template>
256
     </div>
266
     </div>
257
     <div class="app-container" style="min-height:0;">
267
     <div class="app-container" style="min-height:0;">
258
       <!--<div class="order-print-btn"-->
268
       <!--<div class="order-print-btn"-->
437
             v-bind:childResponse="childResponse"
447
             v-bind:childResponse="childResponse"
438
             v-if="org_template_info.template_id == 20"
448
             v-if="org_template_info.template_id == 20"
439
           ></DialysisPrintOrderTwenty>
449
           ></DialysisPrintOrderTwenty>
450
+          <DialysisPrintOrderTwentyOne
451
+            v-bind:childResponse="childResponse"
452
+            v-if="org_template_info.template_id == 21"
453
+          ></DialysisPrintOrderTwentyOne>
440
         </div>
454
         </div>
441
       </el-container>
455
       </el-container>
442
     </div>
456
     </div>
476
 import DialysisPrintOrderEighteen from "./template/DialysisPrintOrderEighteen";
490
 import DialysisPrintOrderEighteen from "./template/DialysisPrintOrderEighteen";
477
 import DialysisPrintOrderNineteen from "./template/DialysisPrintOrderNineteen";
491
 import DialysisPrintOrderNineteen from "./template/DialysisPrintOrderNineteen";
478
 import DialysisPrintOrderTwenty from "./template/DialysisPrintOrderTwenty";
492
 import DialysisPrintOrderTwenty from "./template/DialysisPrintOrderTwenty";
493
+import DialysisPrintOrderTwentyOne from "./template/DialysisPrintOrderTwentyOne";
479
 
494
 
480
 export default {
495
 export default {
481
   name: "dialysisPrintOrder",
496
   name: "dialysisPrintOrder",
482
   components: {
497
   components: {
498
+    DialysisPrintOrderTwentyOne,
483
     DialysisPrintOrderTwenty,
499
     DialysisPrintOrderTwenty,
484
     DialysisPrintOrderNineteen,
500
     DialysisPrintOrderNineteen,
485
     DialysisPrintOrderEighteen,
501
     DialysisPrintOrderEighteen,
806
           style: style,
822
           style: style,
807
           scanStyles: false
823
           scanStyles: false
808
         });
824
         });
825
+      } else if (this.org_template_info.template_id == 21) {
826
+        printJS({
827
+          printable: "dialysis-print-box",
828
+          type: "html",
829
+          style: style,
830
+          scanStyles: false
831
+        });
809
       } 
832
       } 
810
     },
833
     },
811
     printThisOnePage() {
834
     printThisOnePage() {

文件差異過大導致無法顯示
+ 2019 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderTwentyOne.vue