From b9d151707043b6ca530134add5857abaf5bfe745 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Tue, 10 Mar 2026 16:54:52 +0800 Subject: [PATCH] =?UTF-8?q?20260310=20=E9=9A=90=E8=94=BD=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HJGL_DS/BLL/Common/Const.cs | 5 + .../ConcealedWorksInspectionRecordService.cs | 10 + .../Word/JGZL/隐蔽工程验收记录导出模板.docx | Bin 0 -> 22268 bytes .../JGZL/ConcealedWorksInspectionRecord.aspx | 50 +- .../ConcealedWorksInspectionRecord.aspx.cs | 535 ++++++++++++------ ...aledWorksInspectionRecord.aspx.designer.cs | 60 +- .../JGZL/QualityControlPointInspection.aspx | 2 +- .../QualityControlPointInspection.aspx.cs | 3 + 8 files changed, 443 insertions(+), 222 deletions(-) create mode 100644 HJGL_DS/FineUIPro.Web/File/Word/JGZL/隐蔽工程验收记录导出模板.docx diff --git a/HJGL_DS/BLL/Common/Const.cs b/HJGL_DS/BLL/Common/Const.cs index 30b5d41..748fb6b 100644 --- a/HJGL_DS/BLL/Common/Const.cs +++ b/HJGL_DS/BLL/Common/Const.cs @@ -2500,6 +2500,11 @@ namespace BLL /// 质量控制点检查记录导出模板 /// public const string JGZL_QualityControlPointInspectionUrl = "File\\Word\\JGZL\\质量控制点检查记录导出模板.docx"; + + /// + /// 隐蔽工程验收记录导出模板 + /// + public const string JGZL_ConcealedWorksInspectionRecordUrl = "File\\Word\\JGZL\\隐蔽工程验收记录导出模板.docx"; #endregion } } diff --git a/HJGL_DS/BLL/JGZL/ConcealedWorksInspectionRecordService.cs b/HJGL_DS/BLL/JGZL/ConcealedWorksInspectionRecordService.cs index 038fa51..6e059a9 100644 --- a/HJGL_DS/BLL/JGZL/ConcealedWorksInspectionRecordService.cs +++ b/HJGL_DS/BLL/JGZL/ConcealedWorksInspectionRecordService.cs @@ -18,6 +18,16 @@ namespace BLL return Funs.DB.JGZL_ConcealedWorksInspectionRecord.FirstOrDefault(e => e.RecordId == Id); } + /// + /// 根据项目Id获取隐蔽工程验收记录 + /// + /// + /// + public static Model.JGZL_ConcealedWorksInspectionRecord GetConcealedWorksInspectionRecordByProjectId(string projectId) + { + return Funs.DB.JGZL_ConcealedWorksInspectionRecord.FirstOrDefault(e => e.ProjectId == projectId); + } + /// /// 添加隐蔽工程验收记录 /// diff --git a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/隐蔽工程验收记录导出模板.docx b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/隐蔽工程验收记录导出模板.docx new file mode 100644 index 0000000000000000000000000000000000000000..b776b1f6a3d62e7b3f719dad0f61e652de3f2b22 GIT binary patch literal 22268 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 OAVUc7K)*>rARYjDX-`c6 literal 0 HcmV?d00001 diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx index a939451..79615b1 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx @@ -39,14 +39,46 @@ - + + + <%----%> + - + + + + + + + + + + + + + + + + + + <%-- + + + + --%> + + + <%-- - + --%> - + --%> - + <%-- - + --%> - + --%> diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs index 3940e43..081b6ff 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs @@ -1,18 +1,53 @@ -using BLL; +using Aspose.Words; +using BLL; +using FastReport; using System; using System.Collections.Generic; -using System.Data.SqlClient; using System.Data; +using System.Data.SqlClient; +using System.IO; using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using System.IO; +using System.Windows.Forms; namespace FineUIPro.Web.JGZL { public partial class ConcealedWorksInspectionRecord : PageBase { + #region 定义项 + ///

