fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by weiqingting
Commit d005df543f1e92d811ec396dbf5cb7c3fce09c8a 2 parents 946e6353 700c4df3

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
Inline Side-by-side
Showing 6 changed files with 78 additions and 22 deletions
@@ -27,19 +27,19 @@ @@ -27,19 +27,19 @@
27 <div class="overViewContent" style="margin-left: 125px"> 27 <div class="overViewContent" style="margin-left: 125px">
28 <div class="triangleShape"> 28 <div class="triangleShape">
29 <b>当前层级</b> 29 <b>当前层级</b>
30 - <div class="shape triangle-up {{num==1?'activeShape':''}}"> 30 + <div class="shape triangle-up {{rankLevel==1?'activeShape':''}}">
31 <span>前5%</span><i class="triangle-right"></i> 31 <span>前5%</span><i class="triangle-right"></i>
32 </div> 32 </div>
33 - <div class="shape trapezoid-1 {{num==2?'activeShape':''}}"> 33 + <div class="shape trapezoid-1 {{rankLevel==2?'activeShape':''}}">
34 <span>5%~20%</span><i class="triangle-right"></i> 34 <span>5%~20%</span><i class="triangle-right"></i>
35 </div> 35 </div>
36 - <div class="shape trapezoid-2 {{num==3?'activeShape':''}}"> 36 + <div class="shape trapezoid-2 {{rankLevel==3?'activeShape':''}}">
37 <span>20%~40%</span><i class="triangle-right"></i> 37 <span>20%~40%</span><i class="triangle-right"></i>
38 </div> 38 </div>
39 - <div class="shape trapezoid-3 {{num==4?'activeShape':''}}"> 39 + <div class="shape trapezoid-3 {{rankLevel==4?'activeShape':''}}">
40 <span>40%~65%</span><i class="triangle-right"></i> 40 <span>40%~65%</span><i class="triangle-right"></i>
41 </div> 41 </div>
42 - <div class="shape trapezoid-4 {{num==5?'activeShape':''}}"> 42 + <div class="shape trapezoid-4 {{rankLevel==5?'activeShape':''}}">
43 <span>65%~100%</span><i class="triangle-right"></i> 43 <span>65%~100%</span><i class="triangle-right"></i>
44 </div> 44 </div>
45 </div> 45 </div>
@@ -83,16 +83,32 @@ @@ -83,16 +83,32 @@
83 orderAmount: '2', 83 orderAmount: '2',
84 rankNow: '3', 84 rankNow: '3',
85 rankChange: '4', 85 rankChange: '4',
86 - num:4, 86 + rankLevel:4,
87 grid:{ 87 grid:{
88 - url:'/bigdata/getStorageStatisticsList', 88 + url:'/report/getOrdersGoodsRptList',
89 columns:[ 89 columns:[
90 - {name:'A',display:'skn',render:function () {  
91 - return 1; 90 + {display:'图片',render(item){
  91 + return item.imageUrl?'<img src="'+item.imageUrl+'">':"";
92 }}, 92 }},
93 - {name:'B',display:'skn',render:function () {  
94 - return 2;  
95 - }} 93 + {display:'SKN/SKC/SKU',render(item){
  94 + return '<p>SKN:'+item.productSkn+'</p>' +
  95 + '<p>SKC:'+item.productSkc+'</p>' +
  96 + '<p>SKU:'+item.productSku+'</p>';
  97 + }},
  98 + {display:'厂家编号',name:'factoryCode'},
  99 + {display:'商品名称',name:'goodsName'},
  100 + {display:'价格',render(item){
  101 + return '<p>吊牌价:'+item.retailPrice+'</p>' +
  102 + '<p>销售价:'+item.salePrice+'</p>';
  103 + }},
  104 + {display:'颜色/尺码',render(item){
  105 + return [item.colorName,item.sizeName].join('/');
  106 + }},
  107 + {display:'商品分类',render(item){
  108 + return [item.maxSortName,item.middleSortName,item.smallSortName].join('-');
  109 + }},
  110 + {display:'数量',name:''},
  111 + {display:'金额',name:''}
96 ] 112 ]
97 } 113 }
98 } 114 }
@@ -102,13 +118,15 @@ @@ -102,13 +118,15 @@
102 //this.fetchData2(); 118 //this.fetchData2();
103 }, 119 },
104 methods:{ 120 methods:{
105 - fetchData: function() { 121 + //获取店铺的经营指标：一个自然日内有效订单商品件数、有效订单商品金额
  122 + fetchData1: function() {
106 $.ajax({ 123 $.ajax({
107 type:"post", 124 type:"post",
108 url:"/report/getShopBusinessOverview", 125 url:"/report/getShopBusinessOverview",
109 dataType: 'json', 126 dataType: 'json',
110 success: function(rs) { 127 success: function(rs) {
111 - console.log(rs); 128 + this.buyNumbers = rs.data.buyNumbers;
  129 + this.orderAmount = rs.data.orderAmount;
112 }, 130 },
113 error: function(error) { 131 error: function(error) {
114 console.log(error) 132 console.log(error)
@@ -116,13 +134,16 @@ @@ -116,13 +134,16 @@
116 }) 134 })
117 }, 135 },
118 136
  137 + //获取店铺的品牌排名，当前等级、排名、上升名词
119 fetchData2: function() { 138 fetchData2: function() {
120 $.ajax({ 139 $.ajax({
121 type:"post", 140 type:"post",
122 url:"/report/getShopBrandRank", 141 url:"/report/getShopBrandRank",
123 dataType: 'json', 142 dataType: 'json',
124 success: function(rs) { 143 success: function(rs) {
125 - console.log(rs); 144 + this.rankNow = rs.data.rankNow;
  145 + this.rankChange = rs.data.rankChange;
  146 + this.rankLevel = rs.data.rankLevel;
126 }, 147 },
127 error: function(error) { 148 error: function(error) {
128 console.log(error) 149 console.log(error)
@@ -67,8 +67,8 @@ @@ -67,8 +67,8 @@
67 {display:'商品分类',render(item){ 67 {display:'商品分类',render(item){
68 return [item.maxSortName,item.middleSortName,item.smallSortName].join('-'); 68 return [item.maxSortName,item.middleSortName,item.smallSortName].join('-');
69 }}, 69 }},
70 - {display:'请退出库数量',name:''},  
71 - {display:'请退出库金额',name:''} 70 + {display:'请退出库数量',name:'outStorageNums'},
  71 + {display:'请退出库金额',name:'outStorageAmount'}
72 ] 72 ]
73 } 73 }
74 } 74 }
@@ -66,8 +66,8 @@ @@ -66,8 +66,8 @@
66 {display:'商品分类',render(item){ 66 {display:'商品分类',render(item){
67 return [item.maxSortName,item.middleSortName,item.smallSortName].join('-'); 67 return [item.maxSortName,item.middleSortName,item.smallSortName].join('-');
68 }}, 68 }},
69 - {display:'发货入库数量',name:''},  
70 - {display:'发货入库金额',name:''} 69 + {display:'发货入库数量',name:'inStorageNums'},
  70 + {display:'发货入库金额',name:'inStorageAmount'}
71 ] 71 ]
72 } 72 }
73 } 73 }
@@ -7,28 +7,36 @@ module.exports=function(app) { @@ -7,28 +7,36 @@ module.exports=function(app) {
7 7
8 app.vue("/report/businessOverview", "report.BusinessOverview"); 8 app.vue("/report/businessOverview", "report.BusinessOverview");
9 9
  10 + //获取店铺的经营指标：一个自然日内有效订单商品件数、有效订单商品金额
10 app.post("/report/getShopBusinessOverview", "report_getShopBusinessOverview"); 11 app.post("/report/getShopBusinessOverview", "report_getShopBusinessOverview");
11 12
  13 + //获取店铺的品牌排名，当前等级、排名、上升名词
12 app.post("/report/getShopBrandRank", "report_getShopBrandRank"); 14 app.post("/report/getShopBrandRank", "report_getShopBrandRank");
13 15
  16 + //对账结算
  17 + app.post("/report/getOrdersGoodsAccountRptList", "report_getOrdersGoodsAccountRptList");
14 18
15 /*************************************商品销售报表*************************************/ 19 /*************************************商品销售报表*************************************/
16 20
17 app.vue("/report/businessSale", "report.BusinessSale"); 21 app.vue("/report/businessSale", "report.BusinessSale");
18 22
  23 + app.post("/report/getOrdersGoodsRptList", "report_getOrdersGoodsRptList"); //销售统计
  24 +
  25 + app.post("/report/getReturnGoodsRptList", "report_getReturnGoodsRptList"); //退货统计
  26 +
19 /*************************************出入库报表*************************************/ 27 /*************************************出入库报表*************************************/
20 28
21 app.vue("/report/importExportStock", "report.ImportExportStock"); 29 app.vue("/report/importExportStock", "report.ImportExportStock");
22 30
23 - app.post("/report/getStorageInRptList", "report_getStorageInRptList"); 31 + app.post("/report/getStorageInRptList", "report_getStorageInRptList"); //发货入库统计
24 32
25 - app.post("/report/getStorageOutRptList", "report_getStorageOutRptList"); 33 + app.post("/report/getStorageOutRptList", "report_getStorageOutRptList"); //请退出库统计
26 34
27 /*************************************库存报表*************************************/ 35 /*************************************库存报表*************************************/
28 36
29 app.vue("/report/stock", "report.Stock"); 37 app.vue("/report/stock", "report.Stock");
30 38
31 - app.post("/bigdata/getStorageStatisticsList", "report_getStorageStatisticsList"); 39 + app.post("/bigdata/getStorageStatisticsList", "report_getStorageStatisticsList"); //查询库存列表
32 40
33 /*************************************会员画像*************************************/ 41 /*************************************会员画像*************************************/
34 42
@@ -9,11 +9,13 @@ module.exports={ @@ -9,11 +9,13 @@ module.exports={
9 domain:"{bigdata}", 9 domain:"{bigdata}",
10 url: "/bigdata/getShopBusinessOverview" 10 url: "/bigdata/getShopBusinessOverview"
11 }, 11 },
  12 +
12 getShopBrandRank:{ 13 getShopBrandRank:{
13 title: "获取店铺的品牌排名，当前等级、排名、上升名词", 14 title: "获取店铺的品牌排名，当前等级、排名、上升名词",
14 domain:"{bigdata}", 15 domain:"{bigdata}",
15 url: "/bigdata/getShopBrandRank" 16 url: "/bigdata/getShopBrandRank"
16 }, 17 },
  18 +
17 getOrdersGoodsAccountRptList:{ 19 getOrdersGoodsAccountRptList:{
18 title:"对账结算", 20 title:"对账结算",
19 domain:"{bigdata}", 21 domain:"{bigdata}",
@@ -40,6 +42,25 @@ module.exports={ @@ -40,6 +42,25 @@ module.exports={
40 sortId:{type:Number} 42 sortId:{type:Number}
41 } 43 }
42 }, 44 },
  45 +
  46 + getReturnGoodsRptList:{
  47 + title:'退货统计',
  48 + domain:'{bigdata}',
  49 + url:'/shop/getReturnGoodsRptList',
  50 + params:{
  51 + page:{type:Number},
  52 + size:{type:Number},
  53 + type:{type:Number},
  54 + reqTime:{type:String},
  55 + beginTime:{type:String},
  56 + endTime:{type:String},
  57 + productSkn:{type:Number},
  58 + productSkc:{type:Number},
  59 + productSku:{type:Number},
  60 + factoryCode:{type:String},
  61 + sortId:{type:Number}
  62 + }
  63 + },
43 64
44 /*************************************出入库报表*************************************/ 65 /*************************************出入库报表*************************************/
45 66
@@ -59,6 +80,7 @@ module.exports={ @@ -59,6 +80,7 @@ module.exports={
59 sortId:{type:Number} 80 sortId:{type:Number}
60 } 81 }
61 }, 82 },
  83 +
62 getStorageOutRptList:{ 84 getStorageOutRptList:{
63 title:'请退出库统计', 85 title:'请退出库统计',
64 domain:'{bigdata}', 86 domain:'{bigdata}',
@@ -92,6 +92,11 @@ @@ -92,6 +92,11 @@
92 margin-left: 0; 92 margin-left: 0;
93 } 93 }
94 94
  95 +.detailList{
  96 + background-color: #FFFFFF;
  97 + font-size: 14px;
  98 +}
  99 +
95 .dataModle1{ 100 .dataModle1{
96 box-sizing: border-box; 101 box-sizing: border-box;
97 padding: 10px 0; 102 padding: 10px 0;