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

src/xt_pages/outpatientDoctorStation/template/printOne.vue

   <div id='prescriptionPrint'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-          <div class="printTitle">{{orgname}} &nbsp;&nbsp; 血液透析中心处方笺</div>
+          <div class="printTitle">血液透析中心处方笺</div>
           <div class="infoTitle">
               <p>姓名：{{item.patient.name?item.patient.name:""}}</p>
               <p>性别：
         prescriptionInfo:[],
         hisPatient:{},
         department:[],
-        prescriptions:[],
-        orgname:""
+        prescriptions:[]
+
       }
     },
    methods:{
        return name
      },
      getTotalOne(id) {
+        console.log("处方数据",this.prescriptions)
         var total = 0
         var addtotal = 0
         for (let i = 0; i < this.prescriptions.length; i++) {
             }
           
             if (this.prescriptions[i].additionalcharge != null) {
-              for (let b = 0; b < this.prescriptions[i].additionalcharge.length; b++) {
-                addtotal = addtotal + this.prescriptions[i].additionalcharge[b].price * this.prescriptions[i].additionalcharge[b].count
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
               }
             }
               addtotal =  Math.floor(addtotal * 100) / 100
         }
+        
+        return total + addtotal
        }
-       return total + addtotal
       }, 
 
 
       this.getInitData()
       this.getPrescriptionPrint()
       this.getHisPatientDetail()
-      var xtuser = this.$store.getters.xt_user
-      this.orgname = xtuser.org.org_name
+
      
    },
    watch:{
-    ids:function(val){
+     ids:function(val){
       this.ids = val
       this.getPrescriptionPrint()
     }

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

 <template>
-   <div>
+   <div id='prescriptionPrint'>
     <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
 
-        <div style="display:flex;justify-content: space-between;font-weight:bold;">
-            <p style="width:300px;display:flex;justify-content: space-between;font-weight:bold;">
+        <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;">
+            <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
                 <span>费别</span>
                 <span>自费</span>
                 <span>公费</span>
                 <span>保险</span>
                 <span>其他</span>
-            </p>
-            <p>就诊日期：{{getTime(item.ctime)}}</p>
+            </div>
+            <div>就诊日期：{{getTime(item.ctime,"{y}-{m}-{d}")}}</div>
         </div>
 
-        <div class="printTitle">{{orgname}} &nbsp;&nbsp; 血液透析中心处方、治疗单</div>
-
-        <!-- <div class="printTitle">处方、治疗单</div> -->
+        <div class="printTitle">{{orgname}}</div>
+        <div class="printTitle">血液透析中心处方、治疗单</div>
 
         <div class="infoTitle">
-            <p>门诊编号：</p>
-            <p>电脑号：</p>
+            <div>门诊编号：</div>
+            <div>电脑号：</div>
         </div>
 
         <div class="infoMain">
-            <p style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</p>
-            <p style="margin-bottom: 10px;width:25%">性别：
+            <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
+            <div style="margin-bottom: 10px;width:25%">性别：
                 <span v-if="item.patient.gender == 1">男</span>
                 <span v-if="item.patient.gender == 2">女</span>
-            </p>
-            <p style="margin-bottom: 10px;width:25%">年龄：
+            </div>
+            <div style="margin-bottom: 10px;width:25%">年龄：
                 <span>{{item.patient.age}}</span>
-            </p>
-            <p style="margin-bottom: 10px;width:25%">参保类型：</p>
-            <p style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</p>
-            <p style="width:50%;">地址：{{item.patient.unit_address}}</p>
-            <p style="width:50%;">诊断：{{item.patient.diagnose}}</p>
+            </div>
+            <div style="margin-bottom: 10px;width:25%">参保类型：</div>
+            <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
+            <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
+            <div style="width:100%;">诊断：{{item.patient.diagnose}}</div>
         </div>
 
         <div class="prescriptionBox">
         </div>
 
         <div class="infoTitle">
-            <p>开单医生：{{item.doctor?item.doctor:""}}</p>
-            <p>签章：</p>
+            <div>开单医生：{{item.doctor?item.doctor:""}}</div>
+            <div>签章：</div>
         </div>
 
         <div class="actionBar">
-            <p>执行医生：{{item.doctor?item.doctor:""}}</p>
-            <p>费用：{{getTotalOne(item.id)?getTotalOne(item.id):''}}元</p>
+            <div>执行医生：{{item.doctor?item.doctor:""}}</div>
+            <div>费用：{{getTotalOne(item.id)?getTotalOne(item.id):''}}元</div>
         </div>
 
         <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
     font-size: 18px;
     text-align: center;
     font-weight: bold;
+    margin-top: 10px;
 }
 .infoTitle{
     display: flex;