+ /// 主键 + /// + private string RecordId + { + get + { + return (string)ViewState["RecordId"]; + } + set + { + ViewState["RecordId"] = value; + } + } + + /// + /// 项目Id + /// + private string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + #region 加载页面 /// /// 加载页面 @@ -23,7 +58,7 @@ namespace FineUIPro.Web.JGZL { if (!IsPostBack) { - this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + //this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.drpProjectId.DataTextField = "ProjectCode"; this.drpProjectId.DataValueField = "ProjectId"; @@ -34,7 +69,40 @@ namespace FineUIPro.Web.JGZL this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; this.InitTreeMenu();//加载树 this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; - this.BindGrid(); + this.ProjectId = this.tvControlItem.SelectedNodeID; + DataInfo(); + //this.BindGrid(); + } + } + + /// + /// 绑定数据 + /// + /// + private void DataInfo() + { + this.RecordId = string.Empty; + this.txtDrawingNumber.Text = string.Empty; + this.txtConcealedWorks.Text = string.Empty; + this.txtConcealedContentAndDiagram.Text = string.Empty; + this.txtInspectionResults.Text = string.Empty; + + if (!string.IsNullOrEmpty(this.ProjectId)) + { + var report = BLL.ConcealedWorksInspectionRecordService.GetConcealedWorksInspectionRecordByProjectId(this.ProjectId); + if (report != null) + { + this.RecordId = report.RecordId; + this.txtDrawingNumber.Text = report.DrawingNumber; + this.txtConcealedWorks.Text = report.ConcealedWorks; + this.txtConcealedContentAndDiagram.Text = report.ConcealedContentAndDiagram; + this.txtInspectionResults.Text = report.InspectionResults; + } + else + { + //默认值 + + } } } #endregion @@ -82,7 +150,9 @@ namespace FineUIPro.Web.JGZL { if (this.tvControlItem.SelectedNodeID != "0") { - this.BindGrid(); + this.ProjectId = this.tvControlItem.SelectedNodeID; + DataInfo(); + //this.BindGrid(); } } #endregion @@ -91,30 +161,30 @@ namespace FineUIPro.Web.JGZL /// /// 数据绑定 /// - private void BindGrid() - { - //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1"); - string strSql = @"SELECT * from JGZL_ConcealedWorksInspectionRecord where 1=1"; - List listStr = new List(); - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) - { - strSql += " AND ProjectId = @ProjectId"; - listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID)); - } - //else - //{ - // strSql += " AND CHARINDEX(ProjectId,@ProjectId)>0 "; - // listStr.Add(new SqlParameter("@ProjectId", projectIds)); - //} - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - // 2.获取当前分页数据 - Grid1.RecordCount = tb.Rows.Count; - //tb = GetFilteredTable(Grid1.FilteredData, tb); - var table = this.GetPagedDataTable(Grid1, tb); - Grid1.DataSource = table; - Grid1.DataBind(); - } + //private void BindGrid() + //{ + // //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1"); + // string strSql = @"SELECT * from JGZL_ConcealedWorksInspectionRecord where 1=1"; + // List listStr = new List(); + // if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + // { + // strSql += " AND ProjectId = @ProjectId"; + // listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID)); + // } + // //else + // //{ + // // strSql += " AND CHARINDEX(ProjectId,@ProjectId)>0 "; + // // listStr.Add(new SqlParameter("@ProjectId", projectIds)); + // //} + // SqlParameter[] parameter = listStr.ToArray(); + // DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + // // 2.获取当前分页数据 + // Grid1.RecordCount = tb.Rows.Count; + // //tb = GetFilteredTable(Grid1.FilteredData, tb); + // var table = this.GetPagedDataTable(Grid1, tb); + // Grid1.DataSource = table; + // Grid1.DataBind(); + //} #endregion #region 分页排序 @@ -124,10 +194,10 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) - { - BindGrid(); - } + //protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + //{ + // BindGrid(); + //} #endregion #region 排序 @@ -136,10 +206,10 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void Grid1_Sort(object sender, GridSortEventArgs e) - { - BindGrid(); - } + //protected void Grid1_Sort(object sender, GridSortEventArgs e) + //{ + // BindGrid(); + //} #endregion #region 分页选择下拉改变事件 @@ -148,11 +218,11 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) - { - Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); - BindGrid(); - } + //protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + //{ + // Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + // BindGrid(); + //} #endregion #endregion @@ -164,9 +234,10 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { - this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; + this.ProjectId = this.drpProjectId.SelectedValue; this.InitTreeMenu(); - BindGrid(); + this.tvControlItem.SelectedNodeID = this.ProjectId; + DataInfo(); } /// @@ -176,7 +247,7 @@ namespace FineUIPro.Web.JGZL /// protected void TextBox_TextChanged(object sender, EventArgs e) { - this.BindGrid(); + //this.BindGrid(); } #endregion @@ -197,23 +268,23 @@ namespace FineUIPro.Web.JGZL BLL.Common.FastReportService.ResetData(); Dictionary keyValuePairs = new Dictionary(); - if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) - { - var report = BLL.ConcealedWorksInspectionRecordService.GetConcealedWorksInspectionRecordById(this.Grid1.SelectedRowID); - if (report != null) - { - keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); - keyValuePairs.Add("ConcealedWorks", report.ConcealedWorks); - keyValuePairs.Add("DrawingNumber", report.DrawingNumber); - keyValuePairs.Add("ConcealedContentAndDiagram", report.ConcealedContentAndDiagram); - keyValuePairs.Add("InspectionResults", report.InspectionResults); - } - } - else - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } + //if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) + //{ + // var report = BLL.ConcealedWorksInspectionRecordService.GetConcealedWorksInspectionRecordById(this.Grid1.SelectedRowID); + // if (report != null) + // { + keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); + keyValuePairs.Add("ConcealedWorks",txtConcealedWorks.Text.Trim()); + keyValuePairs.Add("DrawingNumber", txtDrawingNumber.Text.Trim()); + keyValuePairs.Add("ConcealedContentAndDiagram", txtConcealedContentAndDiagram.Text); + keyValuePairs.Add("InspectionResults", txtInspectionResults.Text); + // } + //} + //else + //{ + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + //} BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\JGZL\\隐蔽工程验收记录.frx"; @@ -236,139 +307,139 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void btnAdd_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) - { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConcealedWorksInspectionRecordEdit.aspx?projectId={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); - } - else - { - Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); - return; - } - } + //protected void btnAdd_Click(object sender, EventArgs e) + //{ + // if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + // { + // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConcealedWorksInspectionRecordEdit.aspx?projectId={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); + // } + // else + // { + // Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + // return; + // } + //} /// /// 双击编辑 /// /// /// - protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) - { - if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_ConcealedWorksInspectionRecordMenuId, BLL.Const.BtnModify)) - { - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) - { - if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) - { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConcealedWorksInspectionRecordEdit.aspx?recordId={0}", this.Grid1.SelectedRowID, "编辑 - "))); - } - else - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } - } - else - { - Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); - return; - } - } - else - { - ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); - } - } + //protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + //{ + // if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_ConcealedWorksInspectionRecordMenuId, BLL.Const.BtnModify)) + // { + // if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + // { + // if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) + // { + // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConcealedWorksInspectionRecordEdit.aspx?recordId={0}", this.Grid1.SelectedRowID, "编辑 - "))); + // } + // else + // { + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + // } + // } + // else + // { + // Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + // return; + // } + // } + // else + // { + // ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + // } + //} /// /// 右键编辑 /// /// /// - protected void btnMenuEdit_Click(object sender, EventArgs e) - { - if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_ConcealedWorksInspectionRecordMenuId, BLL.Const.BtnModify)) - { - if (Grid1.SelectedRowIndexArray.Length == 0) - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConcealedWorksInspectionRecordEdit.aspx?recordId={0}", Grid1.SelectedRowID, "维护 - "))); - } - else - { - Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); - } - } + //protected void btnMenuEdit_Click(object sender, EventArgs e) + //{ + // if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_ConcealedWorksInspectionRecordMenuId, BLL.Const.BtnModify)) + // { + // if (Grid1.SelectedRowIndexArray.Length == 0) + // { + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + // } + // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConcealedWorksInspectionRecordEdit.aspx?recordId={0}", Grid1.SelectedRowID, "维护 - "))); + // } + // else + // { + // Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + // } + //} /// /// 右键删除 /// /// /// - protected void btnMenuDelete_Click(object sender, EventArgs e) - { - if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_ConcealedWorksInspectionRecordMenuId, Const.BtnDelete)) - { - if (Grid1.SelectedRowIndexArray.Length == 0) - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } + //protected void btnMenuDelete_Click(object sender, EventArgs e) + //{ + // if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_ConcealedWorksInspectionRecordMenuId, Const.BtnDelete)) + // { + // if (Grid1.SelectedRowIndexArray.Length == 0) + // { + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + // } - bool isShow = true; - if (Grid1.SelectedRowIndexArray.Length > 1) - { - isShow = false; - } - bool isDelete = false; - foreach (int rowIndex in Grid1.SelectedRowIndexArray) - { - string rowID = Grid1.DataKeys[rowIndex][0].ToString(); - if (judgementDelete(rowID, isShow)) - { - isDelete = true; - BLL.ConcealedWorksInspectionRecordService.DeleteConcealedWorksInspectionRecordById(rowID); - BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除隐蔽工程验收记录"); - } - } - if (isDelete) - { - ShowNotify("删除成功！", MessageBoxIcon.Success); - } - this.BindGrid(); - } - else - { - Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); - } - } + // bool isShow = true; + // if (Grid1.SelectedRowIndexArray.Length > 1) + // { + // isShow = false; + // } + // bool isDelete = false; + // foreach (int rowIndex in Grid1.SelectedRowIndexArray) + // { + // string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + // if (judgementDelete(rowID, isShow)) + // { + // isDelete = true; + // BLL.ConcealedWorksInspectionRecordService.DeleteConcealedWorksInspectionRecordById(rowID); + // BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除隐蔽工程验收记录"); + // } + // } + // if (isDelete) + // { + // ShowNotify("删除成功！", MessageBoxIcon.Success); + // } + // this.BindGrid(); + // } + // else + // { + // Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + // } + //} #region 判断是否可删除 /// /// 判断是否可以删除 /// /// - private bool judgementDelete(string id, bool isShow) - { - string content = string.Empty; + //private bool judgementDelete(string id, bool isShow) + //{ + // string content = string.Empty; - if (string.IsNullOrEmpty(content)) - { - return true; - } - else - { - if (isShow) - { - Alert.ShowInTop(content, MessageBoxIcon.Error); - } - return false; - } - } + // if (string.IsNullOrEmpty(content)) + // { + // return true; + // } + // else + // { + // if (isShow) + // { + // Alert.ShowInTop(content, MessageBoxIcon.Error); + // } + // return false; + // } + //} #endregion #endregion @@ -378,10 +449,128 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void Window1_Close(object sender, WindowCloseEventArgs e) + //protected void Window1_Close(object sender, WindowCloseEventArgs e) + //{ + // this.InitTreeMenu();//加载树 + // this.BindGrid(); + //} + #endregion + + #region 提交按钮 + /// + /// 提交按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) { - this.InitTreeMenu();//加载树 - this.BindGrid(); + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_ConcealedWorksInspectionRecordMenuId, Const.BtnSave)) + { + Model.JGZL_ConcealedWorksInspectionRecord newReport = new Model.JGZL_ConcealedWorksInspectionRecord(); + newReport.DrawingNumber = this.txtDrawingNumber.Text.Trim(); + newReport.ConcealedWorks = this.txtConcealedWorks.Text.Trim(); + newReport.ConcealedContentAndDiagram = this.txtConcealedContentAndDiagram.Text.Trim(); + newReport.InspectionResults = this.txtInspectionResults.Text.Trim(); + //newReport.Remark = this.txtRemark.Text.Trim(); + + if (!string.IsNullOrEmpty(this.RecordId)) + { + newReport.RecordId = this.RecordId; + BLL.ConcealedWorksInspectionRecordService.UpdateConcealedWorksInspectionRecord(newReport); + } + else + { + newReport.ProjectId = this.ProjectId; + newReport.CompileMan = this.CurrUser.UserId; + newReport.CompileDate = DateTime.Now; + newReport.Reviewer = this.CurrUser.UserId; + newReport.RevieweDate = DateTime.Now; + newReport.RecordId = SQLHelper.GetNewID(typeof(Model.JGZL_ConcealedWorksInspectionRecord)); + this.RecordId = newReport.RecordId; + BLL.ConcealedWorksInspectionRecordService.AddConcealedWorksInspectionRecord(newReport); + } + ShowNotify("保存成功！", MessageBoxIcon.Success); + //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = string.Empty; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + string filePath = string.Empty; + + string projectId = this.tvControlItem.SelectedNodeID; + if (!string.IsNullOrEmpty(projectId)) + { + initTemplatePath = Const.JGZL_ConcealedWorksInspectionRecordUrl; + uploadfilepath = rootPath + initTemplatePath; + + newUrl = uploadfilepath.Replace("隐蔽工程验收记录导出模板", "隐蔽工程验收记录"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } + File.Copy(uploadfilepath, newUrl); + Document doc = new Aspose.Words.Document(uploadfilepath); + + Bookmark projectName = doc.Range.Bookmarks["ProjectName"]; + if (projectName != null) + { + projectName.Text = BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName; + } + Bookmark concealedWorks = doc.Range.Bookmarks["ConcealedWorks"]; + if (concealedWorks != null) + { + concealedWorks.Text = this.txtConcealedWorks.Text; + } + Bookmark drawingNumber = doc.Range.Bookmarks["DrawingNumber"]; + if (drawingNumber != null) + { + drawingNumber.Text = this.txtDrawingNumber.Text; + } + Bookmark concealedContentAndDiagram = doc.Range.Bookmarks["ConcealedContentAndDiagram"]; + if (concealedContentAndDiagram != null) + { + concealedContentAndDiagram.Text = this.txtConcealedContentAndDiagram.Text; + } + Bookmark inspectionResults = doc.Range.Bookmarks["InspectionResults"]; + if (inspectionResults != null) + { + inspectionResults.Text = this.txtInspectionResults.Text; + } + doc.Save(newUrl); + + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + return; + } } #endregion } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.designer.cs index 0e1c114..75697c5 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.designer.cs @@ -105,13 +105,13 @@ namespace FineUIPro.Web.JGZL protected global::FineUIPro.ToolbarFill ToolbarFill1; /// - /// btnAdd 控件。 + /// btnSave 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnAdd; + protected global::FineUIPro.Button btnSave; /// /// btnPrint 控件。 @@ -123,49 +123,58 @@ namespace FineUIPro.Web.JGZL protected global::FineUIPro.Button btnPrint; /// - /// Grid1 控件。 + /// btnOut 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Grid Grid1; + protected global::FineUIPro.Button btnOut; /// - /// ToolbarSeparator1 控件。 + /// SimpleForm1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + protected global::FineUIPro.Form SimpleForm1; /// - /// ToolbarText1 控件。 + /// txtConcealedWorks 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.ToolbarText ToolbarText1; + protected global::FineUIPro.TextBox txtConcealedWorks; /// - /// ddlPageSize 控件。 + /// txtDrawingNumber 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList ddlPageSize; + protected global::FineUIPro.TextBox txtDrawingNumber; /// - /// Window1 控件。 + /// txtConcealedContentAndDiagram 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Window Window1; + protected global::FineUIPro.TextArea txtConcealedContentAndDiagram; + + /// + /// txtInspectionResults 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtInspectionResults; /// /// WindowPrint 控件。 @@ -175,32 +184,5 @@ namespace FineUIPro.Web.JGZL /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowPrint; - - /// - /// Menu1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Menu Menu1; - - /// - /// btnMenuEdit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuEdit; - - /// - /// btnMenuDelete 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuDelete; } } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx index d3a3a94..17dcdd3 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx @@ -75,7 +75,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.cs index 2215a1a..0f267d4 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.cs @@ -79,6 +79,7 @@ namespace FineUIPro.Web.JGZL /// private void DataInfo() { + this.QualityControlPointInspectionId = string.Empty; txtProfessional.Text = string.Empty; txtConstructionStandards.Text = string.Empty; txtControlPointName.Text = string.Empty; @@ -104,6 +105,8 @@ namespace FineUIPro.Web.JGZL { this.txtProfessional.Text = "管道安装工程"; this.txtConstructionStandards.Text = "SH/T3501-2021"; + this.txtControlPointName.Text = "管道安装整体质量控制"; + this.txtCheckContents.Text = "1、经检查该管道安装下料尺寸精准，切口平整、无毛刺、无裂纹；坡口形式、角度、钝边厚度符合焊接工艺要求，坡口表面清洁无油污、铁锈、杂质，偏差均控制在规范允许范围内；\r\n2、该管道组对间隙、错边量符合规范要求，同轴度达标；严格按照审批通过的焊接工艺施焊，焊工均持证上岗，焊接参数合规，焊缝外观无咬边、气孔、夹渣、未焊透等缺陷；\r\n3、该管道的安装坐标、标高、坡度精准复核，符合设计图纸要求，坡度方向适配介质输送需求，偏差均在规范允许范围内且安装位置无偏移、无错位；\r\n4、该管线的支吊架材质、规格、安装位置、间距符合设计及规范要求，安装牢固、平整，无松动、歪斜；固定支吊架、滑动支吊架类型适配，不妨碍管道热胀冷缩，焊接部位饱满无缺陷；\r\n5、焊缝外观质量验收合格，无各类表面缺陷；按设计及规范要求比例进行RT、UT、MT、PT等无损检测，检测报告完整，不合格焊缝及时返修，返修后重新检测合格；\r\n6、该管道按照设计要求使用水压行强度试验，试验压力及稳压时间达标，无渗漏、无变形、无异常声响；严密性试验压力合规，全线检查无渗漏。"; } } }