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 id="businessIndex">
+        <div class="overViewTitle">
+            <h3>经营指标</h3>
+            <span>展示当日经营指标数据（15:30更新）</span>
+        </div>
+
+        <div class="overViewContent" style="margin-left: 200px">
+            <div class="dataModle1">
+                <p>有效订单的商品件数</p>
+                <h2>{{buyNumbers}}</h2>
+            </div>
+            <div class="dataModle1">
+                <p>有效订单的商品金额（元）</p>
+                <h2>{{orderAmount}}</h2>
+            </div>
+            <div class="clearfix"></div>
+        </div>
+    </div>
+
+    <div id="brandRanking">
+        <div class="overViewTitle">
+            <h3>品牌排名</h3>
+            <span>x月x日品牌排名</span>
+        </div>
+
+        <div class="overViewContent" style="margin-left: 125px">
+            <div class="triangleShape">
+                <b>当前层级</b>
+                <div class="shape triangle-up {{num==1?'activeShape':''}}">
+                    <span>前5%</span><i class="triangle-right"></i>
+                </div>
+                <div class="shape trapezoid-1 {{num==2?'activeShape':''}}">
+                    <span>5%~20%</span><i class="triangle-right"></i>
+                </div>
+                <div class="shape trapezoid-2 {{num==3?'activeShape':''}}">
+                    <span>20%~40%</span><i class="triangle-right"></i>
+                </div>
+                <div class="shape trapezoid-3 {{num==4?'activeShape':''}}">
+                    <span>40%~65%</span><i class="triangle-right"></i>
+                </div>
+                <div class="shape trapezoid-4 {{num==5?'activeShape':''}}">
+                    <span>65%~100%</span><i class="triangle-right"></i>
+                </div>
+            </div>
+            <div class="rankData">
+                <div class="dataModle2">
+                    <p>同品类中<br>品牌排名为</p>
+                    <h2>第<b>{{rankNow}}</b>名</h2>
+                </div>
+
+                <div class="dataModle2">
+                    <p>较上周同期</p>
+                    <h2><i>↑</i><b>{{rankChange}}</b>个名次</h2>
+                </div>
+            </div>
+            <div class="clearfix"></div>
+        </div>
+    </div>
+
+    <div id="businessDetail">
+        <div class="overViewTitle">
+            <h3>交易明细</h3>
+            <span>展示当日商品交易情况（15:30更新）</span>
+        </div>
+
+        <div class="detailList">
+            <com-grid :columns="grid.columns" :url="grid.url"></com-grid>
+        </div>
+    </div>
+</template>
+
+<script>
+    import grid from '../../../../components/grid/index';
+
+    export default {
+        components:{
+            comGrid: grid
+        },
+        data() {
+            return {
+                buyNumbers: '1',
+                orderAmount: '2',
+                rankNow: '3',
+                rankChange: '4',
+                num:4,
+                grid:{
+                    url:'/bigdata/getStorageStatisticsList',
+                    columns:[
+                        {name:'A',display:'skn',render:function () {
+                            return 1;
+                        }},
+                        {name:'B',display:'skn',render:function () {
+                            return 2;
+                        }}
+                    ]
+                }
+            }
+
+        },
+        ready() {
+            //this.fetchData2();
+        },
+        methods:{
+            fetchData: function() {
+                $.ajax({
+                    type:"post",
+                    url:"/report/getShopBusinessOverview",
+                    dataType: 'json',
+                    success: function(rs) {
+                        console.log(rs);
+                    },
+                    error: function(error) {
+                        console.log(error)
+                    }
+                })
+            },
+
+            fetchData2: function() {
+                $.ajax({
+                    type:"post",
+                    url:"/report/getShopBrandRank",
+                    dataType: 'json',
+                    success: function(rs) {
+                        console.log(rs);
+                    },
+                    error: function(error) {
+                        console.log(error)
+                    }
+                })
+            }
+        }
+    }
+</script>
\ No newline at end of file

