Browse Source

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

XMLWAN 3 years ago
parent
commit
d45dc230fd

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

523
           >
523
           >
524
         </div>
524
         </div>
525
       </template>
525
       </template>
526
+      <template v-if="org_template_info.template_id == 37">
527
+        <el-button
528
+          :loading="loading"
529
+          size="small"
530
+          icon="el-icon-printer"
531
+          @click="printThisPage"
532
+          type="primary"
533
+          >打印</el-button
534
+        >
535
+      </template>
526
     </div>
536
     </div>
527
     <div class="app-container" style="min-height:0;">
537
     <div class="app-container" style="min-height:0;">
528
       <!--<div class="order-print-btn"-->
538
       <!--<div class="order-print-btn"-->
783
             v-if="org_template_info.template_id == 36"
793
             v-if="org_template_info.template_id == 36"
784
           >
794
           >
785
           </DialysisPrintOrderThirtySix>
795
           </DialysisPrintOrderThirtySix>
796
+          <DialysisPrintOrderThirtySeven
797
+            v-bind:childResponse="childResponse"
798
+            v-if="org_template_info.template_id == 37"
799
+          >
800
+          </DialysisPrintOrderThirtySeven>
786
         </div>
801
         </div>
787
       </el-container>
802
       </el-container>
788
     </div>
803
     </div>
838
 import DialysisPrintOrderThirtyFour from "./template/DialysisPrintOrderThirtyFour";
853
 import DialysisPrintOrderThirtyFour from "./template/DialysisPrintOrderThirtyFour";
839
 import DialysisPrintOrderThirtyFive from "./template/DialysisPrintOrderThirtyFive";
854
 import DialysisPrintOrderThirtyFive from "./template/DialysisPrintOrderThirtyFive";
840
 import DialysisPrintOrderThirtySix from "./template/DialysisPrintOrderThirtySix";
855
 import DialysisPrintOrderThirtySix from "./template/DialysisPrintOrderThirtySix";
856
+import DialysisPrintOrderThirtySeven from "./template/DialysisPrintOrderThirtySeven";
841
 export default {
857
 export default {
842
   name: "dialysisPrintOrder",
858
   name: "dialysisPrintOrder",
843
   components: {
859
   components: {
860
+    DialysisPrintOrderThirtySeven,
844
     DialysisPrintOrderThirtySix,
861
     DialysisPrintOrderThirtySix,
845
     DialysisPrintOrderThirtyFive,
862
     DialysisPrintOrderThirtyFive,
846
     DialysisPrintOrderThirtyFour,
863
     DialysisPrintOrderThirtyFour,
1291
           style: style,
1308
           style: style,
1292
           scanStyles: false
1309
           scanStyles: false
1293
         });
1310
         });
1311
+      } else if (this.org_template_info.template_id == 37) {
1312
+        printJS({
1313
+          printable: "dialysis-print-box",
1314
+          type: "html",
1315
+          style: style,
1316
+          scanStyles: false
1317
+        });
1294
       }
1318
       }
1295
     },
1319
     },
1296
     printThisOnePage() {
1320
     printThisOnePage() {

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