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

src/xt_pages/dialysis/batch_print/batch_print_order_seventy.vue

@@ -8,7 +8,7 @@
         icon="el-icon-printer"
         @click="printAction"
         type="primary"
-        >打印
+        >打印70
       </el-button>
     </div>
     <div class="app-container">
@@ -1324,7 +1324,6 @@
                                 : ""
                             }}
                           </td>
-
                           <td style="line-height: 16px; padding: 0px">
                             <div
                               style="
@@ -1448,7 +1447,6 @@
                            <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id == 0 || org_id ==10206">核对护士</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
-
                         <template v-if="record.advices">
                           <tr
                             v-for="(advice, advice_index) in record.advices"
@@ -1459,7 +1457,6 @@
                                 {{ getTime(advice[0].start_time, "{h}:{i}") }}
                               </span>
                             </td>
-
                             <td
                               height="35px"
                               colspan="2"
@@ -1468,7 +1465,6 @@
                             >
                               <span v-if="advice[0].parent_id > 0">---></span>
                               <span>{{ advice[0].advice_name }}</span>
-
                               <span
                                 v-if="
                                   advice[0] &&
@@ -1500,7 +1496,18 @@
                                   advice[0].remark.length > 0
                                 "
                                 >({{ advice[0].remark }})</span
+                              ><br/>
+                              <template v-if="advice[0].children.length>0">
+                                <span v-if="advice[0].children.length>0">{{ advice[0].children[0].advice_name }}</span>
+                                <span v-if="advice[0].children[0].prescribing_number"
+                                >&nbsp;&nbsp; {{ advice[0].children[0].prescribing_number
+                                }}{{ advice[0].children[0].prescribing_number_unit }}</span
+                              >
+                              <span v-if="advice[0].children[0].single_dose != 0">
+                                {{ advice[0].children[0].single_dose
+                                }}{{ advice[0].children[0].single_dose_unit }}</span
                               >
+                              </template>
                             </td>
 
                             <td height="35px">
@@ -1579,6 +1586,7 @@
                               />
                             </td>
                           </tr>
+                          
                         </template>
                       </tbody>
                     </table>

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -22,19 +22,19 @@
           <div class="prescriptionBox">
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index"
-                
               >
               <!-- :style="{'page-break-after':index==yi&&item.advices.length>5? '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> -->
                   <div class="drugsOne" >
                     <span style="font-weight:bold;">{{ index+1 + '.' }}</span>
-                    {{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;
+                    {{it.advice_name?it.advice_name:""}} 
+                    {{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* {{ it.drug.min_number }}{{ it.drug.min_unit }}&nbsp;&nbsp;
                     <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.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>
+                    <span>{{it.advice_desc}}</span>
                   </div>
                   <div style="margin-left:100px;">
-                    <span>{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</span>
+                    <span>{{it.drug.drug_spec}}&nbsp;×&nbsp;{{it.prescribing_number}}{{it.prescribing_number_unit}}</span>
                   </div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
@@ -417,7 +417,7 @@ export default {
     line-height: 24px;
 }
 .drugsOne span{
-    margin-right: 20px;
+    margin-right: 10px;
 }
 .doctorBox{
     display: flex;