Bläddra i källkod

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

XMLWAN 3 år sedan
förälder
incheckning
5769ce0b02

+ 24 - 0
src/xt_pages/dialysis/dialysisPrintOrder.vue Visa fil

@@ -593,6 +593,16 @@
593 593
           >打印</el-button
594 594
         >
595 595
       </template>
596
+      <template v-if="org_template_info.template_id == 44">
597
+        <el-button
598
+          :loading="loading"
599
+          size="small"
600
+          icon="el-icon-printer"
601
+          @click="printThisPage"
602
+          type="primary"
603
+          >打印</el-button
604
+        >
605
+      </template>
596 606
     </div>
597 607
     <div class="app-container" style="min-height:0;">
598 608
       <!--<div class="order-print-btn"-->
@@ -888,6 +898,11 @@
888 898
             v-if="org_template_info.template_id == 43"
889 899
           >
890 900
           </DialysisPrintOrderFortyThree>
901
+          <DialysisPrintOrderFortyFour
902
+            v-bind:childResponse="childResponse"
903
+            v-if="org_template_info.template_id == 44"
904
+          >
905
+          </DialysisPrintOrderFortyFour>
891 906
         </div>
892 907
       </el-container>
893 908
     </div>
@@ -950,9 +965,11 @@ import DialysisPrintOrderForty from "./template/DialysisPrintOrderForty";
950 965
 import DialysisPrintOrderFortyOne from "./template/DialysisPrintOrderFortyOne";
951 966
 import DialysisPrintOrderFortyTwo from "./template/DialysisPrintOrderFortyTwo";
952 967
 import DialysisPrintOrderFortyThree from "./template/DialysisPrintOrderFortyThree";
968
+import DialysisPrintOrderFortyFour from "./template/DialysisPrintOrderFortyFour";
953 969
 export default {
954 970
   name: "dialysisPrintOrder",
955 971
   components: {
972
+    DialysisPrintOrderFortyFour,
956 973
     DialysisPrintOrderFortyThree,
957 974
     DialysisPrintOrderFortyTwo,
958 975
     DialysisPrintOrderFortyOne,
@@ -1465,6 +1482,13 @@ export default {
1465 1482
           style: style2,
1466 1483
           scanStyles: false
1467 1484
         });
1485
+      } else if (this.org_template_info.template_id == 44){
1486
+        printJS({
1487
+          printable: "dialysis-print-box-1",
1488
+          type: "html",
1489
+          style: style9,
1490
+          scanStyles: false
1491
+        });
1468 1492
       }
1469 1493
     },
1470 1494
     printThisOnePage() {

Filskillnaden har hållits tillbaka eftersom den är för stor
+ 1945 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderFortyFour.vue