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
37a038a2
Commit
37a038a2
authored
Jul 13, 2022
by
jianshuqin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复BUG:资产负债表导出
parent
95ef122d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
FinanceController.cs
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
+6
-3
Index2.cshtml
Bailun.DC.Web/Areas/Reports/Views/Finance/Index2.cshtml
+1
-1
No files found.
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
View file @
37a038a2
...
@@ -257,10 +257,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
...
@@ -257,10 +257,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
});
});
}
}
public
ActionResult
ExportIndex
(
int
type
,
DateTime
?
day
,
int
paycompanyvalue
)
public
ActionResult
ExportIndex
(
int
type
,
int
paycompanyvalue
,
DateTime
?
day
=
null
)
{
{
var
date
=
DateTime
.
Now
;
var
date
=
DateTime
.
Now
;
if
(
day
.
HasValue
)
{
date
=
day
.
Value
;
}
if
(
type
==
2
)
//按周
if
(
type
==
2
)
//按周
{
{
if
(
day
.
HasValue
)
//Add by Allan at 20210429,按周也可以选择日期进行查看
if
(
day
.
HasValue
)
//Add by Allan at 20210429,按周也可以选择日期进行查看
...
@@ -452,7 +455,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
...
@@ -452,7 +455,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
continue
;
continue
;
}
}
var
value
=
listProperties
[
o
].
GetValue
(
m0
,
null
).
ToString
();
var
value
=
listProperties
[
o
].
GetValue
(
m0
,
null
)
?
.
ToString
();
if
(
i
==
0
)
//添加字段名称
if
(
i
==
0
)
//添加字段名称
{
{
...
...
Bailun.DC.Web/Areas/Reports/Views/Finance/Index2.cshtml
View file @
37a038a2
...
@@ -1826,7 +1826,7 @@
...
@@ -1826,7 +1826,7 @@
//var day = $('#day').val();
//var day = $('#day').val();
var paycompany = $('#sel_paycompany').val();
var paycompany = $('#sel_paycompany').val();
window.open('@Url.Content("~/Reports/Finance/ExportIndex?")' + 'type=' + type + '&paycompanyvalue=' + paycompany, '_blank');
window.open('@Url.Content("~/Reports/Finance/ExportIndex?")' + 'type=' + type + '&paycompanyvalue=' + paycompany
+ '&day=' + $('#day').val()
, '_blank');
}
}
function showchart() {
function showchart() {
...
...
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