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

@@ -69,9 +69,9 @@
         <desk-prescription  :addtions_charge="addtions_charge" :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
                           ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
-                          v-show="titleType == '电子处方'" style="flex:1;"></desk-prescription>
+                          v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
-                    :hisPatientInfo="hisPatientInfo"   v-show="titleType == '电子病历'" :detalid="detalid" ref="child"></desk-record>
+                    :hisPatientInfo="hisPatientInfo"   v-if="titleType == '电子病历'" :detalid="detalid" ref="child"></desk-record>
 
         <medicalRecord ref='medicalRecord' @func="getMsgFormSon" ></medicalRecord>
         <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -42,12 +42,12 @@
         <div class="printTitle">病历内容</div>
         <div class="recordTitle">
             <div>科别：{{hispatient.departments?hispatient.departments:''}}</div>
-            <div>姓名：{{hispatient.name?hispatient.name:''}}</div>
+            <div>姓名：{{patient.name?patient.name:''}}</div>
             <div>性别：
-                <span v-if="hispatient.gender == 1">男</span>
-                <span v-if="hispatient.gender == 2">女</span>
+                <span v-if="patient.gender == 1">男</span>
+                <span v-if="patient.gender == 2">女</span>
             </div>
-            <div>年龄：{{hispatient.age?hispatient.age:''}}岁</div>
+            <div>年龄：{{patient.age?patient.age:''}}岁</div>
         </div>
         <div class="otherInfo">
             <div class="otherName">主诉：</div>
@@ -100,19 +100,18 @@ export default {
       hispatient:Object,
       history:Object,
     },
-    return:{
-      educationOptions:[]
-    },
     data(){
-
+        return{
+            educationOptions:[]
+        }                   
     },
     methods:{
       getProfession(id){
         var name = ""
         for(let i=0;i<this.educationOptions.length;i++){
-           if(id == this.educationOptions[i].id){
-              name = this.educationOptions[i].name
-           }
+            if(id == this.educationOptions[i].id){
+                name = this.educationOptions[i].name
+            }
         }
         return name
       },