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
d2d5e753
Commit
d2d5e753
authored
Apr 01, 2020
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加上差异值
parent
22132e99
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
3 deletions
+15
-3
mFinanceDebtChain.cs
Bailun.DC.Models/mFinanceDebtChain.cs
+2
-0
FinanceController.cs
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
+10
-1
Index2Chart.cshtml
Bailun.DC.Web/Areas/Reports/Views/Finance/Index2Chart.cshtml
+3
-2
No files found.
Bailun.DC.Models/mFinanceDebtChain.cs
View file @
d2d5e753
...
...
@@ -16,5 +16,7 @@ namespace Bailun.DC.Models
public
string
diff
{
get
;
set
;
}
public
decimal
diffval
{
get
;
set
;
}
}
}
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
View file @
d2d5e753
...
...
@@ -2975,6 +2975,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var
listPro
=
new
List
<
string
>();
for
(
var
i
=
0
;
i
<
s
.
Count
;
i
++)
{
listval
[
i
].
diffval
=
listval
[
i
].
end
-
listval
[
i
].
start
;
if
(
i
>=
0
&&
i
<
31
)
{
listval
[
i
].
onelevelname
=(
"流动资产"
);
...
...
@@ -3167,7 +3169,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var
colNames
=
new
List
<
string
>
{
"一级项目"
,
"二级项目"
,
start
.
ToString
(
"yyyy-MM-dd"
),
end
.
ToString
(
"yyyy-MM-dd"
),
"环比%"
};
var
colNames
=
new
List
<
string
>
{
"一级项目"
,
"二级项目"
,
start
.
ToString
(
"yyyy-MM-dd"
),
end
.
ToString
(
"yyyy-MM-dd"
),
"环比%"
,
"差异值"
};
var
list
=
new
List
<
string
>();
...
...
@@ -3267,6 +3269,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
for
(
var
i
=
0
;
i
<
list
.
Count
;
i
++)
{
var
arr
=
list
[
i
].
Split
(
'|'
);
list
[
i
]
=
arr
[
0
]
+
"|"
+
arr
[
1
]
+
"|"
+
arr
[
2
]+
"|"
+
arr
[
3
]+
"|"
+(
decimal
.
Parse
(
arr
[
2
])-
decimal
.
Parse
(
arr
[
1
]));
if
(
i
>=
0
&&
i
<
31
)
{
list
[
i
]
=
(
"流动资产"
)+
"|"
+
list
[
i
];
...
...
@@ -3299,6 +3306,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{
list
[
i
]
=
(
"所有者权益(或股东权益)合计"
)
+
"|"
+
list
[
i
];
}
}
var
guid
=
Guid
.
NewGuid
().
ToString
();
...
...
Bailun.DC.Web/Areas/Reports/Views/Finance/Index2Chart.cshtml
View file @
d2d5e753
...
...
@@ -30,6 +30,7 @@
<th>二级项目</th>
<th>期初</th>
<th>期末</th>
<th>差异值(期末-期初)</th>
<th>环比差值%</th>
</tr>
</thead>
...
...
@@ -93,10 +94,10 @@
for (var i = 0; i < result.data.length; i++) {
if (result.data[i].sencondlevelname.indexOf('合计') > 0) {
var s = '<tr><td style="text-align:right;width:190px;background:#eee;">' + result.data[i].onelevelname + '</td><td style="background:#eee;">' + result.data[i].sencondlevelname + '</td><td style="background:#eee;">' + result.data[i].start + '</td><td style="background:#eee;">' + result.data[i].end + '</td><td style="background:#eee;">' + result.data[i].diff + '</td><tr>';
var s = '<tr><td style="text-align:right;width:190px;background:#eee;">' + result.data[i].onelevelname + '</td><td style="background:#eee;">' + result.data[i].sencondlevelname + '</td><td style="background:#eee;">' + result.data[i].start + '</td><td style="background:#eee;">' + result.data[i].end + '</td><td style="background:#eee;">' + result.data[i].diff
val + '</td><td style="background:#eee;">' + result.data[i].diff
+ '</td><tr>';
}
else {
var s = '<tr><td style="text-align:right;width:190px;">' + result.data[i].onelevelname + '</td><td>' + result.data[i].sencondlevelname + '</td><td>' + result.data[i].start + '</td><td>' + result.data[i].end + '</td><td>' + result.data[i].diff + '</td><tr>';
var s = '<tr><td style="text-align:right;width:190px;">' + result.data[i].onelevelname + '</td><td>' + result.data[i].sencondlevelname + '</td><td>' + result.data[i].start + '</td><td>' + result.data[i].end + '</td><td>' + result.data[i].diff
val + '</td><td>' + result.data[i].diff
+ '</td><tr>';
}
$('#tbody_').append(s);
...
...
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