@@ -2,28 +2,7 @@ var Vue = require("vue");
 
 new Vue({
     el: 'body',
-    data: {
-        buyNumbers: '12222',
-        orderAmount: '123',
-        rankNow: '3',
-        rankChange: '33'
-    },
-    methods:{
-        fetchData: function() {
-            $.ajax({
-                type:"post",
-                url:"/report/getShopBusinessOverview",
-                dataType: 'json',
-                success: function(rs) {
-                    console.log(rs);
-                },
-                error: function() {
-
-                }
-            })
-        }
-    },
-    ready: function() {
-        this.fetchData();
+    components: {
+        app:require("./app.vue")
     }
-});
+});
\ 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>
+        <uc-import :import-data="import"></uc-import>
     </template>
     <template v-if="tab.active==1">
-        <uc-export :exportData="export"></uc-export>
+        <uc-export :export-data="export"></uc-export>
     </template>
 </template>
 
@@ -26,15 +26,20 @@
                     active:0
                 },
                 import:{
-                    card:[
-                        {name:"库存总金额（元）",value:"89004.00"},
-                        {name:"库存总金额（元）",value:"89004.00"},
-                        {name:"库存总金额（元）",value:"89004.00"},
-                        {name:"库存总金额（元）",value:"89004.00"}
+                    cards:[
+                        {name:"库存总金额（元）",value:"1.00"},
+                        {name:"库存总金额（元）",value:"2.00"},
+                        {name:"库存总金额（元）",value:"3.00"},
+                        {name:"库存总金额（元）",value:"4.00"}
                     ]
                 },
                 export:{
-
+                    cards:[
+                        {name:"库存总金额（元）",value:"1.00"},
+                        {name:"库存总金额（元）",value:"2.00"},
+                        {name:"库存总金额（元）",value:"3.00"},
+                        {name:"库存总金额（元）",value:"4.00"}
+                    ]
                 }
             }
         }

@@ -34,19 +34,8 @@
                     </div>
                 </div>
 
-                <uc-Card :rows="card.rows"></uc-Card>
 
-                <div class="row" style="text-align: center">
-                    <div class="dataModle">
-                        <p>请退出库总数量</p>
-                        <h2>1024</h2>
-                    </div>
-                    <div class="dataModle">
-                        <p>请退出库总金额（元）</p>
-                        <h2>89004.00</h2>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
+                <uc-card :rows="exportData.cards"></uc-card>
             </div>
         </div>
 
@@ -64,18 +53,22 @@
 </template>
 
 <script>
+    import card from './card';
+
     export default {
+        components:{
+            ucCard:card
+        },
+        props:{
+            exportData:{type:Object, default:{}}
+        },
         data(){
             return {
-                card:{
-                    rows:[
-                        {name:"库存总金额（元）",value:"89004.00"},
-                        {name:"库存总金额（元）",value:"89004.00"},
-                        {name:"库存总金额（元）",value:"89004.00"},
-                        {name:"库存总金额（元）",value:"89004.00"}
-                    ]
-                }
+
             }
+        },
+        ready(){
+            console.log(this.exportData.cards);
         }
     }
 </script>
\ No newline at end of file

+<template>
+    <div class="panel-col">
+        <input type="text" class="form-control" placeholder="SKN" v-model="params.skn">
+    </div>
+    <div class="panel-col">
+        <input type="text" class="form-control" placeholder="SKU" v-model="params.sku">
+    </div>
+    <div class="panel-col">
+        <input type="text" class="form-control" placeholder="厂家编号" v-model="params.factoryCode">
+    </div>
+    <div class="panel-col">
+        <select class="form-control" v-model="params.type">
+            <option value="-1">目录</option>
+            <option value="0">衣服</option>
+            <option value="1">裤子</option>
+            <option value="2">鞋子</option>
+        </select>
+    </div>
+</template>
+
+<script>
+    export default {
+        props:{
+            params:{type:Object, default:{}}
+        },
+        data(){
+
+        },
+        methods:{
+
+        }
+    }
+</script>
\ No newline at end of file

 <template>
     <div id="importStock" class="contentpanel shopsReport">
         <div class="panel">
