Skip to content

D
DataCenter_Core2.1_20190520
Commit 6935fb1e by guanzhenshan
Options

调整资产负债表的显示

parent 54a72c6e
Showing with 57 additions and 31 deletions
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
......@@ -42,9 +42,32 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// </summary>
/// <returns></returns>
[HttpPost]
public JsonResult IndexJson(int type, DateTime day, int paycompanyvalue)
public JsonResult IndexJson(int type, int paycompanyvalue,DateTime? day)
{
var date = day;
var date = DateTime.Now.AddDays(-1);
if (type == 2) //按周
{
if (date.DayOfWeek == DayOfWeek.Saturday)
{
date = date.AddDays(-1);
}
else if (date.DayOfWeek == DayOfWeek.Sunday)
{
date = date.AddDays(-2);
}
else
{
date = date.AddDays(-2 - (int)date.DayOfWeek);
}
}
else if (type == 3) //按月
{
if (date.AddDays(1).ToString("yyyy-MM") == date.ToString("yyyy-MM"))
{
date = DateTime.Parse(date.ToString("yyyy-MM") + "-01").AddDays(-1);
}
}
var list = new Services.FinanceReportServices().GetBalanceSheet(type, date, paycompanyvalue);
......@@ -168,7 +191,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
//add by Allan at 20200109,for 标识是否周日或者月末
if (type == 2) //按周
{
if (m.statistical_time.DayOfWeek == DayOfWeek.Thursday)
if (m.statistical_time.DayOfWeek == DayOfWeek.Friday)
{
m.ismark = 1;
}
......
Bailun.DC.Web/Areas/Reports/Views/Finance/Index2.cshtml
......@@ -7,6 +7,9 @@
<div class="row">
<div class="col-sm-12">
<div class="alert alert-warning">
说明：按周显示时，默认显示周五的数据，按月显示时，默认显示每月月末的数据
</div>
<div class="ibox-content m-b-sm border-bottom">
<form id="toolbar">
<div class="form-inline" style="line-height:40px;">
......@@ -18,13 +21,13 @@
<option value="3">按月的方式</option>
@*<option value="4">按年的方式</option>*@
</select>
<label>日期</label>
<input id="day" type="text" style="width:120px" value="@DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")" class="form-control">
@*<label>日期</label>
<input id="day" type="text" style="width:120px" value="@DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")" class="form-control">*@
<label>付款主体</label>
<select id="sel_paycompany" class="form-control" style="width:200px;">
<option value="0">百伦供应链</option>
@*<option value="1">广州百伦科技有限公司</option>
<option value="2" selected>香港百伦科技有限公司</option>*@
<option value="2" selected>香港百伦科技有限公司</option>*@
</select>
<button type="button" class="btn btn-sm btn-primary" onclick="GetData();"><i class="fa fa-search"></i>&nbsp;查询</button>
<button type="button" class="btn btn-sm btn-success" onclick="ExportXsl();">导出</button>
......@@ -57,7 +60,7 @@
<div class="item-col" style="width:100%;border-left:solid 1px #eee;border-right:solid 1px #eee;border-bottom:solid 1px #eee;height:33px;">&nbsp;</div>
<div id="fz" class="item-col" style="width:100%;border-left:solid 1px #eee;border-right:solid 1px #eee;border-bottom:solid 1px #eee;height:264px;line-height:264px;" title="负债和所有者权益">负债和所有者权益</div>
</div>
<div style="width:8%;" class="second-row" >
<div style="width:8%;" class="second-row">
<div id="ldzc" class="item-col zc" style="width:100%;border-bottom:solid 1px #eee;height:33px;line-height:33px;">流动资产</div>
<div id="fldzc" class="item-col zc" style="width:100%;border-bottom:solid 1px #eee;height:33px;line-height:33px;">非流动资产</div>
<div class="item-col zc" style="width:100%;border-bottom:solid 1px #eee;height:33px;">&nbsp;</div>
......@@ -323,18 +326,18 @@
<div style="width:8%;"></div>
</div>
@*<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;">3.存货FBA仓在途</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;">
<input id="fba_transfer_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" />
</div>
<div style="width:8%;"></div>
</div>*@
<div style="width:11.5%;color:#bbb;">3.存货FBA仓在途</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;">
<input id="fba_transfer_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" />
</div>
<div style="width:8%;"></div>
</div>*@
<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;" title="3.存货FBA仓在途(不包括调拨计划)">3.存货FBA仓在途(不包括调拨计划)</div>
<div style="width:11.5%;" class="fba_transfer_allot_amount">0</div>
......@@ -362,18 +365,18 @@
<div style="width:8%;"></div>
</div>
@*<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;">4.存货非FBA仓在途</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;">
<input id="not_fba_transfer_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" />
</div>
<div style="width:8%;"></div>
</div>*@
<div style="width:11.5%;color:#bbb;">4.存货非FBA仓在途</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;">
<input id="not_fba_transfer_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" />
</div>
<div style="width:8%;"></div>
</div>*@
<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;" title="5.存货非FBA仓在途(不包括调拨计划)">5.存货非FBA仓在途(不包括调拨计划)</div>
<div style="width:11.5%;" class="not_fba_transfer_allot_amount">0</div>
......
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