Merge branch 'yohobuy-shop-dev-4.6-20160606' of http://git.yoho.cn/fe/yohobuy-sh…

…op-fe2 into yohobuy-shop-dev-4.6-20160606

-<template>
-    <div class="tabheader shopsReport">
-        <ul class="nav nav-tabs">
-            <li class="active"><a href="javascript:">发货入库</a></li>
-            <li><a href="javascript:">请退出库</a></li>
-        </ul>
-    </div>
-
-    <uc-import></uc-import>
-    <uc-export></uc-export>
-</template>
-
-<script>
-    import ucImportStock from './importStock';
-    import ucExportStock from './exportStock';
-
-    export default{
-        components:{
-            ucImport:ucImportStock,
-            ucExport:ucExportStock
-        }
-    }
-</script>
\ No newline at end of file

+<template>
+    <com-tab :rows="tab.rows" :active.sync="tab.active"></com-tab>
+    <template v-if="tab.active==0">
+        <uc-import :importData="import"></uc-import>
+    </template>
+    <template v-if="tab.active==1">
+        <uc-export :exportData="export"></uc-export>
+    </template>
+</template>
+
+<script>
+    import tab from '../../../../components/tab/index';
+    import ucImportStock from './importStock';
+    import ucExportStock from './exportStock';
+
+    export default{
+        components:{
+            comTab: tab,
+            ucImport:ucImportStock,
+            ucExport:ucExportStock
+        },
+        data(){
+            return {
+                tab:{
+                    rows:[{name:"发货入库"}, {name:"请退出库"}],
+                    active:0
+                },
+                import:{
+                    card:[
+                        {name:"库存总金额（元）",value:"89004.00"},
+                        {name:"库存总金额（元）",value:"89004.00"},
+                        {name:"库存总金额（元）",value:"89004.00"},
+                        {name:"库存总金额（元）",value:"89004.00"}
+                    ]
+                },
+                export:{
+
+                }
+            }
+        }
+    }
+</script>
\ No newline at end of file

@@ -3,7 +3,7 @@ var Vue = require("vue");
 new Vue({
     el: 'body',
     components: {
-        app:require("./importExportStock.vue")
+        app:require("./app.vue")
     }
 });