提交代码

This commit is contained in:
高飞 2023-10-27 22:27:34 +08:00
parent 36a6c7f59e
commit 11e609340b
2 changed files with 12 additions and 4 deletions

View File

@ -1358,6 +1358,7 @@ namespace FineUIPro.Web.CQMS.Performance
protected void Window1_Close(object sender, EventArgs e) protected void Window1_Close(object sender, EventArgs e)
{ {
BindGrid(); BindGrid();
OutputSummaryData();
} }
/// <summary> /// <summary>
@ -1807,9 +1808,9 @@ namespace FineUIPro.Web.CQMS.Performance
Response.ClearContent(); Response.ClearContent();
var projectname = ProjectService.GetProjectNameByProjectId(CurrUser.LoginProjectId); var projectname = ProjectService.GetProjectNameByProjectId(CurrUser.LoginProjectId);
var excelDate = Convert.ToDateTime(drpCompileDateMonth.Text).Year + "年" + Convert.ToDateTime(drpCompileDateMonth.Text).Month + "月"; var excelDate = Convert.ToDateTime(drpCompileDateMonth.Text).Year + "年" + Convert.ToDateTime(drpCompileDateMonth.Text).Month + "月";
var userName = CurrUser.UserName;
var FileName = projectname+"项目"+ excelDate+ "施工工程师("+ userName +")绩效考核数据表(暨施工日报表)";
var FileName = projectname+"项目"+ excelDate+ "施工工程师绩效考核数据表(暨施工日报表)";
Response.AddHeader("content-disposition", "attachment; filename=" + FileName + ".xls"); Response.AddHeader("content-disposition", "attachment; filename=" + FileName + ".xls");
Response.ContentType = "application/vnd.ms-excel"; Response.ContentType = "application/vnd.ms-excel";
Response.ContentEncoding = System.Text.Encoding.UTF8; Response.ContentEncoding = System.Text.Encoding.UTF8;

View File

@ -1334,6 +1334,7 @@ namespace FineUIPro.Web.CQMS.Performance
protected void Window1_Close(object sender, EventArgs e) protected void Window1_Close(object sender, EventArgs e)
{ {
BindGrid(); BindGrid();
OutputSummaryData();
} }
@ -1685,9 +1686,16 @@ namespace FineUIPro.Web.CQMS.Performance
Response.ClearContent(); Response.ClearContent();
var projectname = ProjectService.GetProjectNameByProjectId(CurrUser.LoginProjectId); var projectname = ProjectService.GetProjectNameByProjectId(CurrUser.LoginProjectId);
var excelDate = Convert.ToDateTime(drpCompileDateMonth.Text).Year + "年" + Convert.ToDateTime(drpCompileDateMonth.Text).Month + "月"; var excelDate = Convert.ToDateTime(drpCompileDateMonth.Text).Year + "年" + Convert.ToDateTime(drpCompileDateMonth.Text).Month + "月";
var modelCQMS_Performance = Funs.DB.CQMS_Performance.FirstOrDefault(x => x.PerformanceGid == PerformanceGid);
if (modelCQMS_Performance==null)
{
ShowNotify("未查询到数据,请先查询表单。", MessageBoxIcon.Warning);
return;
}
var uName = UserService.GetUserByUserId(modelCQMS_Performance.CreateMan).UserName;
var FileName = projectname + "项目" + excelDate + "施工工程师绩效考核数据表(暨施工日报表)"; var FileName = projectname + "项目" + excelDate + "施工工程师("+ uName + ")绩效考核数据表(暨施工日报表)";
Response.AddHeader("content-disposition", "attachment; filename=" + FileName + ".xls"); Response.AddHeader("content-disposition", "attachment; filename=" + FileName + ".xls");
Response.ContentType = "application/vnd.ms-excel"; Response.ContentType = "application/vnd.ms-excel";
Response.ContentEncoding = System.Text.Encoding.UTF8; Response.ContentEncoding = System.Text.Encoding.UTF8;
@ -1695,6 +1703,5 @@ namespace FineUIPro.Web.CQMS.Performance
Response.End(); Response.End();
} }
} }
} }