Commit 228be30a by guanzhenshan

调整资产负债表,按周显示时,改为按周二显示,处理页面显示样式出错的问题

parent 6846f906
...@@ -51,15 +51,27 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -51,15 +51,27 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{ {
if (date.DayOfWeek == DayOfWeek.Saturday) if (date.DayOfWeek == DayOfWeek.Saturday)
{ {
date = date.AddDays(-1); date = date.AddDays(-4);
} }
else if (date.DayOfWeek == DayOfWeek.Sunday) else if (date.DayOfWeek == DayOfWeek.Sunday)
{ {
date = date.AddDays(-5);
}
else if (date.DayOfWeek == DayOfWeek.Friday)
{
date = date.AddDays(-3);
}
else if (date.DayOfWeek == DayOfWeek.Thursday)
{
date = date.AddDays(-2); date = date.AddDays(-2);
} }
else else if (date.DayOfWeek == DayOfWeek.Wednesday)
{ {
date = date.AddDays(-2 - (int)date.DayOfWeek); date = date.AddDays(-1);
}
else if (date.DayOfWeek == DayOfWeek.Monday)
{
date = date.AddDays(-6);
} }
} }
else if (type == 3) //按月 else if (type == 3) //按月
...@@ -199,7 +211,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -199,7 +211,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
//add by Allan at 20200109,for 标识是否周日或者月末 //add by Allan at 20200109,for 标识是否周日或者月末
if (type == 2) //按周 if (type == 2) //按周
{ {
if (m.statistical_time.DayOfWeek == DayOfWeek.Friday) if (m.statistical_time.DayOfWeek == DayOfWeek.Tuesday) //周二
{ {
m.ismark = 1; m.ismark = 1;
} }
......
...@@ -1538,11 +1538,13 @@ ...@@ -1538,11 +1538,13 @@
//设置文本框的值 //设置文本框的值
for (var key in obj) { for (var key in obj) {
$('.'+key).css('background', '#fff');
$('.'+key).css('color', '#000');
//如果是月或者周,不显示文本框 //如果是月或者周,不显示文本框
if (type == 2 || type == 3) { if (type == 2 || type == 3) {
$('#' + key).hide(); $('#' + key).hide();
$('#' + key).parent(); $('#' + key).parent().addClass(key);
$('#' + key).addClass(key);
$('#' + key + '_1').show(); $('#' + key + '_1').show();
$('#' + key + '_1').html(obj[key]); $('#' + key + '_1').html(obj[key]);
} }
...@@ -1553,6 +1555,7 @@ ...@@ -1553,6 +1555,7 @@
$('#' + key).parent().removeClass(key); $('#' + key).parent().removeClass(key);
} }
//$('#' + key).val(obj[key]); //$('#' + key).val(obj[key]);
} }
for (var i = 0; i < list.length; i++) { for (var i = 0; i < list.length; i++) {
...@@ -1562,10 +1565,14 @@ ...@@ -1562,10 +1565,14 @@
var day = obj.statistical_time.replace('T', ' ').replace('00:00:00', ''); var day = obj.statistical_time.replace('T', ' ').replace('00:00:00', '');
$('#c' + (i)).html(day); $('#c' + (i)).html(day);
for (var key in obj) { for (var key in obj) {
$('.' + key).each(function (j) { $('.' + key).each(function (j) {
if (j == i) { if (j == i) {
$(this).attr('title', day); $(this).attr('title', day);
if (i < list.length - 1) {
$(this).html(numFormat(obj[key])); $(this).html(numFormat(obj[key]));
}
if (obj["ismark"] == 1) { if (obj["ismark"] == 1) {
$(this).css('background', '#00A45F'); $(this).css('background', '#00A45F');
......
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