Skip to content

D
DataCenter_Core2.1_20190520
Commit 4e50c7d3 by guanzhenshan
Options

1、逻辑仓库趋势图增加可按日期筛选的功能，数据保存格式要调整 

2、动态库存分析增加点击数据显示明细功能
3、现金流增加点击进入aims现金流明细
parent d03d4726
Showing with 107 additions and 112 deletions
Bailun.DC.Models/Stock/mSkuWarehouse.cs
......@@ -149,6 +149,6 @@ namespace Bailun.DC.Models.Stock
/// <summary>
/// 可销售天数
/// </summary>
public int available_days { get; set; }
public int? available_days { get; set; }
}
}
Bailun.DC.Web/Areas/Reports/Views/Warehouse/DynamicStockAnalyse.cshtml
......@@ -55,7 +55,7 @@
$('#tb').html('');
for (var i in result.data) {
var s = '<tr>';
var s = '<tr onclick="showDetail(\'' + result.data[i].item1 + '\',\''+result.data[i].item5+'\')" style="cursor:pointer;">';
s += '<td>' + result.data[i].item1 + '</td>';
s += '<td>' + result.data[i].item2 + '</td>';
s += '<td>' + result.data[i].item3 + '</td>';
......@@ -67,6 +67,10 @@
})
}
function showDetail(name, type) {
layer_show(name + ' 可用库存的SKU明细', '@Url.Content("~/Reports/Warehouse/ListWareHouseSku?warehouse_code="+ ViewBag.warehouse_code)'+'&available_days='+type,'90%','90%');
}
</script>
}
......
Bailun.DC.Web/Areas/Reports/Views/Warehouse/ListWareHouseSku.cshtml
......@@ -61,6 +61,20 @@
<input id="stockamountmax" name="stockamountmax" class="form-control" type="number" style="width:125px;" placeholder="库存金额结束" />
</div>
<div class="form-group">
<label>可销售天数</label>
<select id="available_days" name="available_days" class="form-control" style="width:160px;">
<option value="">请选择可销售天数</option>
<option value="-15">少于15天</option>
<option value="15-30">15-30天</option>
<option value="30-45">30-45天</option>
<option value="45-60">45-60天</option>
<option value="60-90">60-90天</option>
<option value="90-120">90-120天</option>
<option value="120-180">120-180天</option>
<option value="180-">180天以上</option>
</select>
</div>
<div class="form-group">
<label>&nbsp;</label>
<button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
<button type="button" class="btn btn-warning" onclick="exportlist()">导出</button>
......@@ -98,6 +112,10 @@
var height = document.body.clientHeight;
$("#roletable").attr("data-height", (height - 160));
if ('@(ViewBag.available_days)' != '') {
$('#available_days').val('@(ViewBag.available_days)');
}
list();
//listwarehouse();
......@@ -119,7 +137,7 @@
}
},
{ field: 'warehouse_name', title: '所在仓库', width: '110', sortable: true },
{ field: 'warehouse_name', title: '所在仓库', width: '130', sortable: true },
{
field: 'push_status', title: '推送产品库', width: '120', sortable: true, formatter: function (idx, data) {
var s = '<span style="color:' + (data.push_status=='是'?"#01B468":"red") + ';">' + data.push_status + '</span>';
......@@ -183,11 +201,19 @@
{ field: 'sevenday_total_sales', title: '七天销量', width: '100', sortable: true },
{ field: 'fourteenday_total_sales', title: '十四天销量', width: '120', sortable: true },
{ field: 'thirtyday_total_sales', title: '三十天销量', width: '130', sortable: true },
{ field: 'cash_in_30days', title: '30天现金流收入', width: '130', sortable: true, iscount: true },
{ field: 'cash_out_30days', title: '30天现金流支出', width: '130', sortable: true, iscount: true },
{
field: 'cash_in_30days', title: '30天现金流收入', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
return '<a href="javascript:;" onclick="ShowCashFlow(\'' + data.warehouse_code + '\',\'' + data.warehouse_name + '\',\'' + data.bailun_sku + '\')">' + data.cash_in_30days + '</a>';
}
},
{
field: 'cash_out_30days', title: '30天现金流支出', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
return '<a href="javascript:;" onclick="ShowCashFlow(\'' + data.warehouse_code + '\',\'' + data.warehouse_name + '\',\'' + data.bailun_sku + '\')">' + data.cash_out_30days + '</a>';
}
},
{ field: 'cash_net', title: '净值(30d)', width: '130', sortable: true, iscount: true },
{ field: 'pin_rate_stock', title: '动销率%(30d)', width: '120', sortable: true, iscount: true },
{ field: 'available_days', title:'可销售天数',width:'110'}
{ field: 'available_days', title: '可销售天数', width: '110', sortable: true}
];
var s = '';
......@@ -298,6 +324,10 @@
}
}
function ShowCashFlow(code, name,sku) {
layer_show(name + '现金流明细', 'http://aims.bailuntec.com/view/reports/cash-flow-sku.html?warehouse_code=' + code+'&bailun_sku='+sku, '90%', '90%');
}
</script>
}
......
Bailun.DC.Web/Areas/Reports/Views/Warehouse/LogicWarehouse.cshtml
......@@ -159,12 +159,12 @@
},
{
field: 'cash_in_30days', title: '30天现金流收入', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
return data.cash_in_30days + '<img src="@Url.Content("~/img/icon-trendchart.png")" title="30天现金流收入趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'30天现金流收入\',\'cash_in_30days\',\'' + data.warehouse_name + '\');" />';
return '<a href="javascript:;" onclick="ShowCashFlow(\'' + data.warehouse_code + '\',\''+data.warehouse_name+'\')">' + data.cash_in_30days + '</a><img src="@Url.Content("~/img/icon-trendchart.png")" title="30天现金流收入趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'30天现金流收入\',\'cash_in_30days\',\'' + data.warehouse_name + '\');" />';
}
},
{
field: 'cash_out_30days', title: '30天现金流支出', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
return data.cash_out_30days + '<img src="@Url.Content("~/img/icon-trendchart.png")" title="30天现金流支出趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'30天现金流支出\',\'cash_out_30days\',\'' + data.warehouse_name + '\');" />';
return '<a href="javascript:;" onclick="ShowCashFlow(\'' + data.warehouse_code + '\',\'' + data.warehouse_name + '\')">' + data.cash_out_30days + '</a><img src="@Url.Content("~/img/icon-trendchart.png")" title="30天现金流支出趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'30天现金流支出\',\'cash_out_30days\',\'' + data.warehouse_name + '\');" />';
}
},
{
......@@ -254,6 +254,10 @@
layer_show(whname+"=》"+name + '的趋势图', '@Url.Content("~/Reports/Warehouse/WarehouseTrendChart?warehouse_code=")' + code + '&key=' + key + '&titlename=' + name,'90%','90%');
}
function ShowCashFlow(code,name) {
layer_show(name + '现金流明细', 'http://aims.bailuntec.com/view/reports/cash-flow-sku.html?warehouse_code=' + code,'90%','90%');
}
</script>
}
......
Bailun.DC.Web/Views/Home/Main.cshtml
......@@ -111,93 +111,6 @@
}
}
}
else
{
<li>
<a href="javascript:;">
<i class="fa fa-money"></i>
<span class="nav-label">亚马逊</span>
<span class="fa arrow"></span>
</a>
<ul class="nav nav-third-level">
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/AmazonSaleStatistics")" data-index="0" style="padding-left:74px;">
<span>非FBA销售统计</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/FBASaleStatistics")" data-index="0" style="padding-left:74px;">
<span>FBA销售统计</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListOrder?platform=Amazon")" data-index="0" style="padding-left:74px;">
<span>订单流水</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/FinanceFee?platform=Amazon")" data-index="0" style="padding-left:74px;">
<span>财务费用</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/FBAAbnormalOrder")" data-index="0" style="padding-left:74px;">
<span>FBA异常订单</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/PlatformFeeAbnormal?platform=Amazon")" data-index="0" style="padding-left:74px;">
<span>平台费异常订单</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListPlatformCost?p=Amazon")" data-index="0" style="padding-left:74px;">
<span>自发货平台费用流水</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListPlatformCost?p=FBA")" data-index="0" style="padding-left:74px;">
<span>FBA平台费用流水</span>
</a>
</li>
</ul>
</li>
<li>
<a href="javascript:;">
<i class="fa fa-money"></i>
<span class="nav-label">Ebay</span>
<span class="fa arrow"></span>
</a>
<ul class="nav nav-third-level">
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/EbaySaleStatistics")" data-index="0" style="padding-left:74px;">
<span>Ebay销售统计</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/EbayStatisticsByWebsite")" data-index="0" style="padding-left:74px;">
<span>Ebay站点销售统计</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListOrder?platform=Ebay")" data-index="0" style="padding-left:74px;">
<span>订单流水</span>
</a>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/ListPlatformCost?p=Ebay")" data-index="0" style="padding-left:74px;">
<span>Ebay平台费用流水</span>
</a>
</li>
</ul>
</li>
<li>
<a class="J_menuItem" href="@Url.Content("~/Reports/Orders/PlatformProfitCount")" data-index="0">
<i class="fa fa-money"></i>
<span>平台利润统计</span>
</a>
</li>
}
</ul>
</div>
</nav>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment