diff --git a/SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx.cs index 880cce48..d3f25dcc 100644 --- a/SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx.cs @@ -1358,6 +1358,7 @@ namespace FineUIPro.Web.CQMS.Performance protected void Window1_Close(object sender, EventArgs e) { BindGrid(); + OutputSummaryData(); } /// @@ -1807,9 +1808,9 @@ namespace FineUIPro.Web.CQMS.Performance Response.ClearContent(); var projectname = ProjectService.GetProjectNameByProjectId(CurrUser.LoginProjectId); var excelDate = Convert.ToDateTime(drpCompileDateMonth.Text).Year + "年" + Convert.ToDateTime(drpCompileDateMonth.Text).Month + "月"; + var userName = CurrUser.UserName; - - var FileName = projectname+"项目"+ excelDate+ "施工工程师绩效考核数据表(暨施工日报表)"; + var FileName = projectname+"项目"+ excelDate+ "施工工程师("+ userName +")绩效考核数据表(暨施工日报表)"; Response.AddHeader("content-disposition", "attachment; filename=" + FileName + ".xls"); Response.ContentType = "application/vnd.ms-excel"; Response.ContentEncoding = System.Text.Encoding.UTF8; diff --git a/SGGL/FineUIPro.Web/CQMS/Performance/PerformanceAudit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Performance/PerformanceAudit.aspx.cs index d0dc9f00..862e85e2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Performance/PerformanceAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Performance/PerformanceAudit.aspx.cs @@ -1334,6 +1334,7 @@ namespace FineUIPro.Web.CQMS.Performance protected void Window1_Close(object sender, EventArgs e) { BindGrid(); + OutputSummaryData(); } @@ -1685,9 +1686,16 @@ namespace FineUIPro.Web.CQMS.Performance Response.ClearContent(); var projectname = ProjectService.GetProjectNameByProjectId(CurrUser.LoginProjectId); 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.ContentType = "application/vnd.ms-excel"; Response.ContentEncoding = System.Text.Encoding.UTF8; @@ -1695,6 +1703,5 @@ namespace FineUIPro.Web.CQMS.Performance Response.End(); } - } } \ No newline at end of file