From 85f406468402c05f425a7f82ec2adca7dba2c132 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Tue, 10 Mar 2026 15:21:01 +0800 Subject: [PATCH] =?UTF-8?q?20260310=20=E8=B4=A8=E9=87=8F=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E7=82=B9=E6=A3=80=E6=9F=A5=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 + .../QualityControlPointInspectionService.cs | 10 + .../Word/JGZL/质量控制点检查记录导出模板.docx | Bin 0 -> 23072 bytes ...cationConstructionInspectionRecord.aspx.cs | 2 +- .../JGZL/QualityControlPointInspection.aspx | 75 ++- .../QualityControlPointInspection.aspx.cs | 567 ++++++++++++------ ...ityControlPointInspection.aspx.designer.cs | 114 ++-- 7 files changed, 542 insertions(+), 231 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 d33ec3a..30b5d41 100644 --- a/HJGL_DS/BLL/Common/Const.cs +++ b/HJGL_DS/BLL/Common/Const.cs @@ -2495,6 +2495,11 @@ namespace BLL /// 管道安装检查记录导出模板 /// public const string JGZL_PipelineInstallationInspectionRecordUrl = "File\\Word\\JGZL\\管道安装检查记录导出模板.docx"; + + /// + /// 质量控制点检查记录导出模板 + /// + public const string JGZL_QualityControlPointInspectionUrl = "File\\Word\\JGZL\\质量控制点检查记录导出模板.docx"; #endregion } } diff --git a/HJGL_DS/BLL/JGZL/QualityControlPointInspectionService.cs b/HJGL_DS/BLL/JGZL/QualityControlPointInspectionService.cs index 4e088db..2dd1829 100644 --- a/HJGL_DS/BLL/JGZL/QualityControlPointInspectionService.cs +++ b/HJGL_DS/BLL/JGZL/QualityControlPointInspectionService.cs @@ -22,6 +22,16 @@ namespace BLL return Funs.DB.JGZL_QualityControlPointInspection.FirstOrDefault(e => e.QualityControlPointInspectionId == qualityControlPointInspectionId); } + /// + /// 根据项目Id获取质量控制点检查记录 + /// + /// + /// + public static Model.JGZL_QualityControlPointInspection GetQualityControlPointInspectionByProjectId(string projectId) + { + return Funs.DB.JGZL_QualityControlPointInspection.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..4b871bc8d795d0e115223ad8d1a0989e6192b086 GIT binary patch literal 23072 zcmeFZKn*wm05SjskfxxmjgzsBldh7xow1`f zjhnR-L5c^&}JU;qEP{u?9Elq_wz$%hbf>;Da2ziLpuElAPt0B7xB1?)_?`g}8{ z)1iA6mHoQwN+L{jBxpnAMUT-q+x6JPczC=V=sFC@uz^8YPkvh9mseP?uNlsJnYqp? zPf)Ix6bVRa4}zjvDT_Y&Ob>|m$)QK;B6O}GvBY@?HJL_mN9#PLgXlZ0nV$4r*+S4e zb*ft&<4-Ubg%zUq+qd4&3Kpf6a#8lUJ*F#meT+i{Djq;`B>cehPYs1OWO72I1|oE7 zs9p|g_HaiFmei8xZ1DtGs>71sShc$<+}SLwMh}g^ZG1uRql^ZSZ>HhEun`4t(?0(% z=rzk%z~&83${PH&T$%(JxZTya!e!E4tL^@5X+zYJYFzu$Xfr!EoJap4um)9@C%A5Q zO8r~bIQGr)w=RriKyL+*h52klHO`yy2ZX8gmSVD4@x87M*!ZsWL_t3jV3;&a+UrJA zcSjI}FgJi1J8F*y-{#%xKStmjQ=ac+Jv{`Qv*)T6!%@#4Zh64f%Om|qF1l9Q)1y7Y zxhVGVnY*Tu-;iEXV|1S!C-7P)w*WY1a77Kx+*>5MAyIxlwj&*?^r)eIylxk?C%+xR9PxL4X-=al3j4sFTkCIT;tz~17-GHhlWmlf zoKd~pd3f#>)#U^>)39YH7!N1zw!NFr8Tj2hnl26|pbz|Om@JV9jG9S2x`kK~za>FO zE>E>�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 literal 0 HcmV?d00001 diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PipelinePrefabricationConstructionInspectionRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/PipelinePrefabricationConstructionInspectionRecord.aspx.cs index b7c0ae7..a91a435 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/PipelinePrefabricationConstructionInspectionRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/PipelinePrefabricationConstructionInspectionRecord.aspx.cs @@ -98,7 +98,7 @@ namespace FineUIPro.Web.JGZL { //this.txtDrawingNumber.Text = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId).ProjectCode; this.txtProfessionalEngineering.Text = "管道安装工程"; - this.txtInspectionResults.Text = "经检查汽油/航煤加氢增设过滤器及阀组项目管道预制施工质量符合 SH/T 3501-2021《石油化工有毒、可燃介质钢制管道工程施工及验收规范》及GB 50517-2010《石油化工金属管道工程施工质量验收规范》，管道组对尺寸、坡口加工、焊接施工均满足设计及规范规定；所有焊缝外观检查合格，无气孔、夹渣、裂纹、未焊透、咬边超标等外观缺陷，焊缝成型规整，满足管道预制验收标准，具备后续管道安装条件。";//BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId).ProjectName + "完成，经自检，管道施工符合SH/T 3501-2011《石油化工有毒、可燃介质钢制管道工程施工及验收规范》要求，焊缝外观检查合格。"; + this.txtInspectionResults.Text = "内容：\r\n 经检查" + BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId).ProjectName + "管道预制施工质量符合 SH/T 3501-2021《石油化工有毒、可燃介质钢制管道工程施工及验收规范》及GB 50517-2010《石油化工金属管道工程施工质量验收规范》，管道组对尺寸、坡口加工、焊接施工均满足设计及规范规定；所有焊缝外观检查合格，无气孔、夹渣、裂纹、未焊透、咬边超标等外观缺陷，焊缝成型规整，满足管道预制验收标准，具备后续管道安装条件。";//BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId).ProjectName + "完成，经自检，管道施工符合SH/T 3501-2011《石油化工有毒、可燃介质钢制管道工程施工及验收规范》要求，焊缝外观检查合格。"; } } } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx index b54f281..d3a3a94 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx @@ -4,12 +4,12 @@ - + 质量控制点检查记录
- + @@ -40,14 +40,67 @@ - + <%----%> + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- - + --%> - + --%> - + <%-- - + --%> - + --%> diff --git a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.cs index e65113f..2215a1a 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.cs @@ -8,11 +8,44 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using System.IO; +using Aspose.Words; namespace FineUIPro.Web.JGZL { - public partial class QualityControlPointInspection :PageBase + public partial class QualityControlPointInspection : PageBase { + #region 定义项 + /// + /// 主键 + /// + private string QualityControlPointInspectionId + { + get + { + return (string)ViewState["QualityControlPointInspectionId"]; + } + set + { + ViewState["QualityControlPointInspectionId"] = value; + } + } + + /// + /// 项目Id + /// + private string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + #region 加载页面 /// /// 加载页面 @@ -23,7 +56,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 +67,44 @@ 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; + //this.BindGrid(); + DataInfo(); + + } + } + + /// + /// 绑定数据 + /// + private void DataInfo() + { + txtProfessional.Text = string.Empty; + txtConstructionStandards.Text = string.Empty; + txtControlPointName.Text = string.Empty; + txtConTeamGroup.Text = string.Empty; + txtCheckContents.Text = string.Empty; + txtProblems.Text = string.Empty; + txtConclusion.Text = string.Empty; + if (!string.IsNullOrEmpty(this.ProjectId)) + { + var report = BLL.QualityControlPointInspectionService.GetQualityControlPointInspectionByProjectId(this.ProjectId); + if (report != null) + { + this.QualityControlPointInspectionId = report.QualityControlPointInspectionId; + this.txtProfessional.Text = report.Professional; + this.txtConstructionStandards.Text = report.ConstructionStandards; + this.txtControlPointName.Text = report.ControlPointName; + this.txtConTeamGroup.Text = report.ConTeamGroup; + this.txtCheckContents.Text = report.CheckContents; + this.txtProblems.Text = report.Problems; + this.txtConclusion.Text = report.Conclusion; + } + else + { + this.txtProfessional.Text = "管道安装工程"; + this.txtConstructionStandards.Text = "SH/T3501-2021"; + } } } #endregion @@ -82,7 +152,9 @@ namespace FineUIPro.Web.JGZL { if (this.tvControlItem.SelectedNodeID != "0") { - this.BindGrid(); + this.ProjectId = this.tvControlItem.SelectedNodeID; + DataInfo(); + //this.BindGrid(); } } #endregion @@ -91,30 +163,30 @@ namespace FineUIPro.Web.JGZL /// /// 数据绑定 /// - private void BindGrid() - { - //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1"); - string strSql = @"SELECT * from JGZL_QualityControlPointInspection 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_QualityControlPointInspection 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 +196,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 +208,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 +220,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,7 +236,10 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.ProjectId = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + this.tvControlItem.SelectedNodeID = this.ProjectId; + DataInfo(); } /// @@ -174,7 +249,7 @@ namespace FineUIPro.Web.JGZL /// protected void TextBox_TextChanged(object sender, EventArgs e) { - this.BindGrid(); + //this.BindGrid(); } #endregion @@ -190,37 +265,37 @@ namespace FineUIPro.Web.JGZL if (projectId != null) { - if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) - { - string initTemplatePath = ""; - string rootPath = Server.MapPath("~/"); - BLL.Common.FastReportService.ResetData(); + //if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) + //{ + string initTemplatePath = ""; + string rootPath = Server.MapPath("~/"); + BLL.Common.FastReportService.ResetData(); - var report = BLL.QualityControlPointInspectionService.GetQualityControlPointInspectionById(this.Grid1.SelectedRowID); - if (report != null) - { - Dictionary keyValuePairs = new Dictionary(); - keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); - keyValuePairs.Add("Professional", report.Professional); - keyValuePairs.Add("ConstructionStandards", report.ConstructionStandards); - keyValuePairs.Add("ControlPointName", report.ControlPointName); - keyValuePairs.Add("ConTeamGroup", report.ConTeamGroup); - keyValuePairs.Add("CheckContents", report.CheckContents); - keyValuePairs.Add("Problems", report.Problems); - keyValuePairs.Add("Conclusion", report.Conclusion); - BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); - } - initTemplatePath = "File\\Fastreport\\JGZL\\质量控制点检查记录.frx"; - if (File.Exists(rootPath + initTemplatePath)) - { - PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); - } - } - else + //var report = BLL.QualityControlPointInspectionService.GetQualityControlPointInspectionById(this.Grid1.SelectedRowID); + //if (report != null) + //{ + Dictionary keyValuePairs = new Dictionary(); + keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); + keyValuePairs.Add("Professional", txtProfessional.Text.Trim()); + keyValuePairs.Add("ConstructionStandards", txtConstructionStandards.Text.Trim()); + keyValuePairs.Add("ControlPointName", txtControlPointName.Text.Trim()); + keyValuePairs.Add("ConTeamGroup", txtConTeamGroup.Text.Trim()); + keyValuePairs.Add("CheckContents", txtCheckContents.Text); + keyValuePairs.Add("Problems", txtProblems.Text); + keyValuePairs.Add("Conclusion", txtConclusion.Text); + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); + //} + initTemplatePath = "File\\Fastreport\\JGZL\\质量控制点检查记录.frx"; + if (File.Exists(rootPath + initTemplatePath)) { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; + PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); } + //} + //else + //{ + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + //} } else { @@ -236,139 +311,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("QualityControlPointInspectionEdit.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("QualityControlPointInspectionEdit.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_QualityControlPointInspectionMenuId, BLL.Const.BtnModify)) - { - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) - { - if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) - { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityControlPointInspectionEdit.aspx?qualityControlPointInspectionId={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_QualityControlPointInspectionMenuId, BLL.Const.BtnModify)) + // { + // if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + // { + // if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) + // { + // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityControlPointInspectionEdit.aspx?qualityControlPointInspectionId={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_QualityControlPointInspectionMenuId, BLL.Const.BtnModify)) - { - if (Grid1.SelectedRowIndexArray.Length == 0) - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityControlPointInspectionEdit.aspx?qualityControlPointInspectionId={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_QualityControlPointInspectionMenuId, BLL.Const.BtnModify)) + // { + // if (Grid1.SelectedRowIndexArray.Length == 0) + // { + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + // } + // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityControlPointInspectionEdit.aspx?qualityControlPointInspectionId={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_QualityControlPointInspectionMenuId, 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_QualityControlPointInspectionMenuId, 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.QualityControlPointInspectionService.DeleteQualityControlPointInspectionById(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.QualityControlPointInspectionService.DeleteQualityControlPointInspectionById(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 +453,142 @@ 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_QualityControlPointInspectionMenuId, Const.BtnSave)) + { + Model.JGZL_QualityControlPointInspection newReport = new Model.JGZL_QualityControlPointInspection(); + newReport.Professional = this.txtProfessional.Text.Trim(); + newReport.ConstructionStandards = this.txtConstructionStandards.Text.Trim(); + newReport.ControlPointName = this.txtControlPointName.Text.Trim(); + newReport.ConTeamGroup = this.txtConTeamGroup.Text.Trim(); + newReport.CheckContents = this.txtCheckContents.Text; + newReport.Problems = txtProblems.Text; + newReport.Conclusion = this.txtConclusion.Text; + if (!string.IsNullOrEmpty(this.QualityControlPointInspectionId)) + { + newReport.QualityControlPointInspectionId = this.QualityControlPointInspectionId; + BLL.QualityControlPointInspectionService.UpdateQualityControlPointInspection(newReport); + } + else + { + newReport.ProjectId = this.ProjectId; + newReport.CompileMan = this.CurrUser.UserId; + newReport.CompileDate = DateTime.Now; + newReport.QualityControlPointInspectionId = SQLHelper.GetNewID(typeof(Model.JGZL_QualityControlPointInspection)); + this.QualityControlPointInspectionId = newReport.QualityControlPointInspectionId; + BLL.QualityControlPointInspectionService.AddQualityControlPointInspection(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_QualityControlPointInspectionUrl; + 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 professional = doc.Range.Bookmarks["Professional"]; + if (professional != null) + { + professional.Text = this.txtProfessional.Text; + } + Bookmark constructionStandards = doc.Range.Bookmarks["ConstructionStandards"]; + if (constructionStandards != null) + { + constructionStandards.Text = this.txtConstructionStandards.Text; + } + Bookmark controlPointName = doc.Range.Bookmarks["ControlPointName"]; + if (controlPointName != null) + { + controlPointName.Text = this.txtControlPointName.Text; + } + Bookmark conTeamGroup = doc.Range.Bookmarks["ConTeamGroup"]; + if (conTeamGroup != null) + { + conTeamGroup.Text = this.txtConTeamGroup.Text; + } + Bookmark checkContents = doc.Range.Bookmarks["CheckContents"]; + if (checkContents != null) + { + checkContents.Text = this.txtCheckContents.Text; + } + Bookmark problems = doc.Range.Bookmarks["Problems"]; + if (problems != null) + { + problems.Text = this.txtProblems.Text; + } + Bookmark conclusion = doc.Range.Bookmarks["Conclusion"]; + if (conclusion != null) + { + conclusion.Text = this.txtConclusion.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/QualityControlPointInspection.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.designer.cs index ee3ef53..d63a3ab 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.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,112 @@ 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 控件。 + /// txtProfessional 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.ToolbarText ToolbarText1; + protected global::FineUIPro.TextBox txtProfessional; /// - /// ddlPageSize 控件。 + /// txtConstructionStandards 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList ddlPageSize; + protected global::FineUIPro.TextBox txtConstructionStandards; /// - /// Window1 控件。 + /// txtControlPointName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Window Window1; + protected global::FineUIPro.TextBox txtControlPointName; + + /// + /// txtConTeamGroup 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtConTeamGroup; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// txtCheckContents 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtCheckContents; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label2; + + /// + /// txtProblems 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProblems; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// txtConclusion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtConclusion; /// /// WindowPrint 控件。 @@ -175,32 +238,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; } }