Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DataCenter_Core2.1_20190520
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
DataCenter_Core2.1_20190520
Commits
228be30a
Commit
228be30a
authored
Apr 24, 2020
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整资产负债表,按周显示时,改为按周二显示,处理页面显示样式出错的问题
parent
6846f906
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
7 deletions
+26
-7
FinanceController.cs
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
+16
-4
Index2.cshtml
Bailun.DC.Web/Areas/Reports/Views/Finance/Index2.cshtml
+10
-3
No files found.
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
View file @
228be30a
...
...
@@ -51,15 +51,27 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{
if
(
date
.
DayOfWeek
==
DayOfWeek
.
Saturday
)
{
date
=
date
.
AddDays
(-
1
);
date
=
date
.
AddDays
(-
4
);
}
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
);
}
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
)
//按月
...
...
@@ -199,7 +211,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
//add by Allan at 20200109,for 标识是否周日或者月末
if
(
type
==
2
)
//按周
{
if
(
m
.
statistical_time
.
DayOfWeek
==
DayOfWeek
.
Friday
)
if
(
m
.
statistical_time
.
DayOfWeek
==
DayOfWeek
.
Tuesday
)
//周二
{
m
.
ismark
=
1
;
}
...
...
Bailun.DC.Web/Areas/Reports/Views/Finance/Index2.cshtml
View file @
228be30a
...
...
@@ -1538,11 +1538,13 @@
//设置文本框的值
for (var key in obj) {
$('.'+key).css('background', '#fff');
$('.'+key).css('color', '#000');
//如果是月或者周,不显示文本框
if (type == 2 || type == 3) {
$('#' + key).hide();
$('#' + key).parent();
$('#' + key).addClass(key);
$('#' + key).parent().addClass(key);
$('#' + key + '_1').show();
$('#' + key + '_1').html(obj[key]);
}
...
...
@@ -1553,6 +1555,7 @@
$('#' + key).parent().removeClass(key);
}
//$('#' + key).val(obj[key]);
}
for (var i = 0; i < list.length; i++) {
...
...
@@ -1562,11 +1565,15 @@
var day = obj.statistical_time.replace('T', ' ').replace('00:00:00', '');
$('#c' + (i)).html(day);
for (var key in obj) {
$('.' + key).each(function (j) {
if (j == i) {
$(this).attr('title', day);
$(this).html(numFormat(obj[key]));
if (i < list.length - 1) {
$(this).html(numFormat(obj[key]));
}
if (obj["ismark"] == 1) {
$(this).css('background', '#00A45F');
$(this).css('color', '#fff');
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment