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

@@ -27,19 +27,19 @@
         <div class="overViewContent" style="margin-left: 125px">
             <div class="triangleShape">
                 <b>当前层级</b>
-                <div class="shape triangle-up {{num==1?'activeShape':''}}">
+                <div class="shape triangle-up {{rankLevel==1?'activeShape':''}}">
                     <span>前5%</span><i class="triangle-right"></i>
                 </div>
-                <div class="shape trapezoid-1 {{num==2?'activeShape':''}}">
+                <div class="shape trapezoid-1 {{rankLevel==2?'activeShape':''}}">
                     <span>5%~20%</span><i class="triangle-right"></i>
                 </div>
-                <div class="shape trapezoid-2 {{num==3?'activeShape':''}}">
+                <div class="shape trapezoid-2 {{rankLevel==3?'activeShape':''}}">
                     <span>20%~40%</span><i class="triangle-right"></i>
                 </div>
-                <div class="shape trapezoid-3 {{num==4?'activeShape':''}}">
+                <div class="shape trapezoid-3 {{rankLevel==4?'activeShape':''}}">
                     <span>40%~65%</span><i class="triangle-right"></i>
                 </div>
-                <div class="shape trapezoid-4 {{num==5?'activeShape':''}}">
+                <div class="shape trapezoid-4 {{rankLevel==5?'activeShape':''}}">
                     <span>65%~100%</span><i class="triangle-right"></i>
                 </div>
             </div>
@@ -83,16 +83,32 @@
                 orderAmount: '2',
                 rankNow: '3',
                 rankChange: '4',
-                num:4,
+                rankLevel:4,
                 grid:{
-                    url:'/bigdata/getStorageStatisticsList',
+                    url:'/report/getOrdersGoodsRptList',
                     columns:[
-                        {name:'A',display:'skn',render:function () {
-                            return 1;
+                        {display:'图片',render(item){
+                            return item.imageUrl?'<img src="'+item.imageUrl+'">':"";
                         }},
-                        {name:'B',display:'skn',render:function () {
-                            return 2;
-                        }}
+                        {display:'SKN/SKC/SKU',render(item){
+                            return '<p>SKN:'+item.productSkn+'</p>' +
+                                    '<p>SKC:'+item.productSkc+'</p>' +
+                                    '<p>SKU:'+item.productSku+'</p>';
+                        }},
+                        {display:'厂家编号',name:'factoryCode'},
+                        {display:'商品名称',name:'goodsName'},
+                        {display:'价格',render(item){
+                            return '<p>吊牌价:'+item.retailPrice+'</p>' +
+                                    '<p>销售价:'+item.salePrice+'</p>';
+                        }},
+                        {display:'颜色/尺码',render(item){
+                            return [item.colorName,item.sizeName].join('/');
+                        }},
+                        {display:'商品分类',render(item){
+                            return [item.maxSortName,item.middleSortName,item.smallSortName].join('-');
+                        }},
+                        {display:'数量',name:''},
+                        {display:'金额',name:''}
                     ]
                 }
             }
@@ -102,13 +118,15 @@
             //this.fetchData2();
         },
         methods:{
-            fetchData: function() {
+            //获取店铺的经营指标：一个自然日内有效订单商品件数、有效订单商品金额
+            fetchData1: function() {
                 $.ajax({
                     type:"post",
                     url:"/report/getShopBusinessOverview",
                     dataType: 'json',
                     success: function(rs) {
-                        console.log(rs);
+                        this.buyNumbers = rs.data.buyNumbers;
+                        this.orderAmount = rs.data.orderAmount;
                     },
                     error: function(error) {
                         console.log(error)
@@ -116,13 +134,16 @@
                 })
             },
 
+            //获取店铺的品牌排名，当前等级、排名、上升名词
             fetchData2: function() {
                 $.ajax({
                     type:"post",
                     url:"/report/getShopBrandRank",
                     dataType: 'json',
                     success: function(rs) {
-                        console.log(rs);
+                        this.rankNow = rs.data.rankNow;
+                        this.rankChange = rs.data.rankChange;
+                        this.rankLevel = rs.data.rankLevel;
                     },
                     error: function(error) {
                         console.log(error)

@@ -67,8 +67,8 @@
                         {display:'商品分类',render(item){
                             return [item.maxSortName,item.middleSortName,item.smallSortName].join('-');
                         }},
-                        {display:'请退出库数量',name:''},
-                        {display:'请退出库金额',name:''}
+                        {display:'请退出库数量',name:'outStorageNums'},
+                        {display:'请退出库金额',name:'outStorageAmount'}
                     ]
                 }
             }

@@ -66,8 +66,8 @@
                         {display:'商品分类',render(item){
                             return [item.maxSortName,item.middleSortName,item.smallSortName].join('-');
                         }},
-                        {display:'发货入库数量',name:''},
-                        {display:'发货入库金额',name:''}
+                        {display:'发货入库数量',name:'inStorageNums'},
+                        {display:'发货入库金额',name:'inStorageAmount'}
                     ]
                 }
             }

@@ -7,28 +7,36 @@ module.exports=function(app) {
     
     app.vue("/report/businessOverview", "report.BusinessOverview");
 
+    //获取店铺的经营指标：一个自然日内有效订单商品件数、有效订单商品金额
     app.post("/report/getShopBusinessOverview", "report_getShopBusinessOverview");
 
+    //获取店铺的品牌排名，当前等级、排名、上升名词
     app.post("/report/getShopBrandRank", "report_getShopBrandRank");
 
+    //对账结算
+    app.post("/report/getOrdersGoodsAccountRptList", "report_getOrdersGoodsAccountRptList");
 
     /*************************************商品销售报表*************************************/
     
     app.vue("/report/businessSale", "report.BusinessSale");
 
+    app.post("/report/getOrdersGoodsRptList", "report_getOrdersGoodsRptList");  //销售统计
+
+    app.post("/report/getReturnGoodsRptList", "report_getReturnGoodsRptList");  //退货统计
+
     /*************************************出入库报表*************************************/
     
     app.vue("/report/importExportStock", "report.ImportExportStock");
 
-    app.post("/report/getStorageInRptList", "report_getStorageInRptList");
+    app.post("/report/getStorageInRptList", "report_getStorageInRptList");  //发货入库统计
 
-    app.post("/report/getStorageOutRptList", "report_getStorageOutRptList");
+    app.post("/report/getStorageOutRptList", "report_getStorageOutRptList");  //请退出库统计
 
     /*************************************库存报表*************************************/
     
     app.vue("/report/stock", "report.Stock");
 
-    app.post("/bigdata/getStorageStatisticsList", "report_getStorageStatisticsList");
+    app.post("/bigdata/getStorageStatisticsList", "report_getStorageStatisticsList");  //查询库存列表
     
     /*************************************会员画像*************************************/
     

@@ -9,11 +9,13 @@ module.exports={
             domain:"{bigdata}",
             url: "/bigdata/getShopBusinessOverview"
         },
+        
         getShopBrandRank:{
             title: "获取店铺的品牌排名，当前等级、排名、上升名词",
             domain:"{bigdata}",
             url: "/bigdata/getShopBrandRank"
         },
+        
         getOrdersGoodsAccountRptList:{
             title:"对账结算",
             domain:"{bigdata}",
@@ -40,6 +42,25 @@ module.exports={
                 sortId:{type:Number}
             }
         },
+        
+        getReturnGoodsRptList:{
+            title:'退货统计',
+            domain:'{bigdata}',
+            url:'/shop/getReturnGoodsRptList',
+            params:{
+                page:{type:Number},
+                size:{type:Number},
+                type:{type:Number},
+                reqTime:{type:String},
+                beginTime:{type:String},
+                endTime:{type:String},
+                productSkn:{type:Number},
+                productSkc:{type:Number},
+                productSku:{type:Number},
+                factoryCode:{type:String},
+                sortId:{type:Number}
+            }
+        },
 
         /*************************************出入库报表*************************************/
 
@@ -59,6 +80,7 @@ module.exports={
                 sortId:{type:Number}
             }
         },
+        
         getStorageOutRptList:{
             title:'请退出库统计',
             domain:'{bigdata}',

@@ -92,6 +92,11 @@
     margin-left: 0;
 }
 
+.detailList{
+  background-color: #FFFFFF;
+  font-size: 14px;
+}
+
 .dataModle1{
     box-sizing: border-box;
     padding: 10px 0;