diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx index 5c6b90ef..f4606ede 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx @@ -34,7 +34,7 @@ diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx.cs index 5c420ff9..980034b6 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx.cs @@ -120,7 +120,7 @@ namespace FineUIPro.Web.ZHGL.ManagementReport { Response.ClearContent(); string filename = Funs.GetNewFileName(); - Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("管理月报B" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("质量管理月报(项目汇总)" + filename, System.Text.Encoding.UTF8) + ".xls"); Response.ContentType = "application/excel"; Response.ContentEncoding = System.Text.Encoding.UTF8; this.Grid1.PageSize = 500; @@ -142,7 +142,10 @@ namespace FineUIPro.Web.ZHGL.ManagementReport sb.Append(""); foreach (GridColumn column in grid.Columns) { - sb.AppendFormat("{0}", column.HeaderText); + if ("MonthReportItemId" != column.ColumnID) + { + sb.AppendFormat("{0}", column.HeaderText); + } } sb.Append(""); foreach (GridRow row in grid.Rows) @@ -150,14 +153,16 @@ namespace FineUIPro.Web.ZHGL.ManagementReport sb.Append(""); foreach (GridColumn column in grid.Columns) { - string html = row.Values[column.ColumnIndex].ToString(); - if (column.ColumnID == "tfNumber") + if ("MonthReportItemId" != column.ColumnID) { - html = (row.FindControl("lblNumber") as AspNet.Label).Text; + string html = row.Values[column.ColumnIndex].ToString(); + if (column.ColumnID == "tfNumber") + { + html = (row.FindControl("lblNumber") as AspNet.Label).Text; + } + sb.AppendFormat("{0}", html); } - sb.AppendFormat("{0}", html); } - sb.Append(""); } diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/HSSEMonthReportProjectSum.aspx b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/HSSEMonthReportProjectSum.aspx index 3fee1b7d..462f817c 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/HSSEMonthReportProjectSum.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/HSSEMonthReportProjectSum.aspx @@ -34,7 +34,7 @@ diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/HSSEMonthReportProjectSum.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/HSSEMonthReportProjectSum.aspx.cs index c16d00a8..243df7a3 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/HSSEMonthReportProjectSum.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/HSSEMonthReportProjectSum.aspx.cs @@ -120,7 +120,7 @@ namespace FineUIPro.Web.ZHGL.ManagementReport { Response.ClearContent(); string filename = Funs.GetNewFileName(); - Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("管理月报B" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("HSSE管理月报(项目汇总)" + filename, System.Text.Encoding.UTF8) + ".xls"); Response.ContentType = "application/excel"; Response.ContentEncoding = System.Text.Encoding.UTF8; this.Grid1.PageSize = 500; @@ -142,7 +142,10 @@ namespace FineUIPro.Web.ZHGL.ManagementReport sb.Append(""); foreach (GridColumn column in grid.Columns) { - sb.AppendFormat("{0}", column.HeaderText); + if ("MonthReportItemId" != column.ColumnID) + { + sb.AppendFormat("{0}", column.HeaderText); + } } sb.Append(""); foreach (GridRow row in grid.Rows) @@ -150,12 +153,15 @@ namespace FineUIPro.Web.ZHGL.ManagementReport sb.Append(""); foreach (GridColumn column in grid.Columns) { - string html = row.Values[column.ColumnIndex].ToString(); - if (column.ColumnID == "tfNumber") + if ("MonthReportItemId" != column.ColumnID) { - html = (row.FindControl("lblNumber") as AspNet.Label).Text; + string html = row.Values[column.ColumnIndex].ToString(); + if (column.ColumnID == "tfNumber") + { + html = (row.FindControl("lblNumber") as AspNet.Label).Text; + } + sb.AppendFormat("{0}", html); } - sb.AppendFormat("{0}", html); } sb.Append("");