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

@@ -79,11 +79,11 @@
             </div>
             <div class="inline_block" v-if="org_id!=10510">
               病区：
-              <div class="under_line" style="width: 50px; text-align: center">
+              <div class="under_line" style="width: 70px; text-align: left">
                 {{ record.device_zone.name}}
               </div>
             </div>
-            <div class="inline_block" v-if="org_id!=10510 && org_id!=10460">
+            <div class="inline_block" v-if="org_id!=10510 && org_id!=10460" style="margin-left: 10px;">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
                 {{ record.device_number.number }}
@@ -937,7 +937,7 @@
                           kg
                       </div>
                       <div class="inline_block" style="flex: 1" >
-                        计划超滤量：
+                        目标超滤量：
                         <div
                           class="under_line"
                           style="width: 60px; text-align: center"
@@ -1471,8 +1471,6 @@
                                   advice[0].advice_desc != undefined
                                 "
                               >
-                                <!-- ({{ advice[0].advice_desc
-                                }}{{ advice[0].drug_spec_unit }} ) -->
                               </span>
 
                               <span v-if="advice[0].prescribing_number"
@@ -1586,7 +1584,6 @@
                               />
                             </td>
                           </tr>
-                          
                         </template>
                       </tbody>
                     </table>
@@ -1658,7 +1655,7 @@
               </div>
               <div class="inline_block" v-if="org_id!=10510">
                 病区：
-                <div class="under_line" style="width: 50px; text-align: center">
+                <div class="under_line" style="width: 70px; text-align: left">
                   {{ record.device_zone.name}}
                 </div>
               </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue

@@ -66,7 +66,7 @@
           </div>
           <div class="inline_block">
             病区：
-            <div class="under_line" style="width: 50px; text-align: center">
+            <div class="under_line" style="width: 70px; text-align: left">
               <span>{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
@@ -75,7 +75,7 @@
 
             </div>
           </div>
-          <div class="inline_block" >
+          <div class="inline_block" style="margin-left: 10px;">
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
               <span >{{
@@ -997,7 +997,7 @@
                       <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">L</span>
                     </div>
                     <div class="inline_block" style="flex: 1">
-                      计划超滤量：
+                      目标超滤量：
                       <div
                         class="under_line"
                         style="width: 60px; text-align: center"
@@ -1757,7 +1757,7 @@
           </div>
             <div class="inline_block">
               病区：
-              <div class="under_line" style="width: 50px; text-align: center">
+              <div class="under_line" style="width: 70px; text-align: left">
               <span>{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
@@ -1765,7 +1765,7 @@
               }}</span>
             </div>
             </div>
-            <div class="inline_block" >
+            <div class="inline_block" style="margin-left: 10px;">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
               <span>{{