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
54a72c6e
Commit
54a72c6e
authored
Jan 09, 2020
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
资产负债表增加周四或者月末标识显示
parent
69fdd7c3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
3 deletions
+32
-3
FinanceController.cs
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
+17
-1
Index2.cshtml
Bailun.DC.Web/Areas/Reports/Views/Finance/Index2.cshtml
+15
-2
No files found.
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
View file @
54a72c6e
...
...
@@ -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
,
...
...
Bailun.DC.Web/Areas/Reports/Views/Finance/Index2.cshtml
View file @
54a72c6e
...
...
@@ -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');
}
}
});
}
...
...
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