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

src/xt_pages/outpatientDoctorStation/print.vue

@@ -3,7 +3,7 @@
     <div class="dialysisPage" style="padding-top: 40px">
       <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 10537 && org_id != 10610 ">
 
-        <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"
+        <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"
         :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient"
         :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date"
         :prescription_id="prescription_id"></printOne>
@@ -27,7 +27,7 @@
           :prescription_id="prescription_id">
         </prinSeven>
 
-        <prineight v-if="org_id == 10644 "
+        <prineight v-if="org_id == 10644"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"
@@ -64,7 +64,7 @@
           :prescription_id="prescription_id"
           :his_patient_id ="his_patient_id"
         ></printFive>
-        <printTwoteen v-if="org_id==10653 || org_id == 0"
+        <printTwoteen v-if="org_id==10653"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -58,11 +58,10 @@
         </div>
         <div class="prescriptionBox" style="min-height: 350px;">
           <div class="Rp">Rp:</div>
-          <div
-            class="drugsBox"
+          <div class="drugsBox" 
             v-for="(it, index) in item.advices"
             :key="index"
-            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
+            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto','position': 'relative'}"
           >
             <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  'page-break-after':item.advices.length>=3&& item.advices[2]?'always':'auto'-->
             <!-- <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,27 @@
               <span style="font-weight: bold">{{ index + 1 + "." }}</span
               >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
               v-if="it.drug.min_unit != it.drug.dose_unit"
-            >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
-            >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
-                it.drug.max_unit
-              }}&nbsp;×&nbsp; {{ it.prescribing_number
-              }}{{ it.prescribing_number_unit }}
+              >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
+              >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
+                  it.drug.max_unit
+                }}&nbsp;×&nbsp; {{ it.prescribing_number
+                }}{{ it.prescribing_number_unit }}
+              <!-- <div style="display: inline-block;margin-left: 30px;">
+                <span>{{ it.price}}</span>
+              </div> -->
             </div>
             <div style="margin-left: 100px">
-              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
-              >&nbsp;&nbsp;<span
-            >{{ it.execution_frequency }}&nbsp;{{
-                it.delivery_way
-              }}&nbsp;</span
-            >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+                <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
+                >&nbsp;&nbsp;<span
+              >{{ it.execution_frequency }}&nbsp;{{
+                  it.delivery_way
+                }}&nbsp;</span
+              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            </div>
+            <!-- 单价 -->
+            <div style="display: inline-block;position: absolute; top:0;right: 10%;"
+              v-if="org_id ==10210 || org_id ==0">
+                <span>{{ it.price}}</span>
             </div>
           </div>