2 Incheckningar b6751d69c8 ... ee3a425abf

Upphovsman SHA1 Meddelande Datum
  yq1 ee3a425abf Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch 6 dagar sedan
  yq1 1043855e1b 9月13,怡康的处方笺加单价 6 dagar sedan

+ 3 - 3
src/xt_pages/outpatientDoctorStation/print.vue Visa fil

@@ -3,7 +3,7 @@
3 3
     <div class="dialysisPage" style="padding-top: 40px">
4 4
       <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 10537 && org_id != 10610 ">
5 5
 
6
-        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 10598 && org_id != 10644 && org_id != 10510 && org_id!=10653&&org_id !=0" v-bind:childResponse="childResponse"
6
+        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 10598 && org_id != 10644 && org_id != 10510 && org_id!=10653" v-bind:childResponse="childResponse"
7 7
         :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient"
8 8
         :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date"
9 9
         :prescription_id="prescription_id"></printOne>
@@ -27,7 +27,7 @@
27 27
           :prescription_id="prescription_id">
28 28
         </prinSeven>
29 29
 
30
-        <prineight v-if="org_id == 10644 "
30
+        <prineight v-if="org_id == 10644"
31 31
           v-bind:childResponse="childResponse"
32 32
           :advicePrint="advicePrint"
33 33
           :ids="ids"
@@ -64,7 +64,7 @@
64 64
           :prescription_id="prescription_id"
65 65
           :his_patient_id ="his_patient_id"
66 66
         ></printFive>
67
-        <printTwoteen v-if="org_id==10653 || org_id == 0"
67
+        <printTwoteen v-if="org_id==10653"
68 68
           v-bind:childResponse="childResponse"
69 69
           :advicePrint="advicePrint"
70 70
           :ids="ids"

+ 20 - 14
src/xt_pages/outpatientDoctorStation/template/printOne.vue Visa fil

@@ -58,11 +58,10 @@
58 58
         </div>
59 59
         <div class="prescriptionBox" style="min-height: 350px;">
60 60
           <div class="Rp">Rp:</div>
61
-          <div
62
-            class="drugsBox"
61
+          <div class="drugsBox" 
63 62
             v-for="(it, index) in item.advices"
64 63
             :key="index"
65
-            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
64
+            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto','position': 'relative'}"
66 65
           >
67 66
             <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  'page-break-after':item.advices.length>=3&& item.advices[2]?'always':'auto'-->
68 67
             <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
@@ -70,19 +69,26 @@
70 69
               <span style="font-weight: bold">{{ index + 1 + "." }}</span
71 70
               >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
72 71
               v-if="it.drug.min_unit != it.drug.dose_unit"
73
-            >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
74
-            >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
75
-                it.drug.max_unit
76
-              }}&nbsp;×&nbsp; {{ it.prescribing_number
77
-              }}{{ it.prescribing_number_unit }}
72
+              >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
73
+              >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
74
+                  it.drug.max_unit
75
+                }}&nbsp;×&nbsp; {{ it.prescribing_number
76
+                }}{{ it.prescribing_number_unit }}
77
+              <!-- <div style="display: inline-block;margin-left: 30px;">
78
+                <span>{{ it.price}}</span>
79
+              </div> -->
78 80
             </div>
79 81
             <div style="margin-left: 100px">
80
-              <span>用法:{{ it.single_dose }}{{ it.single_dose_unit }}</span
81
-              >&nbsp;&nbsp;<span
82
-            >{{ it.execution_frequency }}&nbsp;{{
83
-                it.delivery_way
84
-              }}&nbsp;</span
85
-            >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
82
+                <span>用法:{{ it.single_dose }}{{ it.single_dose_unit }}</span
83
+                >&nbsp;&nbsp;<span
84
+              >{{ it.execution_frequency }}&nbsp;{{
85
+                  it.delivery_way
86
+                }}&nbsp;</span
87
+              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
88
+            </div>
89
+            <!-- 单价 -->
90
+            <div style="display: inline-block;position: absolute; top:0;right: 10%;">
91
+                <span>{{ it.price}}</span>
86 92
             </div>
87 93
           </div>
88 94