diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 1ae05411..6e6f23c2 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3366,6 +3366,10 @@ namespace BLL /// public const string PDMSPipelineTemplateUrl = "File\\Excel\\DataIn\\PDMS输出（设计）数据模板.xlsx"; /// + /// 赛鼎施工管理信息平台操作手册 + /// + public const string HelpUrl = "Doc\\赛鼎施工管理信息平台操作手册.docx"; + /// /// 施工计划模板 /// public const string ConstructionPlanTemplateUrl = "File\\Word\\ZHGL\\施工计划模板.doc"; diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs index 8f8769f5..99d31806 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs @@ -139,6 +139,7 @@ namespace FineUIPro.Web.JDGL.Check protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { + Save(); BindGrid(); } @@ -204,10 +205,11 @@ namespace FineUIPro.Web.JDGL.Check string[] ids = this.hdId.Text.Split(','); if (ids.Length > 0) { + int i = 0; foreach (JObject mergedRow in Grid1.GetMergedData()) { JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); + //int i = mergedRow.Value("index"); if (this.Grid1.Rows[i].DataKeys[2] != null && ids.Contains(this.Grid1.Rows[i].DataKeys[2].ToString())) { Model.WBS_WorkPackage WorkPackage = oldViewInfos.FirstOrDefault(x => x.WorkPackageId == this.Grid1.Rows[i].DataKeys[2].ToString()); @@ -325,6 +327,7 @@ namespace FineUIPro.Web.JDGL.Check } } } + i++; } } } diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs index 9fb0e14a..96945ffc 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs @@ -71,6 +71,7 @@ namespace FineUIPro.Web.JDGL.Check protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { + Save(); BindGrid(); } @@ -107,10 +108,12 @@ namespace FineUIPro.Web.JDGL.Check string[] ids = this.hdId.Text.Split(','); if (ids.Length > 0) { + int i = 0; foreach (JObject mergedRow in Grid1.GetMergedData()) { JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); + //int i = mergedRow.Value("index"); + string name = values.Value("Name"); if (this.Grid1.Rows[i].DataKeys[2] != null && ids.Contains(this.Grid1.Rows[i].DataKeys[2].ToString())) { Model.WBS_WorkPackage workPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == this.Grid1.Rows[i].DataKeys[2].ToString()); @@ -191,6 +194,7 @@ namespace FineUIPro.Web.JDGL.Check db.SubmitChanges(); } } + i++; } } } diff --git a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx index 3b99c659..49d7c6ff 100644 --- a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx +++ b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx @@ -22,7 +22,7 @@
- + + + diff --git a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.cs b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.cs index f8e6631e..392dd14b 100644 --- a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.cs +++ b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.cs @@ -285,5 +285,42 @@ { this.Tab1LoadData(); } + + #region 下载模板 + /// + /// 下载模板按钮 + /// + /// + /// + protected void btnDownLoad_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载操作手册吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel"))); + } + + /// + /// 下载导入模板 + /// + /// + /// + protected void PageManager1_CustomEvent(object sender, CustomEventArgs e) + { + if (e.EventArgument == "Confirm_OK") + { + string rootPath = Server.MapPath("~/"); + string uploadfilepath = rootPath + Const.HelpUrl; + string filePath = Const.HelpUrl; + string fileName = Path.GetFileName(filePath); + FileInfo info = new FileInfo(uploadfilepath); + long fileSize = info.Length; + Response.ClearContent(); + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.ContentType = "excel/plain"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + Response.AddHeader("Content-Length", fileSize.ToString().Trim()); + Response.TransmitFile(uploadfilepath, 0, fileSize); + Response.End(); + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.designer.cs b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.designer.cs index 0c8132d0..d8f40e7c 100644 --- a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.designer.cs @@ -75,6 +75,15 @@ namespace FineUIPro.Web.Personal { /// protected global::FineUIPro.Label lbSystemVersion; + /// + /// btnDownLoad 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnDownLoad; + /// /// hdUrl 控件。 ///