diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 1a5a00ac..91c78fe3 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -69,6 +69,14 @@ ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll + True + + + ..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll + False + False @@ -94,8 +102,8 @@ ..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXmlFormats.dll - - ..\packages\Office.12.0.0\lib\net40\Office.dll + + ..\packages\MicrosoftOfficeCore.15.0.0\lib\net35\Office.dll True @@ -103,8 +111,8 @@ ..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll - - ..\packages\Quartz.3.7.0\lib\netstandard2.0\Quartz.dll + + ..\packages\Quartz.3.8.1\lib\netstandard2.0\Quartz.dll ..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll @@ -843,33 +851,6 @@ - - {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} - 2 - 4 - 0 - primary - False - True - - - {00020813-0000-0000-C000-000000000046} - 1 - 6 - 0 - primary - False - True - - - {00020905-0000-0000-C000-000000000046} - 8 - 4 - 0 - primary - False - False - {0002E157-0000-0000-C000-000000000046} 5 diff --git a/SGGL/BLL/Common/PrinterDocService.cs b/SGGL/BLL/Common/PrinterDocService.cs index 0d8782e1..99df54a3 100644 --- a/SGGL/BLL/Common/PrinterDocService.cs +++ b/SGGL/BLL/Common/PrinterDocService.cs @@ -56,6 +56,32 @@ System.Web.HttpContext.Current.Response.End(); } } + public static void PrinterRectifyNoticesHtmlAll(string projectId, string type) + { + System.Web.HttpContext.Current.Response.ClearContent(); + string htmlStr = string.Empty; + string name = "隐患整改通知单"; + if (type == "1") + { + htmlStr = GetRectifyNoticesTableHtmlAll(projectId); + } + else + { + htmlStr = GetRectifyNoticesTableHtmlAll2(projectId); + name = "隐患整改反馈单"; + } + + if (!string.IsNullOrEmpty(htmlStr)) + { + string filename = name + Funs.GetNewFileName(); + System.Web.HttpContext.Current.Response.AddHeader("content-disposition", "attachment; filename=" + + System.Web.HttpUtility.UrlEncode(filename, Encoding.UTF8) + ".doc"); + System.Web.HttpContext.Current.Response.ContentType = "application/word"; + System.Web.HttpContext.Current.Response.ContentEncoding = Encoding.UTF8; + System.Web.HttpContext.Current.Response.Write(htmlStr); + System.Web.HttpContext.Current.Response.End(); + } + } #region 隐患整改通知单 /// @@ -237,6 +263,190 @@ } return sb.ToString(); } + + /// + /// 导出方法 + /// + /// + /// + public static string GetRectifyNoticesTableHtmlAll(string projectId) + { + StringBuilder sb = new StringBuilder(); + var getRectifyNoticesAll = from x in Funs.DB.Check_RectifyNotices + orderby x.RectifyNoticesCode + where x.ProjectId == projectId + select x; + sb.Append(""); + foreach (var getRectifyNotices in getRectifyNoticesAll) + { + sb.Append(""); + sb.Append(""); + sb.AppendFormat(" ", "安全隐患整改通知单"); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(getRectifyNotices.ProjectId)); + sb.AppendFormat(" ", "编号：" + getRectifyNotices.RectifyNoticesCode); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "受检单位名称"); + sb.AppendFormat(" ", UnitService.GetUnitNameByUnitId(getRectifyNotices.UnitId)); + sb.AppendFormat(" ", "单位工程名称"); + sb.AppendFormat(" ", UnitWorkService.GetUnitWorkName(getRectifyNotices.WorkAreaId)); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "检查人员"); + sb.AppendFormat(" ", Person_PersonsService.getPersonsNamesPersonIds(getRectifyNotices.CheckManIds)); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "检查日期"); + sb.AppendFormat(" ", string.Format("{0:yyyy-MM-dd}", getRectifyNotices.CheckedDate)); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "隐患类别"); + if (getRectifyNotices.HiddenHazardType == "3") + { + sb.AppendFormat(" ", "☐一般 ☐较大 √重大"); + } + else if (getRectifyNotices.HiddenHazardType == "2") + { + sb.AppendFormat(" ", "☐一般 √较大 ☐重大"); + } + else + { + sb.AppendFormat(" ", "√一般 ☐较大 ☐重大"); + } + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "贵公司存在的安全隐患及整改要求如下："); + sb.Append(""); + + var getItem = from x in Funs.DB.Check_RectifyNoticesItem + where x.RectifyNoticesId == getRectifyNotices.RectifyNoticesId + orderby x.RectifyNoticesItemId + select x; + int i = 1; + foreach (var item in getItem) + { + string contStr = "   " + i.ToString() + "." + item.WrongContent + "（详见附图" + i.ToString() + "），整改要求：" + item.Requirement; + if (item.LimitTime.HasValue) + { + contStr += " 整改期限" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", item.LimitTime); + } + + sb.Append(""); + sb.AppendFormat(" ", contStr); + sb.Append(""); + i++; + } + + sb.Append(""); + sb.AppendFormat(" ", ""); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "总包单位项目安全经理：" + Person_PersonsService.getSignatureName(getRectifyNotices.SignPerson) + "   "); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.SignDate) + "   "); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "抄送："); + if (string.IsNullOrEmpty(getRectifyNotices.ProfessionalEngineerId)) + { + sb.AppendFormat(" ", "☐专业工程师："); + sb.AppendFormat(" ", "日期："); + } + else + { + sb.AppendFormat(" ", "√专业工程师：" + Person_PersonsService.getSignatureName(getRectifyNotices.ProfessionalEngineerId)); + sb.AppendFormat(" ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ProfessionalEngineerTime1)); + } + sb.Append(""); + + sb.Append(""); + if (string.IsNullOrEmpty(getRectifyNotices.ConstructionManagerId)) + { + sb.AppendFormat(" ", "☐施工经理："); + sb.AppendFormat(" ", "日期："); + } + else + { + sb.AppendFormat(" ", "√施工经理：" + Person_PersonsService.getSignatureName(getRectifyNotices.ConstructionManagerId)); + sb.AppendFormat(" ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ConstructionManagerTime1)); + } + sb.Append(""); + + sb.Append(""); + if (string.IsNullOrEmpty(getRectifyNotices.ProjectManagerId)) + { + sb.AppendFormat(" ", "☐项目经理："); + sb.AppendFormat(" ", "日期："); + } + else + { + sb.AppendFormat(" ", "√项目经理：" + Person_PersonsService.getSignatureName(getRectifyNotices.ProjectManagerId)); + sb.AppendFormat(" ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ProjectManagerTime1)); + } + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "接收人"); + sb.AppendFormat(" ", Person_PersonsService.getSignatureName(getRectifyNotices.DutyPersonId)); + sb.AppendFormat(" ", "接收日期"); + sb.AppendFormat(" ", string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.DutyPersonTime)); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "注： 1.本表由总包单位项目安全经理签发，一般隐患抄送专业工程师监督；较大隐患抄送施工经理监督；重大隐患需要由项目经理签字并报公司施工管理部备案。"); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "   2.本表一式2份，签发单位和接收单位各一份。"); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "附图："); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "整改前的照片"); + sb.Append(""); + + int j = 1; + foreach (var item in getItem) + { + var att = AttachFileService.GetAttachFile(item.RectifyNoticesItemId.ToString() + "#1", BLL.Const.ProjectRectifyNoticesMenuId); + if (att != null && !string.IsNullOrEmpty(att.AttachUrl)) + { + string imgStr = string.Empty; + List listStr = Funs.GetStrListByStr(att.AttachUrl, ','); + foreach (var urlItem in listStr) + { + imgStr += "  "; + } + sb.Append(""); + sb.AppendFormat(" ", imgStr); + sb.Append(""); + sb.Append(""); + sb.AppendFormat(" ", "图 " + j.ToString()); + sb.Append(""); + + j++; + } + } + sb.Append("
{0}
{0}{0}
{0}{0}{0}{0}
{0}{0}
{0}{0}
{0}{0}{0}{0}
{0}
{0}
{0}
{0}
{0}
{0}{0}{0}{0}{0}
{0}{0}{0}{0}
{0}{0}{0}{0}
{0}{0}{0}{0}
{0}
{0}
{0}
{0}
{0}
{0}
"); + } + + return sb.ToString(); + } #endregion #region 安全隐患整改反馈单 @@ -421,6 +631,186 @@ } return sb.ToString(); } + + public static string GetRectifyNoticesTableHtmlAll2(string projectId) + { + StringBuilder sb = new StringBuilder(); + sb.Append(""); + var getRectifyNoticesAll = from x in Funs.DB.Check_RectifyNotices + orderby x.RectifyNoticesCode + where x.ProjectId == projectId + select x; + foreach (var getRectifyNotices in getRectifyNoticesAll) + { + sb.Append(""); + sb.Append(""); + sb.AppendFormat(" ", "安全隐患整改反馈单"); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(getRectifyNotices.ProjectId)); + sb.AppendFormat(" ", "编号：" + getRectifyNotices.RectifyNoticesCode); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "受检单位名称"); + sb.AppendFormat(" ", UnitService.GetUnitNameByUnitId(getRectifyNotices.UnitId)); + sb.AppendFormat(" ", "单位工程名称"); + sb.AppendFormat(" ", UnitWorkService.GetUnitWorkName(getRectifyNotices.WorkAreaId)); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "检查人员"); + sb.AppendFormat(" ", Person_PersonsService.getPersonsNamesPersonIds(getRectifyNotices.CheckManIds)); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "检查日期"); + sb.AppendFormat(" ", string.Format("{0:yyyy-MM-dd}", getRectifyNotices.CheckedDate)); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "隐患类别"); + if (getRectifyNotices.HiddenHazardType == "3") + { + sb.AppendFormat(" ", "☐一般 ☐较大 √重大"); + } + else if (getRectifyNotices.HiddenHazardType == "2") + { + sb.AppendFormat(" ", "☐一般 √较大 ☐重大"); + } + else + { + sb.AppendFormat(" ", "√一般 ☐较大 ☐重大"); + } + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "   我单位接到编号为 " + getRectifyNotices.RectifyNoticesCode + " 的安全隐患整改通知单后，现已按要求完成了整改，具体整改情况如下："); + sb.Append(""); + + var getItem = from x in Funs.DB.Check_RectifyNoticesItem + where x.RectifyNoticesId == getRectifyNotices.RectifyNoticesId + orderby x.RectifyNoticesItemId + select x; + int i = 1; + foreach (var item in getItem) + { + string contStr = "   " + i.ToString() + "." + item.RectifyResults + "（详见附图" + i.ToString() + "）。是否合格：" + (item.IsRectify.HasValue ? (item.IsRectify == true ? "合格" : "不合格") : ""); + sb.Append(""); + sb.AppendFormat(" ", contStr); + sb.Append(""); + i++; + } + + sb.Append(""); + sb.AppendFormat(" ", ""); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "施工单位项目安全经理：" + Person_PersonsService.getSignatureName(getRectifyNotices.DutyPersonId) + "   " + + "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.CompleteDate) + "   "); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "施工单位项目负责人：" + Person_PersonsService.getSignatureName(getRectifyNotices.UnitHeadManId) + "   " + + "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.UnitHeadManDate) + "   "); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "总包单位复查意见："); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "   " + getRectifyNotices.ReCheckOpinion); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", ""); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "安全经理/安全工程师：" + Person_PersonsService.getSignatureName(getRectifyNotices.CheckPerson) + "   "); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ReCheckDate) + "   "); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "抄送："); + if (string.IsNullOrEmpty(getRectifyNotices.ProfessionalEngineerId)) + { + sb.AppendFormat(" ", "☐专业工程师："); + sb.AppendFormat(" ", "日期："); + } + else + { + sb.AppendFormat(" ", "√专业工程师：" + Person_PersonsService.getSignatureName(getRectifyNotices.ProfessionalEngineerId)); + sb.AppendFormat(" ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ProfessionalEngineerTime2)); + } + sb.Append(""); + + sb.Append(""); + if (string.IsNullOrEmpty(getRectifyNotices.ConstructionManagerId)) + { + sb.AppendFormat(" ", "☐施工经理："); + sb.AppendFormat(" ", "日期："); + } + else + { + sb.AppendFormat(" ", "√施工经理：" + Person_PersonsService.getSignatureName(getRectifyNotices.ConstructionManagerId)); + sb.AppendFormat(" ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ConstructionManagerTime2)); + } + sb.Append(""); + + sb.Append(""); + if (string.IsNullOrEmpty(getRectifyNotices.ProjectManagerId)) + { + sb.AppendFormat(" ", "☐项目经理："); + sb.AppendFormat(" ", "日期："); + } + else + { + sb.AppendFormat(" ", "√项目经理：" + Person_PersonsService.getSignatureName(getRectifyNotices.ProjectManagerId)); + sb.AppendFormat(" ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ProjectManagerTime2)); + } + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "附图："); + sb.Append(""); + + sb.Append(""); + sb.AppendFormat(" ", "整改后的照片"); + sb.Append(""); + + int j = 1; + foreach (var item in getItem) + { + var att = AttachFileService.GetAttachFile(item.RectifyNoticesItemId.ToString() + "#2", BLL.Const.ProjectRectifyNoticesMenuId); + if (att != null && !string.IsNullOrEmpty(att.AttachUrl)) + { + string imgStr = string.Empty; + List listStr = Funs.GetStrListByStr(att.AttachUrl, ','); + foreach (var urlItem in listStr) + { + imgStr += "  "; + } + sb.Append(""); + sb.AppendFormat(" ", imgStr); + sb.Append(""); + sb.Append(""); + sb.AppendFormat(" ", "图 " + j.ToString()); + sb.Append(""); + j++; + } + } + + sb.Append("
{0}
{0}{0}
{0}{0}{0}{0}
{0}{0}
{0}{0}
{0}{0}{0}{0}
{0}
{0}
{0}
{0}
{0}
{0}
{0}
{0}
{0}
{0}
{0}{0}{0}{0}{0}
{0}{0}{0}{0}
{0}{0}{0}{0}
{0}
{0}
{0}
{0}
"); + } + return sb.ToString(); + } #endregion #region 安全月报 @@ -1795,7 +2185,7 @@ sb.Append(""); sb.AppendFormat("{0} ", "项目名称"); - sb.AppendFormat("{0} ", BLL.ProjectService.GetProjectNameByProjectId(getCostManage.ProjectId)); + sb.AppendFormat("{0} ", BLL.ProjectService.GetProjectNameByProjectId(getCostManage.ProjectId)); sb.Append(""); sb.Append(""); @@ -1833,7 +2223,7 @@ sb.AppendFormat("{0} ", "分项名称"); sb.AppendFormat("{0} ", "子项名称"); sb.Append(""); - var getItem = BLL.CostManageItemService.GetCostManageItemByCostManageId(costManageId); + var getItem = BLL.CostManageItemService.GetCostManageItemByCostManageId(costManageId); int i = 1; foreach (var item in getItem) { @@ -1843,12 +2233,12 @@ sb.AppendFormat("{0} ", item.CostTypeName); sb.AppendFormat("{0} ", item.InvestCostProject); sb.AppendFormat("{0} ", item.PriceMoney.ToString()); - sb.AppendFormat("{0} ",""); + sb.AppendFormat("{0} ", ""); sb.Append(""); i++; } - string opinin1 = string.Empty;string date1 = string.Empty;string signatureName1 = string.Empty; + string opinin1 = string.Empty; string date1 = string.Empty; string signatureName1 = string.Empty; var getFlow1 = Funs.DB.CostGoods_CostManageFlowOperate.FirstOrDefault(x => x.CostManageId == costManageId && x.SortIndex == 1); if (getFlow1 != null) { @@ -1937,7 +2327,7 @@ } return sb.ToString(); } - + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改通知单202403270342077313.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改通知单202403270342077313.doc new file mode 100644 index 00000000..c53590cb Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改通知单202403270342077313.doc differ diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改通知单202403270342077313.pdf b/SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改通知单202403270342077313.pdf new file mode 100644 index 00000000..7128c229 Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改通知单202403270342077313.pdf differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index ed480851..9f5c1b53 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -107,6 +107,14 @@ ..\FineUIPro\Reference BLL\Interop.WIA.dll + + ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll + True + + + ..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll + True + False @@ -128,6 +136,10 @@ ..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXmlFormats.dll + + ..\packages\MicrosoftOfficeCore.15.0.0\lib\net35\Office.dll + True + ..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll @@ -14441,33 +14453,6 @@ - - {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} - 2 - 4 - 0 - primary - False - True - - - {00020813-0000-0000-C000-000000000046} - 1 - 6 - 0 - primary - False - True - - - {00020905-0000-0000-C000-000000000046} - 8 - 4 - 0 - primary - False - True - {0002E157-0000-0000-C000-000000000046} 5 @@ -14488,7 +14473,7 @@ True 0 / - http://localhost:7155/ + http://localhost:6233/ False False diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx index 2840a5b9..748cdf3d 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx @@ -6,7 +6,7 @@ - + 隐患整改通知单 @@ -16,7 +16,7 @@ ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> @@ -62,7 +62,7 @@ - <%-- --%> + OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged"> - - - - + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs index 9a410f68..eaf27479 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs @@ -397,7 +397,12 @@ namespace FineUIPro.Web.HSSE.Check Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); return; } + + printRectify(getRectify); + } + private void printRectify(Model.Check_RectifyNotices getRectify) + { string rootPath = Server.MapPath("~/"); string initTemplatePath = string.Empty; string uploadfilepath = string.Empty; @@ -714,7 +719,7 @@ namespace FineUIPro.Web.HSSE.Check Response.Close(); File.Delete(newUrl); File.Delete(pdfUrl); - //PrinterDocService.PrinterDocMethod(Const.ProjectRectifyNoticesMenuId + "#1", Grid1.SelectedRowID, "隐患整改通知单"); + //PrinterDocService.PrinterDocMethod(Const.ProjectRectifyNoticesMenuId + "#1", Grid1.SelectedRowID, "隐患整改通知单"); } #endregion @@ -1109,5 +1114,14 @@ namespace FineUIPro.Web.HSSE.Check PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RectifyNoticesView.aspx?RectifyNoticesId={0}", Grid1.SelectedRowID, "查看 - "))); } + + protected void btnAll_Click(object sender, EventArgs e) + { + PrinterDocService.PrinterRectifyNoticesHtmlAll(this.ProjectId,"1"); + } + protected void btnAll2_Click(object sender, EventArgs e) + { + PrinterDocService.PrinterRectifyNoticesHtmlAll(this.ProjectId, "2"); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.designer.cs index 9435acdf..8f7a5802 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.Check { - - - public partial class RectifyNotices { - +namespace FineUIPro.Web.HSSE.Check +{ + + + public partial class RectifyNotices + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// txtUnitName 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUnitName; - + /// /// txtWorkAreaName 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkAreaName; - + /// /// txtRectifyNoticesCode 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtRectifyNoticesCode; - + /// /// Toolbar1 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// rbStates 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rbStates; - + /// /// ToolbarFill2 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarFill2; - + /// /// rbrbHiddenHazardType 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rbrbHiddenHazardType; - + /// /// ToolbarFill1 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnNew 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnOut 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// Label2 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label2; - + /// /// ToolbarSeparator1 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Menu1 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuModify 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuModify; - + /// /// btnView 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnView; - + /// /// btnPrinter 控件。 /// @@ -227,7 +229,16 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnPrinter; - + + /// + /// btnAll 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnAll; + /// /// btnPrinterReturn 控件。 /// @@ -236,7 +247,16 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnPrinterReturn; - + + /// + /// btnAll2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnAll2; + /// /// btnMenuDel 控件。 ///