menu color

@@ -47,9 +47,7 @@ export default {
             let menu = _.find(this.$purviews, purview => purview.id === menuId);
             let menu = _.find(this.$purviews, purview => purview.id === menuId);
 
 
             if (menu) {
             if (menu) {
-                setTimeout(() => {
                 this.$router.push(menu.menu_url);
                 this.$router.push(menu.menu_url);
-                }, 100);
             }
             }
         }
         }
     },
     },
@@ -75,10 +73,6 @@ $collapseLeftBorder: 2px;
     }
     }
 }
 }
 
 
-.ivu-menu-item-group-title {
-    color: #9ea7b4 !important;
-}
-
 .ivu-menu-submenu-title {
 .ivu-menu-submenu-title {
     .collapse {
     .collapse {
         display: none;
         display: none;
@@ -122,6 +116,7 @@ $collapseLeftBorder: 2px;
         }
         }
 
 
         .ivu-menu {
         .ivu-menu {
+            background: #313540 !important;
             display: none;
             display: none;
             position: absolute;
             position: absolute;
             top: 49px;
             top: 49px;

@@ -8,7 +8,7 @@
 
 
         <layout-action>
         <layout-action>
             <Button type="error" @click="onClickCreate" :disabled="this.selection.length === 0">发货</Button>
             <Button type="error" @click="onClickCreate" :disabled="this.selection.length === 0">发货</Button>
-            <Button type="primary" @click="back">返回发货入库列表</Button>
+            <Button type="primary" @click="$router.go(-1)">返回发货入库列表</Button>
         </layout-action>
         </layout-action>
 
 
         <layout-list>
         <layout-list>

@@ -85,14 +85,14 @@ export default {
             return this.search();
             return this.search();
         },
         },
         getParams() {
         getParams() {
-            let params = _.toPairs(Object.assign(this.query, {
+            let params = Object.assign(this.query, {
                 maxSortId: _.get(this.category, '[0].value'),
                 maxSortId: _.get(this.category, '[0].value'),
                 middleSortId: _.get(this.category, '[1].value'),
                 middleSortId: _.get(this.category, '[1].value'),
                 smallSortId: _.get(this.category, '[2].value')
                 smallSortId: _.get(this.category, '[2].value')
-            }, this.pageData));
+            }, this.pageData);
 
 
             delete params.total;
             delete params.total;
-            return _.fromPairs(params.filter(item => item[1]));
+            return _.pickBy(params, val => val);
         },
         },
         reset() {
         reset() {
             this.category = [];
             this.category = [];

 import overview from './overview-iframe';
 import overview from './overview-iframe';
-import sale from './sale';
+import sale from './sale-iframe';
+import outinstore from './outinstore-iframe';
+import stock from './stock-iframe';
 
 
 export default {
 export default {
     overview,
     overview,
-    sale
+    sale,
+    outinstore,
+    stock
 };
 };

+const page = r => require.ensure([], () => r(require('./outinstore')), 'statistics.outinstore');
+
+export default {
+    path: '/outinstore.html',
+    name: 'outinstore',
+    component: page,
+    meta: {
+        pageName: '出入库统计'
+    }
+};

+<template>
+ <layout-body>
+  <iFrame :src="`${$config.shopsFeDomain}/report/importExportStock`"></iFrame>
+ </layout-body>
+</template>

+const page = r => require.ensure([], () => r(require('./stock')), 'statistics.stock');
+
+export default {
+    path: '/stock.html',
+    name: 'stock',
+    component: page,
+    meta: {
+        pageName: '销售统计'
+    }
+};

+<template>
+ <layout-body>
+  <iFrame :src="`${$config.shopsFeDomain}/report/stock`"></iFrame>
+ </layout-body>
+</template>