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

src/xt_pages/hospitalStation/settlementTemplate/hospitalSettlePrint.vue

@@ -658,10 +658,10 @@
               </tr>
               <tr>
                 <td>其他费</td>
+                <td>&nbsp;{{info.other_cost_total?info.other_cost_total:""}}</td>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;{{info.other_cost_self_total?info.other_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/index.vue

@@ -11,7 +11,7 @@
           >打印</el-button
         >
       </template> -->
-            
+
       <div class='dialysisPage' style="padding-top:40px;">
         <printOne v-if="org_id != 10138 && org_id != 10278 &&org_id == 0" :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
         <printTwo v-else :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>
@@ -76,7 +76,7 @@ export default {
             scanStyles: false
           });
         },500)
-        
+
       }else{
         const style =
         '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.prescription-print{font-size: 14px;}.printTitle{font-size: 18px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:5px;padding:0 10px;}.infoTitle div{width: 300px;margin-bottom:5px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;}.prescriptionBox{padding:0 10px;min-height:380px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; padding:0 10px;margin:5px 0;} .actionBar div{width:150px;}}';
@@ -87,7 +87,7 @@ export default {
           scanStyles: false
         });
       }
-      
+
 
       // if (this.org_template_info.template_id == 1) {
       //   printJS({
@@ -102,10 +102,10 @@ export default {
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
     getAllHisPatientList(){
          const params = {
@@ -131,7 +131,7 @@ export default {
             // console.log(this.patientTableData[0])
             // this.choosePatient(this.patientTableData[0])
             this.cal_one = cal_one
-            this.cal_two = cal_two   
+            this.cal_two = cal_two
          }
       })
     },
@@ -165,7 +165,7 @@ export default {
     searchAction(){
 
     }
-    
+
   },
 
   created() {
@@ -189,7 +189,7 @@ export default {
         var prescription_id = this.paramsObj.prescription_id
         this.prescription_id = prescription_id
         this.ids = this.paramsObj.ids
-        
+
       },
       deep:true
     }
@@ -362,7 +362,7 @@ export default {
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
-  
+
   .el-date-editor{
     .el-input__inner{
       padding-right:0px;