Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/BatchPrintPage.vue

@@ -33,7 +33,7 @@
         font-size: 15px;
     }
     ._PrintPage_always{
-      /* page-break-after: always; */
+      page-break-after: always;
       padding-top: 10px;
     }
 </style>
@@ -91,8 +91,7 @@
                   <my-HB-Bill v-on:helloPP="numAdd" :Num="num" :ID="items.id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-HB-Bill>
                 </div>
               </template>
-            </template>
-            <div style="page-break-after: always"></div>
+            </template>            
           </div>
         </div>
     </div>

src/components/dmc/manager/dmcTotalTable.vue

@@ -170,7 +170,7 @@
           <th width="75">{{$t('advmanager.v_line')}}<br />{{$t('admin.admin_leader')}}</th>
           <th width="75">{{$t('Operation.Op_jinchudian')}}</th>
           <th width="50">
-            <el-tooltip class="item" effect="dark" content="16/2 （成人16位，儿童2位）" placement="top">
+            <el-tooltip class="item" effect="dark" content="成人/小孩（财务佣金标记,未满15岁识别为小孩）" placement="top">
            <div> {{$t('ground.dingdan')}}<br />{{$t('admin.admin_personNumber')}}</div>
             </el-tooltip>
           </th>