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

src/components/sale/orderlist.vue

 <!--订单列表-->
 <template>
   <div class="classorder">
-    <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0" style="">
-      <tr>
+    <div class="table-head">
+     <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
+          <colgroup>
+              <col width="12%" />
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="8%"/>
+              <col>
+          </colgroup>
+          <thead>
+             <tr class="fix_th">
+               <th width="12%">单号</th>
+               <th width="7.5%">人数</th>
+               <th width="7.5%">单价</th>
+               <th width="7.5%">成交</th>
+                <th width="7.5%">应收总额</th>
+               <th width="7.5%">实收</th>
+                <th width="7.5%">优惠</th>
+               <th width="7.5%">退款</th>
+               <th width="7.5%">平台税金</th>
+               <th width="7.5%">待收金额</th>
+                <th width="8%">状态</th>
+               <th v-if="isEdit">操作</th>
+             </tr>
+        </thead>
+     </table>
+    </div>
+    <div class="table-body">
+
+   
+    <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
+      <!-- <tr class="fix_th">
         <th width="12%">单号</th>
         <th width="7.5%">人数</th>
         <th width="7.5%">单价</th>
@@ -15,10 +52,25 @@
         <th width="7.5%">待收金额</th>
         <th width="8%">状态</th>
         <th v-if="isEdit">操作</th>
-      </tr>
+      </tr> -->
+      <colgroup>
+              <col width="12%" />
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="7.5%"/>
+              <col width="8%"/>
+              <col>
+          </colgroup>
       <tr>
         <td v-show="dataList && dataList.length==0" :colspan="12" align="center">暂无数据</td>
       </tr>
+     
       <tbody v-for="(item,index) in dataList" :key="index">
         <tr>
           <td :rowspan="3" style="text-align: left">
@@ -366,6 +418,7 @@
           </td>
         </tr>
       </tbody>
+     
       <tbody v-if="cancelList&&cancelList.length>0">
         <tr>
           <td :colspan="12">
@@ -609,6 +662,7 @@
       </tbody>
       <!--取消订单-->
     </table>
+     </div>
     <!--修改订单-->
     <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" @close="closeOrderSaveForm" @success="refreshOrder">
     </editorder-form>
@@ -1342,6 +1396,11 @@
     color: #000;
     text-align: center;
   }
-
+.table-body{
+  height:590px;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+ 
 
 </style>