库存管理

@@ -56,10 +56,11 @@ export default {
       // checkedFields: [],
       card:{
         rows:[
-          {name:"库存总金额（元）",value:"89004.00"},
-          {name:"库存总金额（元）",value:"89004.00"},
-          {name:"库存总金额（元）",value:"89004.00"},
-          {name:"库存总金额（元）",value:"89004.00"}
+          {name:"库存总数量",value:"0"},
+          {name:"库存总金额（元）",value:"0"},
+          {name:"已上架商品数",value:"0"},
+          {name:"待上架商品数",value:"0"},
+          {name:"已下架商品数",value:"0"}
         ]
       },
       params:{
@@ -75,7 +76,23 @@ export default {
       grid:{
         url:'/bigdata/getStorageStatisticsList',
         columns:[
-          {name:'productSkn',display:'skn'}
+          {display:'图片',name:'imageUrl',render:function(item){
+            return item.imageUrl?'<img src="'+item.imageUrl+'">':"";
+          }},
+          {display:'SKN/SKU',name:'skn',render:function(item){
+            return '<p>SKN:'+item.productSkn+'</p><p>SKU:'+item.productSku+'</p>';
+          }},
+          {display:'厂家编号',name:'skn'},//goodsName
+          {display:'商品名称',name:'goodsName'},
+          {display:'进货价',name:'purchasePrice'},
+          {display:'颜色/尺码',name:'skn',render:function(item){
+            return [item.colorName,item.sizeName].join('/');
+          }},
+          {display:'商品分类',name:'skn',render:function(item){
+            return [item.maxSortName,item.middleSortName,item.smallSortName].join('-');
+          }},
+          {display:'库存数量',name:'storeNums'},
+          {display:'库存金额(元)',name:'storageAmount'}
         ]
       }
     }
@@ -90,8 +107,15 @@ export default {
   },
   events:{
     complete(data){
-      this.card.rows[0].value="wocao";
-      console.log(data);
+      let result=data.additionInfo;
+      if(result){
+        this.card.rows[0].value=result.storageTotalNum;
+        this.card.rows[1].value=result.storageTotalMoney;
+        this.card.rows[2].value=result.onSaleTotalNum;
+        this.card.rows[3].value=result.preSaleTotalNum;
+        this.card.rows[4].value=result.outSaleTotalNum;
+      }
+      
     }
   }
 }

@@ -2,7 +2,7 @@
 	<div class="row" style="text-align: center">
                 <div class="dataModle" v-for="row in rows">
                     <p>{{row.name}}</p>
-                    <h2>{{row.value}}</h2>
+                    <h2>{{row.value||0}}</h2>
                 </div>
                 <div class="clearfix"></div>
             </div>

@@ -16,7 +16,7 @@
           <template v-if="data.length > 0">
             <tr v-for="item in data">
               <td v-if="checkAble"><input type="checkbox" id="{{item[checkedField]}}" value="{{item[checkedField]}}" v-model="checkedFields"></td>
-              <td v-for="option in columnsConfigs" >{{bodyCell(item,option)}} </td>
+              <td v-for="option in columnsConfigs" >{{{bodyCell(item,option)}}} </td>
             </tr>
           </template>
           <template v-else>