Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -46,7 +46,7 @@
               <div class="under_line_two" style="width: 500px;text-align: left">{{record.patient.diagnose}}</div>
             </div>
           </div>
-          <div class="row" :class="record.monitor_records.length > 8  ? 'margin-bottom-300': ''">
+          <div class="row">
             <table class="proj_table">
               <tbody>
                 <tr><td colspan="2">一、透析前护理评估：</td></tr>
@@ -281,6 +281,8 @@
               </tbody>
             </table>
           </div>
+          <div v-if="record.monitor_records.length > 8 " :class="record.monitor_records.length > 8  ? 'margin-bottom-300': ''" style="text-align:center;margin-top:10px;">1</div>
+          
           <template v-if="record.monitor_records.length > 8 ">
             <div class="order-yy-name">{{orgname}}</div>
             <div class="order_title">血液净化专科护理记录单</div>
@@ -322,7 +324,7 @@
               </div>
             </div>
           </template>
-          <div class="row" :style="record.monitor_records.length <= 8 ? 'margin-top:-11px':''" :class="record.monitor_records.length > 8 ? 'margin-bottom-900':'margin-bottom-300'">
+          <div class="row" :style="record.monitor_records.length <= 8 ? 'margin-top:-11px':''">
             <table class="proj_table" >
               <tbody>
                 <tr v-if="record.monitor_records2.length > 0">
@@ -539,6 +541,8 @@
               </tbody>
             </table>
           </div>
+          <div v-if="record.monitor_records.length > 8" :class="record.monitor_records.length > 8 ? 'margin-bottom-900':'margin-bottom-300'" style="text-align:center;margin-top:10px;">2</div>
+          <div v-else class="margin-bottom-300" style="text-align:center;margin-top:10px;">1</div>
           <div class="order-yy-name">{{orgname}}</div>
           <div class="order_title">血液净化科医嘱及执行单</div>
           <div class="row" >
@@ -760,7 +764,7 @@
               </tr>
             </tbody>
           </table>
-          <table class="print-table-no" border="1" style="border-top:0;" count="0"  :style="record.advices2.length > 0 ? 'margin-bottom:350px;border-top:0;':'border-top:0;'">
+          <table class="print-table-no" border="1" style="border-top:0;" count="0">
             <tbody>
               <tr style="line-height:35px;padding:8px 5px;">
                 <td colspan="7" style="font-size: 18px">医嘱</td>
@@ -816,6 +820,7 @@
               </template>
             </tbody>
           </table>
+          <div :style="record.advices2.length > 0 ? 'margin-bottom:350px;border-top:0;text-align:center;margin-top:10px;':'border-top:0;text-align:center;margin-top:10px;'" >1</div>
 
           <template v-if="record.advices2.length > 0">
             <div class="order-yy-name">{{orgname}}</div>
@@ -910,6 +915,7 @@
                 </template>
               </tbody>
             </table>
+            <div style="text-align:center;margin-top:10px;" >2</div>
           </template>
         </div>
       </div>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -40,7 +40,7 @@
         </div>
       </div>
 
-      <div class="row" :class="this.monitors.length > 8  ? 'margin-bottom-300': ''">
+      <div class="row">
         <table class="proj_table" >
           <tbody>
             <tr><td colspan="2">一、透析前护理评估：</td></tr>
@@ -277,6 +277,7 @@
           </tbody>
         </table>
       </div>
+      <div v-if="this.monitors.length > 8 " :class="this.monitors.length > 8  ? 'margin-bottom-300': ''" style="text-align:center;margin-top:10px;">1</div>
       <template v-if="this.monitors.length > 8 ">
         <div class="order-yy-name">{{orgname}}</div>
         <div class="order-title">血液净化专科护理记录单</div>
@@ -317,7 +318,7 @@
         </div>
       </template>
       <div class="row" :style="this.monitors.length <= 8 ? 'margin-top:-11px':''">
-        <table class="proj_table" :class="this.monitors.length > 8 ? 'margin-bottom-900':'margin-bottom-300'">
+        <table class="proj_table">
           <tbody>
             <tr v-if="this.monitors2.length > 0">
               <td style="padding: 0;" colspan="2">
@@ -536,6 +537,8 @@
             </tr>
           </tbody>
         </table>
+        <div v-if="this.monitors.length > 8" :class="this.monitors.length > 8 ? 'margin-bottom-900':'margin-bottom-300'" style="text-align:center;margin-top:10px;">2</div>
+        <div v-else class="margin-bottom-300" style="text-align:center;margin-top:10px;">1</div>
 
         <div class="order-yy-name">{{orgname}}</div>
         <div class="order_title"> 血液净化科医嘱及执行单 </div>
@@ -765,7 +768,7 @@
             </tr>
           </tbody>
         </table>
-        <table class="print-table-no" border="1"  count="0" :style="this.advice_groups_2.length > 0 ? 'margin-bottom:350px;border-top:0;':'border-top:0;'">
+        <table class="print-table-no" border="1"  count="0" >
           <tbody>
             <tr style="line-height:35px;padding:8px 5px;">
               <td colspan="7" style="font-size: 18px">医嘱</td>
@@ -824,6 +827,7 @@
             </template>
           </tbody>
         </table>
+        <div :style="this.advice_groups_2.length > 0 ? 'margin-bottom:350px;border-top:0;text-align:center;margin-top:10px;':'border-top:0;text-align:center;margin-top:10px;'" >1</div>
 
         <template v-if="this.advice_groups_2.length > 0">
           <div class="order-yy-name">{{orgname}}</div>
@@ -920,6 +924,7 @@
               </template>
             </tbody>
           </table>
+          <div style="text-align:center;margin-top:10px;" >2</div>
         </template>
       </div>
     </div>