-            <div class="panel-heading">
-                <h1>发货入库</h1>
-            </div>
+            <div class="panel-heading"><h1>发货入库</h1></div>
+
             <div class="panel-body">
                 <div class="row">
+                    <uc-filter :params.sync="params"></uc-filter>
+
                     <div class="panel-col">
-                        <input type="text" name="startDate" id="startDate" class="form-control" placeholder="起始时间">
-                    </div>
-                    <div class="panel-col">
-                        <input type="text" name="endDate" id="endDate" class="form-control" placeholder="结束时间">
-                    </div>
-                    <div class="panel-col">
-                        <input type="text" name="SKN" id="SKN" class="form-control" placeholder="SKN">
-                    </div>
-                    <div class="panel-col">
-                        <input type="text" name="SKU" id="SKU" class="form-control" placeholder="SKU">
-                    </div>
-                    <div class="panel-col">
-                        <input type="text" class="form-control" placeholder="厂家编号">
-                    </div>
-                    <div class="panel-col">
-                        <select name="type" id="type" tabindex="-1" class="form-control">
-                            <option value="-1" selected>一级目录</option>
-                            <option value="0">衣服</option>
-                            <option value="1">裤子</option>
-                            <option value="2">鞋子</option>
-                        </select>
-                    </div>
-                    <div class="panel-col">
-                        <a id="filter-btn" href="javascript:;" class="btn btn-info">搜索</a>
+                        <a id="filter-btn" href="javascript:;" class="btn btn-info" @click="submit()">搜索</a>
                     </div>
                 </div>
 
-                <uc-Card :rows="card.rows"></uc-Card>
-
+                <uc-card :rows="importData.cards"></uc-card>
             </div>
         </div>
 
         <div class="panel">
-            <div class="panel-heading">
-                <h2>——发货入库报表——</h2>
-            </div>
+            <div class="panel-heading"><h2>——发货入库报表——</h2></div>
 
             <div class="panel-body nopadding">
-
+                <com-grid :columns="grid.columns" :url="grid.url"></com-grid>
             </div>
         </div>
-
     </div>
 </template>
 
 <script>
-
+    import grid from '../../../../components/grid/index';
     import card from './card';
+    import filer from './filter';
 
     export default {
         components:{
+            comGrid: grid,
             ucCard:card,
+            ucFilter:filer
+        },
+        props:{
+            importData:{type:Object, default:{}}
         },
         data() {
             return {
-                // checkedFields: [],
-                card:{
-                    rows:[
-                        {name:"库存总金额（元）",value:"89004.00"},
-                        {name:"库存总金额（元）",value:"89004.00"},
-                        {name:"库存总金额（元）",value:"89004.00"},
-                        {name:"库存总金额（元）",value:"89004.00"}
-                    ]
-                },
                 params:{
-                    productSkn:"",
-                    factory_code:"",
-                    productSku:"",
-                    shopId:"",
-                    brandId:"",
-                    maxSortId:"",
-                    middleSortId:"",
-                    smallSortId:""
+                   skn:"123",
+                   sku:"abc",
+                   factoryCode:"hello",
+                   type:1
                 },
                 grid:{
                     url:'/bigdata/getStorageStatisticsList',
                     columns:[
-                        {name:'productSkn',display:'skn'}
+                        {name:'图片',display:'skn'},
+                        {name:'单号',display:'skn'},
+                        {name:'SKN/SKU',display:'skn'},
+                        {name:'厂家编号',display:'skn'},
+                        {name:'商品名称',display:'skn'},
+                        {name:'进货价',display:'skn'},
+                        {name:'颜色/尺码',display:'skn'},
+                        {name:'商品分类',display:'skn'},
+                        {name:'发货入库数量',display:'skn'},
+                        {name:'发货入库金额',display:'skn'}
                     ]
                 }
             }
         },
         methods: {
-
-        },
-        events:{
-
+            submit(){
+                console.log(this.params);
+            }
         }
     }
 </script>

