Skip to content

D
DataCenter_Core2.1_20190520
Commit d726312f by guanzhenshan
Options

增加查看月销售利润报表的广告费明细的报表

parent 50af1373
Showing with 99 additions and 15 deletions
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
......@@ -9695,6 +9695,21 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
/// <summary>
/// 新月销售利润-广告类型选择页面
/// </summary>
/// <param name="month"></param>
/// <returns></returns>
public ActionResult MonthSaleProfitNew_ADCount(string month)
{
ViewBag.start = DateTime.Parse(month+"-01");
ViewBag.end = DateTime.Parse(month + "-01").AddMonths(1).AddDays(-1);
ViewBag.month = month;
return View();
}
#endregion
......
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
......@@ -1135,8 +1135,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// Ebay上架费
/// </summary>
/// <returns></returns>
public ActionResult EbayPutAwayFee()
public ActionResult EbayPutAwayFee(DateTime? start,DateTime? end)
{
ViewBag.start = start.HasValue ? start.Value : DateTime.Now.AddDays(-7);
ViewBag.end = end.HasValue ? end.Value : DateTime.Now.AddDays(-1);
return View();
}
......@@ -1191,8 +1194,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// Ebay广告费
/// </summary>
/// <returns></returns>
public ActionResult EbayADFee()
public ActionResult EbayADFee(DateTime? start, DateTime? end)
{
ViewBag.start = start.HasValue ? start.Value : DateTime.Now.AddDays(-7);
ViewBag.end = end.HasValue ? end.Value : DateTime.Now.AddDays(-1);
return View();
}
......@@ -2794,8 +2800,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
#region 广告费
public ActionResult AmazonAD()
public ActionResult AmazonAD(DateTime? start, DateTime? end)
{
ViewBag.start = start.HasValue ? start.Value : DateTime.Now.AddDays(-7);
ViewBag.end = end.HasValue ? end.Value : DateTime.Now.AddDays(-1);
return View();
}
......
Bailun.DC.Web/Areas/Reports/Views/Finance/MonthSaleProfitNew.cshtml
......@@ -234,12 +234,12 @@
// })
//}
else if (_this.hasClass('fee_storage')) {
_this.css('cursor', 'pointer');
_this.click(function () {
ShowOrderDetail(_this.attr('val'), '', '海外仓储费');
})
}
//else if (_this.hasClass('fee_storage')) {
// _this.css('cursor', 'pointer');
// _this.click(function () {
// ShowOrderDetail(_this.attr('val'), '', '海外仓储费');
// })
//}
else if (_this.hasClass('fee_platform')) {
_this.css('cursor', 'pointer');
......@@ -255,6 +255,13 @@
})
}
else if (_this.hasClass('fee_ad')) {
_this.css('cursor', 'pointer');
_this.click(function () {
ShowADCount(_this.attr('val'));
})
}
else if (_this.hasClass('profit_sales')) {
_this.css('cursor', 'pointer');
_this.click(function () {
......@@ -351,6 +358,10 @@
layer_show(month + ' ' + (title != undefined?title:category) + "的订单明细", '@Url.Content("~/Reports/Finance/MonthSaleProfitNew_OrderDetail")' + '?month=' + month + '&financecategory=' + category, '95%', '95%');
}
function ShowADCount(month) {
layer_show(month + ' ' + "广告及宣传费用", '@Url.Content("~/Reports/Finance/MonthSaleProfitNew_ADCount")' + '?month=' + month , '95%', '95%');
}
function clearHtml(s) {
// 去除 富文本格式
s = s.replace(/(\n)/g, "");
......
Bailun.DC.Web/Areas/Reports/Views/Finance/MonthSaleProfitNew_ADCount.cshtml 0 → 100644
@{
ViewData["Title"] = "广告明细汇总";
Layout = "~/Pages/Shared/_MainLayout.cshtml";
}
<div class="ibox-content m-b-sm border-bottom">
<table id="tb" class="table table-hover table-bordered" style="width:100%;">
<thead>
<tr>
<th>序号</th>
<th>类型</th>
<th>操作</th>
</tr>
</thead>
<tr>
<td>1</td>
<td>Ebay上架费</td>
<td><a class="btn btn-xs btn-primary" onclick="showdetail('@(ViewBag.month) Ebay上架费','@Url.Content("~/Reports/Orders/EbayPutAwayFee?start="+ViewBag.start+"&end="+ViewBag.end)')">查看明细</a></td>
</tr>
<tr>
<td>2</td>
<td>Ebay广告费</td>
<td><a class="btn btn-xs btn-primary" onclick="showdetail('@(ViewBag.month) Ebay广告费','@Url.Content("~/Reports/Orders/EbayADFee?start="+ViewBag.start+"&end="+ViewBag.end)')">查看明细</a></td>
</tr>
<tr>
<td>3</td>
<td>Amazon广告费</td>
<td><a class="btn btn-xs btn-primary" onclick="showdetail('@(ViewBag.month) Amazon广告费','@Url.Content("~/Reports/Orders/AmazonAD?start="+ViewBag.start+"&end="+ViewBag.end)')">查看明细</a></td>
</tr>
</table>
</div>
<script>
function ShowDetails(title, url) {
dialogApply({
id: 'Form',
title: title,
url: url,
width: '1300px',
height: '650px',
callBack: function (iframeId) {
//top.frames[iframeId].AcceptClick();
}
});
}
</script>
\ No newline at end of file
Bailun.DC.Web/Areas/Reports/Views/Orders/AmazonAD.cshtml
......@@ -28,9 +28,9 @@
</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="@(ViewBag.start.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="@(ViewBag.end.ToString("yyyy-MM-dd"))" />
</div>
<div class="form-group">
<label>&nbsp;</label>
......
Bailun.DC.Web/Areas/Reports/Views/Orders/EbayADFee.cshtml
......@@ -25,9 +25,9 @@
</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="@(ViewBag.start.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="@(ViewBag.end.ToString("yyyy-MM-dd"))" />
</div>
<div class="form-group">
<label>&nbsp;</label>
......
Bailun.DC.Web/Areas/Reports/Views/Orders/EbayPutAwayFee.cshtml
......@@ -25,9 +25,9 @@
</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="@(ViewBag.start.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="@(ViewBag.end.ToString("yyyy-MM-dd"))" />
</div>
<div class="form-group">
<label>&nbsp;</label>
......
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