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

# Conflicts:
#	code/apps/report/client/Stock/app.vue

+<template>
+    <uc-area></uc-area>
+    <uc-person></uc-person>
+</template>
+
+<script>
+    import areaCharts from './areaCharts.vue';
+    import personCharts from './personCharts.vue';
+
+    export default {
+        components:{
+            ucArea: areaCharts,
+            ucPerson:personCharts
+        }
+    }
+</script>
\ No newline at end of file

 var Vue = require("vue");
-var AreaCharts = require("./areaCharts");
-var PersonCharts = require("./personCharts");
 
 new Vue({
     el: 'body',
     components: {
-        nvArea_charts: AreaCharts,
-        nvPerson_charts: PersonCharts
+        app:require("./app.vue")
     }
-});
+});
\ No newline at end of file

 <template>
     <div id="exportStock" class="contentpanel shopsReport" style="display1: none">
         <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 href="javascript:;" class="btn btn-info" @click="submit()">搜索</a>
                     </div>
                 </div>
 
-
                 <uc-card :rows="exportData.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>
 
@@ -53,22 +28,55 @@
 </template>
 
 <script>
+    import grid from '../../../../components/grid/index';
     import card from './card';
+    import filer from './filter';
 
     export default {
         components:{
-            ucCard:card
+            comGrid: grid,
+            ucCard:card,
+            ucFilter:filer
         },
         props:{
             exportData:{type:Object, default:{}}
         },
-        data(){
+        data() {
             return {
-
+                params:{
+                    skn:"",
+                    sku:"",
+                    factoryCode:"",
+                    type:-1
+                },
+                grid:{
+                    url:'/report/getStorageOutRptList',
+                    columns:[
+                        {display:'图片',render(item){
+                            return item.imageUrl?'<img src="'+item.imageUrl+'">':"";
+                        }},
+                        {display:'SKN/SKU',render(item){
+                            return '<p>SKN:'+item.productSkn+'</p><p>SKU:'+item.productSku+'</p>';
+                        }},
+                        {display:'厂家编号',name:'factoryCode'},
+                        {display:'商品名称',name:'goodsName'},
+                        {display:'进货价',name:'purchasePrice'},
+                        {display:'颜色/尺码',render(item){
+                            return [item.colorName,item.sizeName].join('/');
+                        }},
+                        {display:'商品分类',render(item){
+                            return [item.maxSortName,item.middleSortName,item.smallSortName].join('-');
+                        }},
+                        {display:'请退出库数量',name:''},
+                        {display:'请退出库金额',name:''}
+                    ]
+                }
             }
         },
-        ready(){
-            console.log(this.exportData.cards);
+        methods: {
+            submit(){
+                console.log(this.params);
+            }
         }
     }
 </script>
\ No newline at end of file

@@ -8,7 +8,7 @@
                     <uc-filter :params.sync="params"></uc-filter>
 
                     <div class="panel-col">
-                        <a id="filter-btn" href="javascript:;" class="btn btn-info" @click="submit()">搜索</a>
+                        <a href="javascript:;" class="btn btn-info" @click="submit()">搜索</a>
                     </div>
                 </div>
 
@@ -43,24 +43,31 @@
         data() {
             return {
                 params:{
-                   skn:"123",
-                   sku:"abc",
-                   factoryCode:"hello",
-                   type:1
+                   skn:"",
+                   sku:"",
+                   factoryCode:"",
+                   type:-1
                 },
                 grid:{
-                    url:'/bigdata/getStorageStatisticsList',
+                    url:'/report/getStorageInRptList',
                     columns:[
-                        {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'}
+                        {display:'图片',render(item){
+                            return item.imageUrl?'<img src="'+item.imageUrl+'">':"";
+                        }},
+                        {display:'SKN/SKU',render(item){
+                            return '<p>SKN:'+item.productSkn+'</p><p>SKU:'+item.productSku+'</p>';
+                        }},
+                        {display:'厂家编号',name:'factoryCode'},
+                        {display:'商品名称',name:'goodsName'},
+                        {display:'进货价',name:'purchasePrice'},
+                        {display:'颜色/尺码',render(item){
+                            return [item.colorName,item.sizeName].join('/');
+                        }},
+                        {display:'商品分类',render(item){
+                            return [item.maxSortName,item.middleSortName,item.smallSortName].join('-');
+                        }},
+                        {display:'发货入库数量',name:''},
+                        {display:'发货入库金额',name:''}
                     ]
                 }
             }

-
 <template>
-
 <div class="contentpanel shopsReport">
     <div class="panel">
         <div class="panel-heading">
@@ -25,7 +23,7 @@
                 </div>
             </div>
 
-            <uc-Card :rows="card.rows"></uc-Card>
+            <uc-card :rows="cards"></uc-card>
         </div>
     </div>
 
@@ -35,8 +33,7 @@
         </div>
 
         <div class="panel-body nopadding">
-          <com-grid :columns="grid.columns" :url="grid.url">
-          </com-grid>
+          <com-grid :columns="grid.columns" :url="grid.url"></com-grid>
         </div>
     </div>
 
@@ -58,16 +55,13 @@ export default {
   },
   data() {
     return {
-      // checkedFields: [],
-      card:{
-        rows:[
+      cards: [
           {name:"库存总数量",value:"0"},
           {name:"库存总金额（元）",value:"0"},
           {name:"已上架商品数",value:"0"},
           {name:"待上架商品数",value:"0"},
           {name:"已下架商品数",value:"0"}
-        ]
-      },
+      ],
       params:{
         productSkn:"",
         factory_code:"",
@@ -81,19 +75,19 @@ export default {
       grid:{
         url:'/bigdata/getStorageStatisticsList',
         columns:[
-          {display:'图片',name:'imageUrl',render(item){
+          {display:'图片',render(item){
             return item.imageUrl?'<img src="'+item.imageUrl+'">':"";
           }},
-          {display:'SKN/SKU',name:'skn',render(item){
+          {display:'SKN/SKU',render(item){
             return '<p>SKN:'+item.productSkn+'</p><p>SKU:'+item.productSku+'</p>';
           }},
-          {display:'厂家编号',name:'skn'},//goodsName
+          {display:'厂家编号',name:'factoryCode'},
           {display:'商品名称',name:'goodsName'},
           {display:'进货价',name:'purchasePrice'},
-          {display:'颜色/尺码',name:'skn',render(item){
+          {display:'颜色/尺码',render(item){
             return [item.colorName,item.sizeName].join('/');
           }},
-          {display:'商品分类',name:'skn',render(item){
+          {display:'商品分类',render(item){
             return [item.maxSortName,item.middleSortName,item.smallSortName].join('-');
           }},
           {display:'库存数量',name:'storeNums'},

@@ -4,6 +4,7 @@
 module.exports=function(app) {
 
     /*************************************经营总览*************************************/
+    
     app.vue("/report/businessOverview", "report.BusinessOverview");
 
     app.post("/report/getShopBusinessOverview", "report_getShopBusinessOverview");
@@ -12,19 +13,25 @@ module.exports=function(app) {
 
 
     /*************************************商品销售报表*************************************/
+    
     app.vue("/report/businessSale", "report.BusinessSale");
 
-
     /*************************************出入库报表*************************************/
+    
     app.vue("/report/importExportStock", "report.ImportExportStock");
 
+    app.post("/report/getStorageInRptList", "report_getStorageInRptList");
+
+    app.post("/report/getStorageOutRptList", "report_getStorageOutRptList");
 
     /*************************************库存报表*************************************/
+    
     app.vue("/report/stock", "report.Stock");
 
     app.post("/bigdata/getStorageStatisticsList", "report_getStorageStatisticsList");
     
-
     /*************************************会员画像*************************************/
+    
     app.vue("/report/charts", "report.Charts");
+    
 }
\ No newline at end of file

@@ -3,12 +3,12 @@ module.exports={
     namespace:"report",
     apis:{
         /*************************************经营总览*************************************/
+
         getShopBusinessOverview:{
             title: "获取店铺的经营指标：一个自然日内有效订单商品件数、有效订单商品金额",
             domain:"{bigdata}",
             url: "/bigdata/getShopBusinessOverview"
         },
-
         getShopBrandRank:{
             title: "获取店铺的品牌排名，当前等级、排名、上升名词",
             domain:"{bigdata}",
@@ -19,7 +19,9 @@ module.exports={
             domain:"{bigdata}",
             url: "/shop/getOrdersGoodsAccountRptList"
         },
+
         /*************************************商品销售报表*************************************/
+
         getOrdersGoodsRptList:{
             title:'销售统计',
             domain:'{bigdata}',
@@ -38,9 +40,44 @@ module.exports={
                 sortId:{type:Number}
             }
         },
+
         /*************************************出入库报表*************************************/
 
+        getStorageInRptList:{
+            title:'发货入库统计',
+            domain:'{bigdata}',
+            url:'/shop/getStorageInRptList',
+            params:{
+                page:{type:Number},
+                size:{type:Number},
+                beginTime:{type:String},
+                endTime:{type:String},
+                productSkn:{type:Number},
+                productSkc:{type:Number},
+                productSku:{type:Number},
+                factoryCode:{type:String},
+                sortId:{type:Number}
+            }
+        },
+        getStorageOutRptList:{
+            title:'请退出库统计',
+            domain:'{bigdata}',
+            url:'/shop/getStorageOutRptList',
+            params:{
+                page:{type:Number},
+                size:{type:Number},
+                beginTime:{type:String},
+                endTime:{type:String},
+                productSkn:{type:Number},
+                productSkc:{type:Number},
+                productSku:{type:Number},
+                factoryCode:{type:String},
+                sortId:{type:Number}
+            }
+        },
+
         /*************************************库存报表*************************************/
+
         getStorageStatisticsList:{
             title:"查询库存列表",
             domain:"{bigdata}",
@@ -56,6 +93,7 @@ module.exports={
                 smallSortId:{type: Number}
             }
         }
+
         /*************************************会员画像*************************************/
     }
 }
\ No newline at end of file

 <%include '../../common/views/__ui/header'%>
-<nv-area_charts></nv-area_charts>
-<nv-person_charts></nv-person_charts>
+
+<app></app>
+
 <%include '../../common/views/__ui/footer'%>
\ No newline at end of file