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/treatPrint.vue

@@ -13,7 +13,7 @@
     </template>
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
-            <printOne v-if="org_id != 4" v-bind:childResponse="childResponse" :paramsObj="paramsObj"></printOne>
+            <printOne v-if="org_id != 10138" v-bind:childResponse="childResponse" :paramsObj="paramsObj"></printOne>
             <printTwo v-else v-bind:childResponse="childResponse" :paramsObj="paramsObj"></printTwo>
 
         </div>
@@ -86,7 +86,7 @@ export default {
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
-      if(this.org_id == 4){
+      if(this.org_id == 10138){
         const style =
         '@media print {#prescription-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}}';
         printJS({

src/xt_pages/outpatientDoctorStation/print.vue

@@ -13,11 +13,11 @@
       </template>
             
     <div class='dialysisPage' style="padding-top:40px;">
-      <div v-if="org_id != 4">
+      <div v-if="org_id != 10138">
         <printOne 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"></printOne>
         <printFour v-else 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>
       </div>
-      <div>
+      <div v-else>
         <printThree 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"></printThree>
       </div>
     </div>
@@ -75,7 +75,7 @@ export default {
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
       
-      if(this.org_id == 4){
+      if(this.org_id == 10138){
         
         const style =
         '@media print {#prescription-print{font-size:14px;}.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;}}';

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -13,7 +13,7 @@
       </template>
             
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne v-if="org_id != 4" 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>
+        <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>
         <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>
       </div>
   </div>
@@ -65,7 +65,7 @@ export default {
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
-      if(this.org_id == 4){
+      if(this.org_id == 10138){
         
         const style =
         '@media print {#prescription-print{font-size:14px;}.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;}}';