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

layouts/basic-layout/product.vue

@@ -23,8 +23,7 @@
               </tr>
               <tr v-for="(item,i) in filterSider">
                 <td class="t_title">
-                  <b class="title"
-                  >{{item.title}}</b>
+                  <b class="title">{{item.title}}</b>
                 </td>
                 <td>
                   <ul class="table_row_ul">
@@ -35,10 +34,9 @@
                 </td>
               </tr>
             </table>
-
           </div>
-      </span>
-        </a>
+        </span>
+      </a>
       <i-header-breadcrumb v-if="showBreadcrumb && !headerMenu && !isMobile" ref="breadcrumb" />
       <i-header-search v-if="showSearch && !headerMenu && !isMobile && !showBreadcrumb" />
       <div class="header_right">
@@ -52,7 +50,7 @@
         <i-header-notice v-if="showNotice" />
         <i-header-user />
         <!-- <i-header-i18n v-if="showI18n" />
-        <i-header-setting v-if="enableSetting && !isMobile" /> -->
+        <i-header-setting v-if="enableSetting && !isMobile" />-->
       </div>
     </Header>
     <Content class="i-layout-content">
@@ -107,7 +105,7 @@ export default {
   },
   data() {
     return {
-      isActive:0,
+      isActive: 0,
       showDrawer: false,
       ticking: false,
       headerVisible: true,
@@ -288,14 +286,14 @@ export default {
       });
     },
     goPage(u) {
-      this.$router.push(u.path)
-      this.isActive = u.id
+      this.$router.push(u.path);
+      this.isActive = u.id;
     },
-    goIndex(){
-      this.$router.push("/")
+    goIndex() {
+      this.$router.push("/");
     },
-    goIndexTwo(){
-      this.$router.push("/home")
+    goIndexTwo() {
+      this.$router.push("/home");
     }
   },
   mounted() {
@@ -312,6 +310,9 @@ export default {
 
 <style lang="less">
 .product-layout {
+  .i-layout-content {
+    padding: 5px 10px;
+  }
   .ivu-layout-header {
     height: 50px;
     line-height: 50px;
@@ -335,7 +336,8 @@ export default {
         -webkit-transition: width 0.5s, height 0.5s, -webkit-transform 0.5s; /* Safari */
         transition: width 0.5s, height 0.5s, transform 0.5s;
         i {
-          -webkit-transition: font-size 0.5s, margin 0.5s, -webkit-transform 0.5s; /* Safari */
+          -webkit-transition: font-size 0.5s, margin 0.5s,
+            -webkit-transform 0.5s; /* Safari */
           transition: font-size 0.5s, margin 0.5s, transform 0.5s;
         }
       }
@@ -348,10 +350,10 @@ export default {
         top: 57%;
         min-width: 1084px;
         min-height: 300px;
-        box-shadow: 0px 5px 17px 5px rgba(0,0,0,0.28);
+        box-shadow: 0px 5px 17px 5px rgba(0, 0, 0, 0.28);
         background: #f5f6fa;
-        .t_table_box{
-          border-collapse:collapse;
+        .t_table_box {
+          border-collapse: collapse;
           border-radius: 5px;
           tr:first-of-type {
             border-top-right-radius: 5px;
@@ -365,15 +367,15 @@ export default {
               border-bottom-left-radius: 5px;
             }
           }
-          tr{
+          tr {
             // line-height: 35px;
-            td{
+            td {
               padding: 9px 10px 0px;
-              .table_row_ul{
+              .table_row_ul {
                 list-style: none;
-                border-bottom: 1px solid #E0E0E0;
+                border-bottom: 1px solid #e0e0e0;
                 text-align: left;
-                li{
+                li {
                   list-style: none;
                   display: inline-block;
                   a {
@@ -383,15 +385,15 @@ export default {
                     margin: 0px 6px;
                     border-radius: 4px;
                   }
-                  a:hover{
+                  a:hover {
                     background: #2680eb;
                     color: white;
                   }
-                  a:visited{
+                  a:visited {
                     background: #2680eb;
                     color: white;
                   }
-                  a.active{
+                  a.active {
                     background: #2680eb;
                     color: white;
                   }
@@ -399,32 +401,32 @@ export default {
               }
             }
           }
-          .t_title{
+          .t_title {
             min-width: 120px;
             background: #515a6e;
-            .a_goIndex{
+            .a_goIndex {
               color: #fff;
             }
-            .title{
+            .title {
               padding: 5px 10px;
             }
           }
         }
       }
     }
-      .menu:hover .home {
-        margin-top: 10px;
-        height: 60px;
-        width: 60px;
-        z-index: 88888;
-      }
-      .menu:hover .home .top_menu_box {
-        display: block;
-      }
-      .menu:hover .home i {
-        font-size: 33px;
-        margin: 13px 0 0;
-      }
+    .menu:hover .home {
+      margin-top: 10px;
+      height: 60px;
+      width: 60px;
+      z-index: 88888;
+    }
+    .menu:hover .home .top_menu_box {
+      display: block;
+    }
+    .menu:hover .home i {
+      font-size: 33px;
+      margin: 13px 0 0;
+    }
     .ivu-breadcrumb {
       height: 50px;
       line-height: 50px;

pages/order/quotation/index.vue

 <template>
   <Layout class="quotation">
     <!-- 左侧树 -->
-    <Sider hide-trigger :style="{background: '#fff',marginRight:'10px'}" width="260">
+    <Sider hide-trigger :style="{background: '#fff'}" width="260">
       <Tree-Type @func="getMsgFormSon" :style="{ height: treeHeight + 'px' }"></Tree-Type>
     </Sider>
     <!-- 右侧内容 -->
@@ -814,19 +814,5 @@ export default {
   }
 };
 </script>
-<style lang="less" scoped>
-.quotation {
-  margin-right: 10px;
-  .zh-tree {
-    margin-left: 15px;
-    height: inherit !important;
-  }
-}
-.table {
-  margin-top: 15px;
-}
-.seach {
-  margin-top: 15px;
-}
-</style>
+