Browse Source

518合并代码

XMLWAN 2 years ago
parent
commit
7488f04f8b

+ 2 - 2
src/xt_pages/hospitalStation/components/deskRecord.vue View File

@@ -54,7 +54,7 @@
54 54
         <el-input v-model="allergic_history" placeholder="药物过敏史"></el-input>
55 55
       </el-form-item>
56 56
 
57
-  <!-- <el-form-item label="初始透析日期: " prop="name">
57
+  <el-form-item label="初始透析日期: " prop="name">
58 58
          <el-date-picker
59 59
           :disabled="true"
60 60
           style="width:100%;"
@@ -97,7 +97,7 @@
97 97
 
98 98
       <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
99 99
         <el-input v-model="lab_apparatus" placeholder="实验室及器械检查"></el-input>
100
-      </el-form-item> -->
100
+      </el-form-item>
101 101
 
102 102
     </el-form>
103 103
     <div class="mainTitle">体格信息:</div>

+ 2 - 2
src/xt_pages/hospitalStation/recordPrint.vue View File

@@ -13,7 +13,7 @@
13 13
 
14 14
      <div class="dialysisPage" style="padding-top: 40px">
15 15
       <printOne
16
-        v-if="org_id != 10217 && org_id != 0"
16
+        v-if="org_id != 9671 && org_id!=9675"
17 17
         ref="printOne"
18 18
         v-bind:childResponse="childResponse"
19 19
         :patient="patient"
@@ -22,7 +22,7 @@
22 22
         :patientid="patientid"
23 23
       ></printOne>
24 24
       <printTwo
25
-        v-if=" org_id == 0 || org_id == 9671 || org_id == 9675"
25
+        v-if="org_id == 9671 || org_id == 9675"
26 26
         ref="printTwo"
27 27
         v-bind:childResponse="childResponse"
28 28
         :patient="patient"

+ 8 - 8
src/xt_pages/outpatientDoctorStation/components/deskRecord.vue View File

@@ -54,7 +54,7 @@
54 54
         <el-input v-model="allergic_history" placeholder="药物过敏史"></el-input>
55 55
       </el-form-item>
56 56
      
57
-      <!-- <el-form-item label="初始透析日期: " prop="name">
57
+      <el-form-item label="初始透析日期: " prop="name">
58 58
          <el-date-picker
59 59
           :disabled="true"
60 60
           style="width:100%;"
@@ -94,7 +94,7 @@
94 94
 
95 95
       <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
96 96
         <el-input v-model="lab_apparatus" placeholder="实验室及器械检查"></el-input>
97
-      </el-form-item> -->
97
+      </el-form-item>
98 98
 
99 99
     </el-form>
100 100
     <div class="mainTitle">体格信息:</div>
@@ -628,12 +628,12 @@
628 628
       
629 629
       this.first_dialysis_date = this.getTime(this.patientInfo.first_dialysis_date)
630 630
       
631
-      // this.primary_disease = this.case_history.primary_disease
632
-      // this.confirm_failure_date = this.case_history.confirm_failure_date
633
-      // this.drug_allergy_history = this.case_history.drug_allergy_history
634
-      // this.physical_examination = this.case_history.physical_examination
635
-      // this.special_inspection = this.case_history.special_inspection
636
-      // this.lab_apparatus = this.case_history.lab_apparatus
631
+      this.primary_disease = this.case_history.primary_disease
632
+      this.confirm_failure_date = this.case_history.confirm_failure_date
633
+      this.drug_allergy_history = this.case_history.drug_allergy_history
634
+      this.physical_examination = this.case_history.physical_examination
635
+      this.special_inspection = this.case_history.special_inspection
636
+      this.lab_apparatus = this.case_history.lab_apparatus
637 637
     },
638 638
     watch:{
639 639
       detalid:function(val){

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

@@ -13,7 +13,7 @@
13 13
 
14 14
     <div class="dialysisPage" style="padding-top: 40px">
15 15
       <printOne
16
-        v-if="org_id != 10217 && org_id != 0"
16
+        v-if="org_id != 9675 && org_id != 9671"
17 17
         ref="printOne"
18 18
         v-bind:childResponse="childResponse"
19 19
         :patient="patient"
@@ -22,7 +22,7 @@
22 22
         :patientid="patientid"
23 23
       ></printOne>
24 24
       <printTwo
25
-        v-if=" org_id == 0 || org_id == 9671 || org_id == 9675"
25
+        v-if="org_id == 9671 || org_id == 9675"
26 26
         ref="printTwo"
27 27
         v-bind:childResponse="childResponse"
28 28
         :patient="patient"