@@ -6,9 +6,8 @@ module.exports=function(app) {
     /*************************************经营总览*************************************/
     app.vue("/report/businessOverview", "report.BusinessOverview");
 
-    app.post("/report/getShopBusinessOverview", "report_getShopBusinessOverview",function(){
-        return{name:"666"}
-    });
+    app.post("/report/getShopBusinessOverview", "report_getShopBusinessOverview");
+
     app.post("/report/getShopBrandRank", "report_getShopBrandRank");
 
 
@@ -27,5 +26,5 @@ module.exports=function(app) {
     
 
     /*************************************会员画像*************************************/
-    app.vue("/report/charts", "reportManager.Charts");
+    app.vue("/report/charts", "report.Charts");
 }
\ No newline at end of file

 <%include '../../common/views/__ui/header'%>
 
-<div id="businessIndex">
-    <div class="overViewTitle">
-        <h3>经营指标</h3>
-        <span>展示当日经营指标数据（15:30更新）</span>
-    </div>
+<app></app>
 
-    <div class="overViewContent" style="margin-left: 200px">
-        <div class="dataModle1">
-            <p>有效订单的商品件数</p>
-            <h2>{{buyNumbers}}</h2>
-        </div>
-        <div class="dataModle1">
-            <p>有效订单的商品金额（元）</p>
-            <h2>{{orderAmount}}</h2>
-        </div>
-        <div style="clear: both"></div>
-    </div>
-</div>
-
-<div id="brandRanking">
-    <div class="overViewTitle">
-        <h3>品牌排名</h3>
-        <span>x月x日品牌排名</span>
-    </div>
-
-    <div class="overViewContent" style="margin-left: 125px">
-        <div class="triangleShape">
-            <b>当前层级</b>
-            <div class="shape triangle-up"><span>前5%</span><i class="triangle-right"></i></div>
-            <div class="shape trapezoid-1"><span>5%~20%</span><i class="triangle-right"></i></div>
-            <div class="shape trapezoid-2 activeShape"><span>20%~40%</span><i class="triangle-right"></i></div>
-            <div class="shape trapezoid-3"><span>40%~65%</span><i class="triangle-right"></i></div>
-            <div class="shape trapezoid-4"><span>65%~100%</span><i class="triangle-right"></i></div>
-        </div>
-        <div class="rankData">
-            <div class="dataModle2">
-                <p>同品类中<br>品牌排名为</p>
-                <h2>第<b>{{rankNow}}</b>名</h2>
-            </div>
-
-            <div class="dataModle2">
-                <p>较上周同期</p>
-                <h2><i>↑</i><b>{{rankChange}}</b>个名次</h2>
-            </div>
-        </div>
-        <div style="clear: both"></div>
-    </div>
-</div>
-
-<div id="businessDetail">
-    <div class="overViewTitle">
-        <h3>交易明细</h3>
-        <span>展示当日商品交易情况（15:30更新）</span>
-    </div>
-</div>
 <%include '../../common/views/__ui/footer'%>
\ No newline at end of file

@@ -30,4 +30,9 @@
 	      }
 	    }
 	}
-</script>
\ No newline at end of file
+</script>
+<style>
+	.tabheader{
+		font-family: 'microsoft yahei';
+	}
+</style>
\ No newline at end of file

@@ -5,6 +5,10 @@
     color: #585858;
     background: transparent;
 
+    .nopadding{
+      padding: 0 15px;
+    }
+
     .panel{
       border-radius: 0;
       clear: both;