Skip to content

D
DataCenter_Core2.1_20190520
Commit eee0b886 by guanzhenshan
Options

增加ebay销售统计报表

parent 6fa7e3f5
Showing with 224 additions and 72 deletions
Bailun.DC.Models/Orders/dc_base_oms_order.cs
......@@ -178,6 +178,11 @@ namespace Bailun.DC.Models.Orders
public string other_currency { get; set; }
/// <summary>
/// 销售额
/// </summary>
public decimal amount_sales { get; set; }
/// <summary>
/// 收入总金额-原币种
/// </summary>
public decimal amount_total { get; set; }
......@@ -213,7 +218,7 @@ namespace Bailun.DC.Models.Orders
public decimal amount_refund { get; set; }
/// <summary>
/// 预付款-收钱没发货
/// 预付款-收钱没发货-人民币
/// </summary>
public decimal amount_prepaid { get; set; }
......@@ -393,5 +398,20 @@ namespace Bailun.DC.Models.Orders
/// </summary>
public decimal platform_fee_rate { get; set; }
/// <summary>
/// 订单里百伦SKU总数量
/// </summary>
public int quantity_bailun_sku { get; set; }
/// <summary>
/// 订单总数
/// </summary>
public int order_count { get; set; }
/// <summary>
/// 提现损耗
/// </summary>
public decimal loss_withdrawal { get; set; }
}
}
Bailun.DC.Models/Orders/mAmazonStatistics.cs
......@@ -134,6 +134,21 @@ namespace Bailun.DC.Models.Orders
/// </summary>
public decimal amount_refund { get; set; }
/// <summary>
/// fba费用
/// </summary>
public decimal cost_fba_fee { get; set; }
/// <summary>
/// paypal费用
/// </summary>
public decimal cost_paypal_fee { get; set; }
/// <summary>
/// 包装费用
/// </summary>
public decimal cost_package { get; set; }
}
......
Bailun.DC.Services/WareHouseServices.cs
......@@ -9,6 +9,27 @@ namespace Bailun.DC.Services
{
public class WareHouseServices
{
/// <summary>
/// 获取环球仓库类型
/// </summary>
/// <returns></returns>
public List<string> ListWareHouseType()
{
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if (cn.State == System.Data.ConnectionState.Closed)
{
cn.Open();
}
var sql = "select hq_type from dc_base_warehouse group by hq_type";
return cn.Query<string>(sql).AsList();
}
}
/// <summary>
/// 获取仓库列表
/// </summary>
......
Bailun.DC.Web/Areas/Reports/Views/Orders/AmazonSaleStatistics.cshtml
......@@ -10,13 +10,6 @@
<div class="ibox-content m-b-sm border-bottom">
<form id="toolbar">
<div class="form-inline" style="line-height:40px;">
@*<div class="form-group">
<label>统计维度：</label>
<select id="stype" name="stype" class="form-control">
<option value="1">按平台账号</option>
<option value="2">按销售员</option>
</select>
</div>*@
<div class="form-group">
<label>销售帐号：</label>
<select id="saleaccount" name="saleaccount" class="form-control" style="width:160px;">
......@@ -31,7 +24,7 @@
</div>
<div class="form-group">
<label>付款时间</label>
<input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"))" />
<input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"))" />
<span>至</span>
<input id="end" name="end" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.ToString("yyyy-MM-dd"))" />
</div>
......@@ -55,6 +48,10 @@
overflow: hidden;
text-overflow: ellipsis;
}
.alink {
color: cornflowerblue;
cursor: pointer;
}
</style>
}
@section scripts{
......@@ -84,19 +81,59 @@
}
},
{ field: 'website', title: '站点', width: '80', sortable: false, iscount: true },
{ field: 'amount_product', title: '商品收入', width: '100', sortable: true, iscount: true },
{ field: 'cost_product', title: '产品成本', width: '100', sortable: true, iscount: true },
{ field: 'platform_fee', title: '平台佣金费', width: '110', sortable: true, iscount: true },
{ field: 'head_fee', title: '头程费', width: '100', sortable: true, iscount: true },
{ field: 'order_count', title: '销售数量', width: '100', sortable: true, iscount: true },
{
field: 'amount_product', title: '商品收入', width: '100', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span class="alink" onclick="ShowDetail(\'' + data.platform_type + '\',\'' + data.website + '\',\'' + data.seller_account + '\',\'商品收入\',\'amount_product\',1)">' + data.amount_product + '</span>';
}
},
{
field: 'cost_product', title: '产品成本', width: '100', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span class="alink" onclick="ShowDetail(\'' + data.platform_type + '\',\'' + data.website + '\',\'' + data.seller_account + '\',\'产品成本\',\'cost_product\',1)">' + data.cost_product + '</span>';
}
},
{
field: 'platform_fee', title: '平台佣金费', width: '110', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span class="alink" onclick="ShowDetail(\'' + data.platform_type + '\',\'' + data.website + '\',\'' + data.seller_account + '\',\'平台佣金费\',\'cost_platform_fee\',1)">' + data.platform_fee + '</span>';
}
},
{
field: 'head_fee', title: '头程费', width: '100', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span class="alink" onclick="ShowDetail(\'' + data.platform_type + '\',\'' + data.website + '\',\'' + data.seller_account + '\',\'头程费\',\'cost_first\',1)">' + data.head_fee + '</span>';
}
},
{
field: 'order_count', title: '销售数量', width: '100', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span class="alink" onclick="ShowDetail(\'' + data.platform_type + '\',\'' + data.website + '\',\'' + data.seller_account + '\',\'订单数\',\'\',0)">' + data.order_count + '</span>';
}
},
{ field: 'loss_withdrawal', title: '提现损耗', width: '100', sortable: false, iscount: true },
{ field: 'cost_count', title: '总支出', width: '110', sortable: true, iscount: true },
{ field: 'nofba_logisticsfee', title: '实际物流费', width: '110', sortable: true, iscount: true },
{ field: 'amount_refund', title: '退款金额', width: '110', sortable: true, iscount: true },
{ field: 'amount_prepaid', title: '预收金额', width: '120', sortable: true, iscount: true },
{
field: 'cost_count', title: '总支出', width: '110', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span class="alink" onclick="ShowDetail(\'' + data.platform_type + '\',\'' + data.website + '\',\'' + data.seller_account + '\',\'总支出\',\'cost_total\',1)">' + data.cost_count + '</span>';
}
},
{
field: 'nofba_logisticsfee', title: '实际物流费', width: '110', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span class="alink" onclick="ShowDetail(\'' + data.platform_type + '\',\'' + data.website + '\',\'' + data.seller_account + '\',\'实际物流费\',\'cost_shipping\',1)">' + data.nofba_logisticsfee + '</span>';
}
},
{
field: 'amount_refund', title: '退款金额', width: '110', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span class="alink" onclick="ShowDetail(\'' + data.platform_type + '\',\'' + data.website + '\',\'' + data.seller_account + '\',\'退款金额\',\'amount_refund\',1)">' + data.amount_refund + '</span>';
}
},
{
field: 'amount_prepaid', title: '预收金额', width: '120', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span class="alink" onclick="ShowDetail(\'' + data.platform_type + '\',\'' + data.website + '\',\'' + data.seller_account + '\',\'预收金额\',\'amount_prepaid\',1)">' + data.amount_prepaid + '</span>';
}
},
//{ field: 'forecast_profit_rate', title: '预测利润率%', width: '120', sortable: true },
{ field: 'profit_count', title: '实际利润', width: '120', sortable: true, iscount: true },
{ field: 'profit_rate', title: '总实际利润率%', width: '130', sortable: true },
{
field: 'profit_count', title: '实际利润', width: '120', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span class="alink" onclick="ShowDetail(\'' + data.platform_type + '\',\'' + data.website + '\',\'' + data.seller_account + '\',\'实际利润\',\'profit_total\',1)">' + data.profit_count + '</span>';
}
},
{ field: 'profit_rate', title: '总实际利润率%', width: '130', sortable: true, iscount: true },
];
var url = '@Url.Content("~/Reports/Orders/ListAmazonSaleStatisticsJson")' + '?' + $("#toolbar").serialize();
......@@ -141,6 +178,10 @@
})
}
function ShowDetail(platform, website, account, coltitle, colval, single) {
layer_show(platform + " " + website + " " + $('#start').val() + "至" + $('#end').val() + ' 订单明细', '@Url.Content("~/Reports/Orders/ListOrderDetail?platform=")' + platform + '&website=' + website + '&account=' + account + '&start=' + $('#start').val() + '&end=' + $('#end').val() + '&col=' + colval + '&coltitle=' + coltitle + '&showsingle=' + single, '90%', '90%');
}
</script>
}
Bailun.DC.Web/Areas/Reports/Views/Orders/FBASkuOrderList.cshtml
......@@ -31,7 +31,7 @@
</div>
<div class="form-group">
<label>付款时间</label>
<input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"))" />
<input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"))" />
<span>至</span>
<input id="end" name="end" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.ToString("yyyy-MM-dd"))" />
</div>
......
Bailun.DC.Web/Areas/Reports/Views/Orders/ListOrderDetail.cshtml
......@@ -23,6 +23,12 @@
</select>
</div>
<div class="form-group">
<label>销售帐号：</label>
<select id="account" name="account" class="form-control">
<option value="">选择销售帐号</option>
</select>
</div>
<div class="form-group">
<label>付款时间</label>
<input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(ViewBag.start)" />
<span>至</span>
......@@ -63,6 +69,7 @@
var height = document.body.clientHeight;
$("#roletable").attr("data-height", (height - 170));
listAccount();
listPlatform();
})
......@@ -112,25 +119,30 @@
{ field: 'paid_time', title: '付款时间', width: '150', sortable: true }
];
var url = '@Url.Content("~/Reports/Orders/ListOrderDetailJson")' + '?' + $("#toolbar").serialize();
if (tb == undefined) {
tb = OnlyTable("roletable", columns, url, "", {
showfooter: true, loadsuccess: function (d) {
//替换汇总行的相关列值
var tr = $('.fixed-table-footer').find('tr');
for (var c in columns) {
var key = columns[c].field;
if (columns[c].iscount) {
for (var v in d.count_row) {
if (key == v) {
tr.find('td').eq(c).children('div').first().html(d.count_row[v]);
break;
}
}
var columns_single = [
{
field: 'origin_order_id', title: '平台单号', width: '160', formatter: function (idx, data) {
return '<div class="mules" title="' + data.origin_order_id + '">' + data.origin_order_id + '</div>';
}
},
{
field: 'bailun_order_id', title: '订单号', width: '210', iscount: true, formatter: function (idx, data) {
return '<div class="mules" title="' + data.bailun_order_id + '">' + data.bailun_order_id + '</div>';
}
},
{ field: 'platform_type', title: '平台', width: '100' },
{ field: 'website', title: '站点', width: '90' },
{ field: 'seller_account', title: '销售帐号', width: '110', sortable: false },
{
field: '@(ViewBag.col)', title: '@(ViewBag.coltitle)', width: '150', sortable: true, iscount: true
}
];
var url = '@Url.Content("~/Reports/Orders/ListOrderDetailJson")' + '?' + $("#toolbar").serialize();
if (tb == undefined) {
tb = OnlyTable("roletable", (@ViewBag.showsingle== 1 ? columns_single : columns), url, "", {
showfooter: true, showCount: true
});
}
else {
......@@ -182,6 +194,24 @@
})
}
function listAccount() {
$.submit({
type: 'POST',
url: '@Url.Content("~/Reports/Orders/ListAccount")',
paramData: 'platform=@(ViewBag.platform)',
func: function (result) {
if (result != null && result != undefined) {
$('#account').html('<option value="">选择平台</option>');
for (var i = 0; i < result.length; i++) {
$('#account').append('<option value="' + result[i] + '">' + result[i]+'</option>');
}
$('#account').val('@ViewBag.account');
}
}
})
}
</script>
......
Bailun.DC.Web/Areas/Reports/Views/Orders/OrderSaleCount.cshtml
......@@ -38,7 +38,7 @@
</div>
<div class="form-group">
<label>付款时间</label>
<input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"))" />
<input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"))" />
<span>至</span>
<input id="end" name="end" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.ToString("yyyy-MM-dd"))" />
</div>
......
Bailun.DC.Web/Areas/Reports/Views/Orders/PlatformProfitCount.cshtml
......@@ -18,9 +18,9 @@
</div>
<div class="form-group">
<label>付款时间</label>
<input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.ToString("yyyy-MM-dd"))" />
<input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"))" />
<span>至</span>
<input id="end" name="end" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.ToString("yyyy-MM-dd"))" />
<input id="end" name="end" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"))" />
</div>
<div class="form-group">
<label>&nbsp;</label>
......@@ -63,6 +63,7 @@
overflow: hidden;
text-overflow: ellipsis;
}
.alink{color:cornflowerblue;cursor:pointer;}
</style>
}
@section scripts{
......@@ -92,23 +93,23 @@
$('#tb').html('');
for (var i = 0; i < result.length; i++) {
var s = '<tr><td class="platform"><a href="javascript:;" onclick="ShowWebsite(\'' + result[i].platform+'\');">' + result[i].platform + '</a></td>';
s += '<td title="' + result[i].platform+'">' + result[i].ordercount + '</td>';
s += '<td title="' + result[i].platform +'">' + result[i].saleamount + '</td>';
s += '<td title="' + result[i].platform +'">' + result[i].customerprice + '</td>';
s += '<td title="' + result[i].platform +'">' + result[i].platformfee + '</td>';
s += '<td title="' + result[i].platform +'">' + result[i].cost_first + '</td>';
s += '<td title="' + result[i].platform +'">' + result[i].cost_tail + '</td>';
s += '<td title="' + result[i].platform +'">' + result[i].cost_handle_bailun + '</td>';
s += '<td title="' + result[i].platform + '">' + result[i].cost_handle_platform + '</td>';
s += '<td title="' + result[i].platform + '">' + result[i].amount_prepaid + '</td>';
s += '<td title="' + result[i].platform +'">' + result[i].profit + '</td>';
s += '<td title="' + result[i].platform +'">' + result[i].profitrate + '</td>';
s += '<td title="' + result[i].platform +'">' + result[i].returnamount + '</td>';
s += '<td title="' + result[i].platform +'">' + result[i].returnamountrate + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform + '\',\'订单数\',\'\',0)">' + result[i].ordercount + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform + '\',\'销售额\',\'amount_total\',1)">' + result[i].saleamount + '</td>';
s += '<td>' + result[i].customerprice + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform + '\',\'平台费用\',\'cost_platform_fee\',1)">' + result[i].platformfee + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform + '\',\'头程费\',\'cost_first\',1)">' + result[i].cost_first + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform + '\',\'尾程费\',\'cost_tail\',1)">' + result[i].cost_tail + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform + '\',\'处理费(百伦)\',\'cost_handle_bailun\',1)">' + result[i].cost_handle_bailun + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform + '\',\'平台操作费\',\'cost_handle_platform\',1)">' + result[i].cost_handle_platform + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform + '\',\'预收款\',\'amount_prepaid\',1)">' + result[i].amount_prepaid + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform + '\',\'利润\',\'profit_total\',1)">' + result[i].profit + '</td>';
s += '<td>' + result[i].profitrate + '</td>';
s += '<td class="alink" onclick="ShowDetail(\'' + result[i].platform + '\',\'退款金额\',\'amount_refund\',1)">' + result[i].returnamount + '</td>';
s += '<td>' + result[i].returnamountrate + '</td>';
$('#tb').append(s);
}
$('#tb').find('td').each(function () {
@*$('#tb').find('td').each(function () {
$(this).css('cursor', 'pointer');
var platformcode = $(this).attr('title');
......@@ -119,7 +120,7 @@
})
}
})
})*@
}
else {
layer.alert('没有找到相应数据！');
......@@ -157,6 +158,10 @@
}
function ShowDetail(platform, coltitle, colval, single) {
layer_show(platform + " " + $('#start').val() + "至" + $('#end').val() + ' 订单明细', '@Url.Content("~/Reports/Orders/ListOrderDetail?platform=")' + platform + '&start=' + $('#start').val() + '&end=' + $('#end').val() + '&col=' + colval + '&coltitle=' + coltitle + '&showsingle=' + single, '90%', '90%');
}
</script>
......
Bailun.DC.Web/Areas/Reports/Views/Orders/PlatformProfitCountByWebSite.cshtml
......@@ -38,6 +38,10 @@
overflow: hidden;
text-overflow: ellipsis;
}
.alink {
color: cornflowerblue;
cursor: pointer;
}
</style>
}
@section scripts{
......@@ -61,68 +65,68 @@
{ field: 'website', title: '站点', width: '90', iscount: true },
{
field: 'ordercount', title: '订单数', width: '100', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span onclick="ShowDetail(\'' + data.website + '\')" style="cursor:pointer;">' + data.ordercount + '</span>';
return '<span class="alink" onclick="ShowDetail(\'' + data.website + '\',\'订单数\',\'\',0)">' + data.ordercount + '</span>';
}
},
{
field: 'saleamount', title: '销售额', width: '90', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span onclick="ShowDetail(\'' + data.website + '\')" style="cursor:pointer;">' + data.saleamount + '</span>';
return '<span class="alink" onclick="ShowDetail(\'' + data.website + '\',\'销售额\',\'amount_total\',1)">' + data.saleamount + '</span>';
}
},
{
field: 'customerprice', title: '客单价', width: '90', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span onclick="ShowDetail(\'' + data.website + '\')" style="cursor:pointer;">' + data.customerprice + '</span>';
return '<span>' + data.customerprice + '</span>';
}
},
{
field: 'platformfee', title: '平台费', width: '90', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span onclick="ShowDetail(\'' + data.website + '\')" style="cursor:pointer;">' + data.platformfee + '</span>';
return '<span class="alink" onclick="ShowDetail(\'' + data.website + '\',\'平台费用\',\'cost_platform_fee\',1)">' + data.platformfee + '</span>';
}
},
{
field: 'cost_first', title: '头程费', width: '90', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span onclick="ShowDetail(\'' + data.website + '\')" style="cursor:pointer;">' + data.cost_first + '</span>';
return '<span class="alink" onclick="ShowDetail(\'' + data.website + '\',\'头程费\',\'cost_first\',1)">' + data.cost_first + '</span>';
}
},
{
field: 'cost_tail', title: '尾程费', width: '100', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span onclick="ShowDetail(\'' + data.website + '\')" style="cursor:pointer;">' + data.cost_tail + '</span>';
return '<span class="alink" onclick="ShowDetail(\'' + data.website + '\',\'尾程费\',\'cost_tail\',1)">' + data.cost_tail + '</span>';
}
},
{
field: 'cost_handle_bailun', title: '处理费(百伦)', width: '120', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span onclick="ShowDetail(\'' + data.website + '\')" style="cursor:pointer;">' + data.cost_handle_bailun + '</span>';
field: 'cost_handle_bailun', title: '处理费', width: '120', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span class="alink" onclick="ShowDetail(\'' + data.website + '\',\'处理费\',\'cost_handle_bailun\',1)">' + data.cost_handle_bailun + '</span>';
}
},
{
field: 'cost_handle_platform', title: '平台操作费', width: '120', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span onclick="ShowDetail(\'' + data.website + '\')" style="cursor:pointer;">' + data.cost_handle_platform + '</span>';
return '<span class="alink" onclick="ShowDetail(\'' + data.website + '\',\'平台操作费\',\'cost_handle_platform\',1)">' + data.cost_handle_platform + '</span>';
}
},
{
field: 'amount_prepaid', title: '预收款', width: '100', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span onclick="ShowDetail(\'' + data.website + '\')" style="cursor:pointer;">' + data.amount_prepaid + '</span>';
return '<span class="alink" onclick="ShowDetail(\'' + data.website + '\',\'预收款\',\'amount_prepaid\',1)">' + data.amount_prepaid + '</span>';
}
},
{
field: 'profit', title: '利润', width: '90', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span onclick="ShowDetail(\'' + data.website + '\')" style="cursor:pointer;">' + data.profit + '</span>';
return '<span class="alink" onclick="ShowDetail(\'' + data.website + '\',\'利润\',\'profit_total\',1)">' + data.profit + '</span>';
}
},
{
field: 'profitrate', title: '利润率%', width: '110', sortable: true, formatter: function (idx, data) {
return '<span onclick="ShowDetail(\'' + data.website + '\')" style="cursor:pointer;">' + data.profitrate + '</span>';
return '<span>' + data.profitrate + '</span>';
}
},
{
field: 'returnamount', title: '退款额', width: '110', sortable: true, iscount: true, formatter: function (idx, data) {
return '<span onclick="ShowDetail(\'' + data.website + '\')" style="cursor:pointer;">' + data.returnamount + '</span>';
return '<span class="alink" onclick="ShowDetail(\'' + data.website + '\',\'退款金额\',\'amount_refund\',1)">' + data.returnamount + '</span>';
}
},
{
field: 'returnamountrate', title: '退款率%', width: '100', sortable: true
, formatter: function (idx, data) {
return '<span onclick="ShowDetail(\'' + data.website + '\')" style="cursor:pointer;">' + data.returnamountrate + '</span>';
return '<span>' + data.returnamountrate + '</span>';
}
}
];
......@@ -170,12 +174,16 @@
})
}
function ShowDetail(website) {
@*function ShowDetail(website) {
var start = $('#start').val();
var end = $('#end').val();
layer_show("@(ViewBag.platform) " + website + " " + $('#start').val() + "至" + $('#end').val() + ' 订单明细', '@Url.Content("~/Reports/Orders/ListOrderDetail?platform="+ViewBag.platform)' + '&start=' + $('#start').val() + '&end=' + $('#end').val() + '&website=' + website, '90%', '90%');
}*@
function ShowDetail(website, coltitle, colval, single) {
layer_show("@(ViewBag.platform) " + website + " " + $('#start').val() + "至" + $('#end').val() + ' 订单明细', '@Url.Content("~/Reports/Orders/ListOrderDetail?platform="+ ViewBag.platform)' + '&website=' + website + '&start=' + $('#start').val() + '&end=' + $('#end').val() + '&col=' + colval + '&coltitle=' + coltitle + '&showsingle=' + single, '90%', '90%');
}
......
Bailun.DC.Web/Controllers/HomeController.cs
......@@ -13,6 +13,13 @@ namespace Bailun.DC.Web.Controllers
return View();
}
[HttpPost]
public JsonResult ListWarehouseType()
{
var result = new Services.WareHouseServices().ListWareHouseType().Where(a=>!string.IsNullOrEmpty(a));
return Json(result);
}
/// <summary>
/// 获取仓库列表
/// </summary>
......
Bailun.DC.Web/Pages/Index.cshtml
......@@ -180,6 +180,11 @@
</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/ListOrder?platform=Ebay")" data-index="0" style="padding-left:74px;">
<span>订单流水</span>
</a>
......
Bailun.DC.Web/Pages/Shared/_MainLayout.cshtml
......@@ -83,7 +83,7 @@
<!--下拉选择搜索控件-->
<script src="/css/bootstrap-select-1.12.4/js/bootstrap-select.js"></script>
<!--常用js方法-->
<script src="/js/common.js?=201902280912"></script>
<script src="/js/common.js?=201903011812"></script>
@RenderSection("scripts", required: false)
<script type="text/javascript">
......
Bailun.DC.Web/wwwroot/js/common.js
......@@ -43,7 +43,7 @@ function OnlyTable(tableId, aoColumn, actionUrl, serverParams,tbParams) {
paginationNextText: "下一页",
paginationLastText: "最后页",
onLoadSuccess: function (data) {
if (tbParams.showCount) {
if (tbParams != undefined && tbParams.showCount) {
//替换汇总行的相关列值
var tr = $('.fixed-table-footer').find('tr');
for (var c in aoColumn) {
......
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