Commit 54a72c6e by guanzhenshan

资产负债表增加周四或者月末标识显示

parent 69fdd7c3
......@@ -163,10 +163,26 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
//负债和所有者权益(或股东权益)总计
m.count_liabilities_and_oe = m.count_liabilities + m.oe_count;
}
//add by Allan at 20200109,for 标识是否周日或者月末
if (type == 2) //按周
{
if (m.statistical_time.DayOfWeek == DayOfWeek.Thursday)
{
m.ismark = 1;
}
}
else if (type == 3) //按月
{
if (m.statistical_time.AddDays(1).ToString("yyyy-MM") != m.statistical_time.ToString("yyyy-MM"))
{
m.ismark = 2;
}
}
}
return Json(new
{
success = list.Count > 0,
......
......@@ -13,10 +13,10 @@
<div class="form-group">
<input id="chk_showdetail" type="checkbox" checked="checked" /><label for="chk_showdetail">是否可看明细</label>
<select id="timetype" class="form-control" style="width:120px;">
<option value="1">按日的方式</option>
@*<option value="1">按日的方式</option>*@
<option value="2">按周的方式</option>
<option value="3">按月的方式</option>
<option value="4">按年的方式</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">
......@@ -1398,6 +1398,19 @@
if (j == i) {
$(this).attr('title', day);
$(this).html(numFormat(obj[key]));
if (obj["ismark"] == 1) {
$(this).css('background', '#00A45F');
$(this).css('color', '#fff');
}
else if (obj["ismark"] == 2) {
$(this).css('background', '#F8C25C');
$(this).css('color', '#fff');
}
else {
$(this).css('background', '#fff');
$(this).css('color', '#000');
}
}
});
}
......
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