Merge branch 'master' of git.mes123.com:zhouyx/mes-ui

pages/order/quotation/index.vue

 <template>
-  <Layout class="full">
+  <Layout class="quotation">
     <!-- 左侧树 -->
     <Sider hide-trigger :style="{background: '#fff'}" width="260">
       <div class="zh-tree" :style="{ height: treeHeight + 'px' }">
@@ -364,8 +364,8 @@ export default {
     };
   },
   created() {
-    this.treeHeight = window.innerHeight - 155;
-    this.tableHeight = window.innerHeight - 290;
+    this.treeHeight = window.innerHeight - 150;
+    this.tableHeight = window.innerHeight - 280;
     this.newColumn = this.column;
     this.tableTata(this.selectName);
   },
@@ -377,8 +377,8 @@ export default {
       ///浏览器窗口大小变化
       return (() => {
         window.screenHeight = window.innerHeight;
-        this.treeHeight = window.screenHeight - 155;
-        this.tableHeight = window.innerHeight - 290;
+        this.treeHeight = window.screenHeight - 150;
+        this.tableHeight = window.innerHeight - 280;
       })();
     };
   },
@@ -823,4 +823,9 @@ export default {
   margin-top: 15px;
 }
 </style>
+<style>
+.ivu-layout.ivu-layout-has-sider > .ivu-layout {
+  overflow-y: hidden !important;
+}
+</style>