Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

components/page/dataGrid.vue

@@ -68,7 +68,7 @@
         </ul>
     </Drawer>
 
-    <FooterToolbar v-if="batch" v-show="footerToolbar">
+    <FooterToolbar v-if="batch" v-show="footerToolbar" class="ftball">
         <div class="tip">已选{{selectItems.length}}项</div>
         <slot name="batch"></slot>
         <Button @click="cancelBatch">取消</Button>

components/page/import/process.vue

@@ -465,18 +465,5 @@ export default {
         }
     }
 
-    .table-footer {
-        line-height: 45px;
-        background: #f5f5f5;
-    }
-
-    .ivu-footer-toolbar {
-        text-align: left;
-        background: #f5f5f5;
-
-        .ivu-footer-toolbar-right {
-            float: left;
-        }
-    }
 }
 </style>

pages/import/process.vue

 <template>
-<div class="table-content">
+<div class="table-contentProcess">
     <div class="table-tools">
         <div class="table-search">
             <Form inline>
@@ -758,7 +758,7 @@ export default {
 </script>
 
 <style lang="less">
-.table-content {
+.table-contentProcess {
     position: relative;
     height: 100%;
     display: flex;
@@ -813,7 +813,7 @@ export default {
 
     .ivu-footer-toolbar {
         text-align: left;
-        background: #f5f5f5;
+        // background: #f5f5f5;
 
         .ivu-footer-toolbar-right {
             float: left;