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
1b03b60d74

+ 2 - 2
src/xt_pages/outpatientCharges/newStatementPrintTwo.vue View File

@@ -15,7 +15,7 @@
15 15
         <div class='dialysisPage' style="padding-top:40px;">
16 16
             <!--<printOne :info="info"></printOne>-->
17 17
 
18
-            <print-one v-if="org_id != 10138" :info="info"></print-one>
18
+            <print-one v-if="org_id != 10138 && org_id != 10278" :info="info"></print-one>
19 19
             <print-two v-else :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts"></print-two>
20 20
         </div>
21 21
     </div>
@@ -82,7 +82,7 @@
82 82
         //   scanStyles: false
83 83
         // });
84 84
 
85
-        if(this.$store.getters.xt_user.org_id == 10138){
85
+        if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278){
86 86
           setTimeout(() => {
87 87
             const style =
88 88
             '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 47%;}}}';

+ 2 - 2
src/xt_pages/outpatientCharges/statementPrint.vue View File

@@ -13,9 +13,9 @@
13 13
       </template>
14 14
 
15 15
       <div class='dialysisPage' style="padding-top:40px;">
16
-        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0 || org_id == 4">
16
+        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0 || org_id == 4 || org_id == 10278">
17 17
           <printTwo :info="info" v-if="org_id == 9990"></printTwo>
18
-          <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138 || org_id == 0 || org_id == 4"></printThree>
18
+          <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138 || org_id == 0 || org_id == 4 || org_id == 10278"></printThree>
19 19
           <printFour v-if="org_id == 9504 || org_id == 10028" :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts"></printFour>
20 20
         </div>
21 21
         <printOne :info="info" v-else></printOne>

+ 1 - 1
src/xt_pages/outpatientCharges/treatTemplate/printOne.vue View File

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
     <div>
3 3
         <div id='prescription-print' class="prescription-print">
4
-            <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138">
4
+            <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278">
5 5
                 <div class="printTitle">{{orgname}}&nbsp;&nbsp;医药费收据及收费项目清单</div>
6 6
                 <div class="infoMain">
7 7
                     <div class="infoP">医院(药店)编号:{{org_code}}</div>

+ 2 - 2
src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue View File

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
     <div>
3 3
         <div id='prescription-print3' class="prescription-print">
4
-            <img style="width:100%;height:80px" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
4
+            <img style="width:100%;height:80px" v-if="org_id == 10138 || org_id == 10278" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
5 5
             <div class="printTitle">检验申请单</div>
6 6
 
7 7
             <div style="border:1px solid #000;">
@@ -41,7 +41,7 @@
41 41
                     <div>医生签字:{{ doctor ? doctor : '' }}</div>
42 42
                 </div>
43 43
             </div>   
44
-            <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
44
+            <img style="width:100%;" v-if="org_id == 10138 || org_id == 10278" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
45 45
         </div>
46 46
     </div>
47 47
 

+ 1 - 1
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

@@ -445,7 +445,7 @@
445 445
         this.$refs.multipleTable3.toggleAllSelection()
446 446
       },
447 447
       printThisPage() {
448
-        if(this.org_id == 10138){
448
+        if(this.org_id == 10138 || this.org_id == 10278){
449 449
           const style =
450 450
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}'
451 451
           printJS({

+ 2 - 2
src/xt_pages/outpatientDoctorStation/print.vue View File

@@ -13,7 +13,7 @@
13 13
       </template> -->
14 14
 
15 15
     <div class='dialysisPage' style="padding-top:40px;">
16
-      <div v-if="org_id != 10138">
16
+      <div v-if="org_id != 10138 && org_id != 10278">
17 17
         <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
18 18
         <printFour v-if="org_id == 10088" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
19 19
         <printFive v-if="org_id == 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFive>
@@ -78,7 +78,7 @@ export default {
78 78
       var ptime = Math.round(new Date().getTime() / 1000);
79 79
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
80 80
 
81
-      if(this.org_id == 10138){
81
+      if(this.org_id == 10138 || this.org_id == 10278){
82 82
         setTimeout(() => {
83 83
           const style =
84 84
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';

+ 2 - 2
src/xt_pages/outpatientDoctorStation/treatPrint.vue View File

@@ -13,7 +13,7 @@
13 13
       </template> -->
14 14
             
15 15
       <div class='dialysisPage' style="padding-top:40px;">
16
-        <printOne v-if="org_id != 10138" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
16
+        <printOne v-if="org_id != 10138 && org_id != 10278" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
17 17
         <printTwo v-else v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>
18 18
       </div>
19 19
   </div>
@@ -65,7 +65,7 @@ export default {
65 65
       var ptime = Math.round(new Date().getTime() / 1000);
66 66
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
67 67
 
68
-      if(this.org_id == 10138){
68
+      if(this.org_id == 10138 || this.org_id == 10278){
69 69
         setTimeout(() => {
70 70
           const style =
71 71
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';