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

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -64,12 +64,12 @@
         this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
         const style =
-          '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
+        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
         printJS({
-          printable: "statement-print",
-          type: "html",
-          style: style,
-          scanStyles: false
+            printable: "prescription-print",
+            type: "html",
+            style: style,
+            scanStyles: false
         });
 
         // if (this.org_template_info.template_id == 1) {

src/xt_pages/outpatientCharges/newTreatTemplate/printOne.vue

@@ -2,7 +2,7 @@
     <div>
         <div id='prescription-print' class="prescription-print">
             <div v-for='(i,index) in pageArr.length'>
-                <div class="printTitle">&nbsp血液透析中心医药费收据及收费项目清单</div>
+                <div class="printTitle">{{$store.getters.xt_user.org.org_name}}&nbsp血液透析中心医药费收据及收费项目清单</div>
                 <div class="infoMain">
                     <div class="infoP">医院(药店)编号：{{info.org_code}}</div>
                     <div class="infoP">名称：{{info.org_name}}</div>