8月14日杨青

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -110,7 +110,6 @@
                     {{ it.drug.dose }}{{ it.drug.dose_unit }} * {{ it.drug.min_number }}{{ it.drug.min_unit }}/
                     {{it.drug.max_unit}}
                   </span>&nbsp;
-
                   <div>
                     <template v-if="item.arr.length>0 && item.arr[0][0].groupno==it.groupno">
                       <div >
@@ -136,14 +135,16 @@
                         it.delivery_way
                       }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
                   </div>
+                  <div style="margin-left: 70px" v-if="it.remark !=''">
+                    备注：<span > {{ it.remark }}</span>
+                  </div>
                   <!-- v-if="arr.length>0 && arr[0][0].groupno==it.groupno" 'border-right':arr.length>0 && arr[0][0].groupno==it.groupno ? '1px solid black' :'none',-->
                 </div>
                 <div style="display: inline-block;position: absolute;left:80%;bottom:0px;margin-left: 10px;" >
                   ×&nbsp;{{ it.prescribing_number}}
                 </div>
-                <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 10px;" v-if="item.arr.length>0&&item.arr[0][0].groupno!=it.groupno">
+                <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 10px;" v-if="(item.arr.length>0&&item.arr[0][0].groupno!=it.groupno) || item.arr.length==0">
                   &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
-                  <!-- &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }} -->
                 </div>
                 <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 10px;" v-if="item.arr.length>0&&item.arr[0][0].groupno==it.groupno">
                   <!-- &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }} -->
@@ -208,8 +209,8 @@
               :key="index"
             >
               <div class="drugsOne">
-                <span style="font-weight: bold">{{ index + 1 + "." }}</span
-                >{{
+                <span style="font-weight: bold">{{ index + 1 + "." }}</span>
+                {{
                   it.type == 2
                     ? getProjectName(it.project_id)
                       ? getProjectName(it.project_id)