Commit 37a038a2 by jianshuqin

修复BUG:资产负债表导出

parent 95ef122d
......@@ -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;
if (day.HasValue)
{
date = day.Value;
}
if (type == 2) //按周
{
if (day.HasValue) //Add by Allan at 20210429,按周也可以选择日期进行查看
......@@ -452,7 +455,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
continue;
}
var value = listProperties[o].GetValue(m0, null).ToString();
var value = listProperties[o].GetValue(m0, null)?.ToString();
if (i == 0) //添加字段名称
{
......
......@@ -1826,7 +1826,7 @@
//var day = $('#day').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() {
......
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