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/template/prinSeven.vue

@@ -103,14 +103,13 @@
               <div style="position: relative;">
                 <div class="drugsOne" :style="{'border-right':item.arr.length>0 && item.arr[0][0].groupno==it.groupno ? '1px solid black': 'none','width':'80%'}">
                   <span style="font-weight: bold" >
-                    {{ index + 1 + "." }}
+                    {{ 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;* {{ 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 >
@@ -134,16 +133,18 @@
                     &nbsp;&nbsp;<span>
                       {{ it.execution_frequency }}&nbsp;{{
                         it.delivery_way
-                      }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+                      }}&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)