From d99013421d5841f49c731d0e8709dc88c2671300 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Sat, 7 Feb 2026 11:38:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?20260207=20=E4=BA=A4=E5=B7=A5=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HJGL_DS/BLL/BLL.csproj | 1 + HJGL_DS/BLL/Common/Const.cs | 4 + HJGL_DS/BLL/JGZL/FileDirectoryService.cs | 41 ++++++ .../File/Fastreport/JGZL/交工技术文件目录.frx | 70 +++++----- .../File/Fastreport/JGZL/合格焊工登记表.frx | 86 ++++++------ .../File/Fastreport/JGZL/封面.frx | 4 +- .../File/Fastreport/JGZL/工程中间交接证书.frx | 16 +-- .../File/Fastreport/JGZL/工程交工验收证书.frx | 6 +- .../File/Fastreport/JGZL/工程施工开工报告.frx | 14 +- .../File/Fastreport/JGZL/工程联络单.frx | 38 +++--- .../File/Fastreport/JGZL/施工图核查记录.frx | 42 +++--- .../Fastreport/JGZL/无损检测人员登记表.frx | 124 +++++++++--------- .../File/Fastreport/JGZL/管道焊接工作记录.frx | 121 ++++++++--------- HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx | 44 ++++++- .../FineUIPro.Web/JGZL/FileDirectory.aspx.cs | 111 +++++++++++++++- .../JGZL/FileDirectory.aspx.designer.cs | 45 +++++++ .../JGZL/PipeWeldingWorkRecord.aspx.cs | 21 +++ 17 files changed, 524 insertions(+), 264 deletions(-) create mode 100644 HJGL_DS/BLL/JGZL/FileDirectoryService.cs diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj index 860e83e..2904cba 100644 --- a/HJGL_DS/BLL/BLL.csproj +++ b/HJGL_DS/BLL/BLL.csproj @@ -248,6 +248,7 @@ + diff --git a/HJGL_DS/BLL/Common/Const.cs b/HJGL_DS/BLL/Common/Const.cs index 33b6004..cec10f2 100644 --- a/HJGL_DS/BLL/Common/Const.cs +++ b/HJGL_DS/BLL/Common/Const.cs @@ -1900,6 +1900,10 @@ namespace BLL /// public const string JGZL_DocumentDescriptionMenuId = "81B9A521-A077-48C5-98A8-3A44C0B0D803"; + /// + /// 交工技术文件目录 + /// + public const string JGZL_FileDirectoryMenuId = "729387AD-488D-4451-AEB4-570306747351"; #endregion diff --git a/HJGL_DS/BLL/JGZL/FileDirectoryService.cs b/HJGL_DS/BLL/JGZL/FileDirectoryService.cs new file mode 100644 index 0000000..155f957 --- /dev/null +++ b/HJGL_DS/BLL/JGZL/FileDirectoryService.cs @@ -0,0 +1,41 @@ +using Model; +using NPOI.SS.UserModel; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 交工技术文件目录 + /// + public class FileDirectoryService + { + /// + /// 根据主键获取交工技术文件目录 + /// + /// + /// + public static Model.JGZL_FileDirectory GetFileDirectoryById(string fileDirectoryId) + { + return Funs.DB.JGZL_FileDirectory.FirstOrDefault(e => e.FileDirectoryId == fileDirectoryId); + } + + /// + /// 根据主键删除交工技术文件目录 + /// + /// + public static void DeleteFileDirectoryById(string fileDirectoryId) + { + SGGLDB db = Funs.DB; + var fileDirectory = db.JGZL_FileDirectory.FirstOrDefault(e => e.FileDirectoryId == fileDirectoryId); + if (fileDirectory != null) + { + db.JGZL_FileDirectory.DeleteOnSubmit(fileDirectory); + db.SubmitChanges(); + } + } + } +} diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx index bd271a6..d678abe 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + @@ -52,7 +52,7 @@ namespace FastReport - + @@ -77,40 +77,22 @@ namespace FastReport - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - + @@ -124,8 +106,26 @@ namespace FastReport - - + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/合格焊工登记表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/合格焊工登记表.frx index c0a5a20..906fa91 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/合格焊工登记表.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/合格焊工登记表.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + @@ -54,22 +54,22 @@ namespace FastReport - - - - - - - - - - - + + + + + + + + + + + - + @@ -89,17 +89,17 @@ namespace FastReport - - - - - - - - - - - + + + + + + + + + + + @@ -111,18 +111,18 @@ namespace FastReport - - - - - - - - - - - - + + + + + + + + + + + + @@ -135,17 +135,17 @@ namespace FastReport - - - - - + + + + + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/封面.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/封面.frx index 0aa4dbe..26d315c 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/封面.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/封面.frx @@ -1,5 +1,5 @@  - + @@ -24,7 +24,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程中间交接证书.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程中间交接证书.frx index 2791e40..4f19a77 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程中间交接证书.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程中间交接证书.frx @@ -1,5 +1,5 @@  - + @@ -9,9 +9,9 @@ - - - + + + @@ -23,7 +23,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -95,7 +95,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程交工验收证书.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程交工验收证书.frx index ef6a0e1..cae5a7e 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程交工验收证书.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程交工验收证书.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -32,7 +32,7 @@ namespace FastReport - + @@ -43,7 +43,7 @@ namespace FastReport - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx index 1f291c2..b26a26f 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx @@ -1,5 +1,5 @@  - + @@ -11,9 +11,9 @@ - - - + + + @@ -86,9 +86,9 @@ - + - + @@ -96,7 +96,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程联络单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程联络单.frx index 59f1f65..59da180 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程联络单.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程联络单.frx @@ -1,5 +1,5 @@  - + @@ -16,21 +16,21 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -91,7 +91,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -156,11 +156,11 @@ - - - - - + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/施工图核查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/施工图核查记录.frx index d76a271..83b1684 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/施工图核查记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/施工图核查记录.frx @@ -1,5 +1,5 @@  - + @@ -15,23 +15,23 @@ - - - - - - - - - + + + + + + + + + - - - + - + + + @@ -74,7 +74,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -116,10 +116,10 @@ - - - - + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/无损检测人员登记表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/无损检测人员登记表.frx index 100c33e..0f4ba82 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/无损检测人员登记表.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/无损检测人员登记表.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + @@ -54,15 +54,15 @@ namespace FastReport - - - - - - + + + + + + - - + + @@ -73,70 +73,70 @@ namespace FastReport - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + @@ -148,7 +148,7 @@ namespace FastReport - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx index 9070009..eeade1f 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -50,7 +50,7 @@ namespace FastReport } - + @@ -66,25 +66,25 @@ namespace FastReport - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + @@ -97,7 +97,7 @@ namespace FastReport - + @@ -127,20 +127,20 @@ namespace FastReport - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -157,21 +157,21 @@ namespace FastReport - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -189,37 +189,40 @@ namespace FastReport - - - - - - + + + + + + - + - + - + - + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx b/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx index 4d1939f..5cfbb7c 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx @@ -47,12 +47,16 @@ - - + --%> + @@ -63,15 +67,47 @@ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="350px"> + + + + + + + + + + + + + + + - + + <%-- + --%> + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx.cs index 214821b..1de6f8c 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx.cs @@ -110,6 +110,45 @@ namespace FineUIPro.Web.JGZL } #endregion + #region 分页排序 + #region 页索引改变事件 + /// + /// 页索引改变事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + #endregion + + #region 排序 + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + #endregion + + #region 分页选择下拉改变事件 + /// + /// 分页选择下拉改变事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + #endregion + #region 查询 /// ///查询 @@ -122,6 +161,74 @@ namespace FineUIPro.Web.JGZL } #endregion + #region 删除 + /// + /// 右键删除 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_FileDirectoryMenuId, 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.FileDirectoryService.DeleteFileDirectoryById(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; + + if (string.IsNullOrEmpty(content)) + { + return true; + } + else + { + if (isShow) + { + Alert.ShowInTop(content, MessageBoxIcon.Error); + } + return false; + } + } + #endregion + #endregion + #region 打印 /// /// 打印 @@ -152,14 +259,16 @@ namespace FineUIPro.Web.JGZL dt.Columns.Add("Remark"); DataRow[] rows = tb.DefaultView.ToTable().Select(); + int i = 0; foreach (var row in rows) { var newRow = dt.NewRow(); - newRow["SerialNumber"] = row["SerialNumber"].ToString(); + newRow["SerialNumber"] = (i + 1).ToString(); //row["SerialNumber"].ToString(); newRow["FileCode"] = row["FileCode"].ToString(); newRow["FileName"] = row["FileName"].ToString(); newRow["Remark"] = row["Remark"].ToString(); dt.Rows.Add(newRow); + i++; } BLL.Common.FastReportService.AddFastreportTable(dt); diff --git a/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx.designer.cs index 1cabadc..33d6fc1 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx.designer.cs @@ -122,6 +122,33 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.Grid Grid1; + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + /// /// WindowPrint 控件。 /// @@ -130,5 +157,23 @@ namespace FineUIPro.Web.JGZL /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowPrint; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; } } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx.cs index ba22cb9..7284290 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx.cs @@ -35,6 +35,17 @@ namespace FineUIPro.Web.JGZL this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; this.InitTreeMenu();//加载树 this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; + + this.Grid1.Items.Clear(); + this.Grid1.DataBind(); + this.drpIsoId.Items.Clear(); + this.drpIsoId.DataTextField = "ISO_IsoNo"; + this.drpIsoId.DataValueField = "ISO_ID"; + this.drpIsoId.DataSource = (from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.tvControlItem.SelectedNodeID select x).ToList(); + this.drpIsoId.DataBind(); + Funs.FineUIPleaseSelect(this.drpIsoId); + this.drpIsoId.SelectedIndex = 0; + this.BindGrid(); } } @@ -175,6 +186,16 @@ namespace FineUIPro.Web.JGZL protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { this.InitTreeMenu(); + + this.Grid1.Items.Clear(); + this.Grid1.DataBind(); + this.drpIsoId.Items.Clear(); + this.drpIsoId.DataTextField = "ISO_IsoNo"; + this.drpIsoId.DataValueField = "ISO_ID"; + this.drpIsoId.DataSource = (from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.tvControlItem.SelectedNodeID select x).ToList(); + this.drpIsoId.DataBind(); + Funs.FineUIPleaseSelect(this.drpIsoId); + this.drpIsoId.SelectedIndex = 0; } /// From c724eb117e80004c1b09281851346c1ed37a804c Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Sat, 7 Feb 2026 17:01:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?20260207=20=E4=BA=A4=E5=B7=A5=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E6=96=87=E4=BB=B6=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/HJGLDB_DS_2026-02-07_bwj.sql | 4 + .../BLL/JGZL/DocumentDescriptionService.cs | 6 ++ .../File/Fastreport/JGZL/交工技术文件目录.frx | 48 ++++++------ .../File/Fastreport/JGZL/交工技术文件说明.frx | 33 +++++---- .../File/Fastreport/JGZL/工程施工开工报告.frx | 2 +- .../JGZL/DocumentDescription.aspx | 17 ++++- .../JGZL/DocumentDescription.aspx.cs | 73 +++++++++++++------ .../JGZL/DocumentDescription.aspx.designer.cs | 31 +++++++- HJGL_DS/Model/Model.cs | 72 ++++++++++++++++++ 9 files changed, 221 insertions(+), 65 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-02-07_bwj.sql diff --git a/DataBase/版本日志/HJGLDB_DS_2026-02-07_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-02-07_bwj.sql new file mode 100644 index 0000000..9d0422a --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-02-07_bwj.sql @@ -0,0 +1,4 @@ +alter table JGZL_DocumentDescription add CompilationBasis nvarchar(1000) +alter table JGZL_DocumentDescription add MainContent nvarchar(500) +alter table JGZL_DocumentDescription add CopiesNum nvarchar(500) +go \ No newline at end of file diff --git a/HJGL_DS/BLL/JGZL/DocumentDescriptionService.cs b/HJGL_DS/BLL/JGZL/DocumentDescriptionService.cs index b2d2cdf..2857f23 100644 --- a/HJGL_DS/BLL/JGZL/DocumentDescriptionService.cs +++ b/HJGL_DS/BLL/JGZL/DocumentDescriptionService.cs @@ -42,6 +42,9 @@ namespace BLL newDocumentDescription.CompileDate = documentDescription.CompileDate; newDocumentDescription.Reviewer = documentDescription.Reviewer; newDocumentDescription.ReviewDate = documentDescription.ReviewDate; + newDocumentDescription.CompilationBasis= documentDescription.CompilationBasis; + newDocumentDescription.MainContent = documentDescription.MainContent; + newDocumentDescription.CopiesNum = documentDescription.CopiesNum; db.JGZL_DocumentDescription.InsertOnSubmit(newDocumentDescription); db.SubmitChanges(); } @@ -61,6 +64,9 @@ namespace BLL newDocumentDescription.DesigningUnit = documentDescription.DesigningUnit; newDocumentDescription.TestingUnit = documentDescription.TestingUnit; newDocumentDescription.ConstructionCompany = documentDescription.ConstructionCompany; + newDocumentDescription.CompilationBasis = documentDescription.CompilationBasis; + newDocumentDescription.MainContent = documentDescription.MainContent; + newDocumentDescription.CopiesNum = documentDescription.CopiesNum; db.SubmitChanges(); } } diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx index d678abe..78667ee 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -37,12 +37,12 @@ namespace FastReport // go next data source row rowData.Next(); } - } - } + } + } } - + @@ -106,8 +106,24 @@ namespace FastReport - - + + + + + + + + + + + + + + + + + + @@ -118,27 +134,11 @@ namespace FastReport - + - - - - - - - - - - - - - - - - - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx index 4a39591..6eae90a 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx @@ -1,5 +1,5 @@  - + @@ -7,6 +7,9 @@ + + + @@ -17,13 +20,13 @@ - + - + @@ -36,16 +39,16 @@ - - + + - - + + - - + + @@ -72,15 +75,15 @@ - - + + - - + + - + @@ -88,7 +91,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx index b26a26f..db9d4cd 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx @@ -1,5 +1,5 @@  - + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx index b62503e..19e82ea 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx @@ -51,6 +51,16 @@ + + + + + + + + + + @@ -65,7 +75,12 @@ - + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs index 6c31e39..0ae6796 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs @@ -9,6 +9,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using static System.Windows.Forms.VisualStyles.VisualStyleElement; using System.IO; +using Microsoft.SqlServer.Server; namespace FineUIPro.Web.JGZL { @@ -127,35 +128,57 @@ namespace FineUIPro.Web.JGZL { this.DocumentDescriptionId = report.DocumentDescriptionId; this.txtProjectOverview.Text = report.ProjectOverview; - this.txtConstructionUnit.Text = report.ConstructionUnit; + if(!string.IsNullOrEmpty(report.ConstructionUnit)) + { + this.txtConstructionUnit.Text = report.ConstructionUnit; + } + else + { + this.txtConstructionUnit.Text = "浙江石油化工有限公司"; + } + this.txtDesigningUnit.Text = report.DesigningUnit; this.txtTestingUnit.Text = report.TestingUnit; - this.txtConstructionCompany.Text = report.ConstructionCompany; + if (!string.IsNullOrEmpty(report.ConstructionCompany)) + { + this.txtConstructionCompany.Text = report.ConstructionCompany; + } + else + { + this.txtConstructionCompany.Text = "浙江鼎盛石化工程有限公司"; + } + if (!string.IsNullOrEmpty(report.CompilationBasis)) + { + this.txtCompilationBasis.Text = report.CompilationBasis; + } + else + { + this.txtCompilationBasis.Text = "1、《石油化工建设工程项目交工技术文件规定》(SH/T3503-2017)\r\n2、《国家重大建设项目文件归档要求与档案管理规范》(DA/T28-2018)\r\n3、《石油化工建设工程项目过程技术文件规定》(SH/T3543-2017)"; + } + if (!string.IsNullOrEmpty(report.MainContent)) + { + this.txtMainContent.Text = report.MainContent; + } + else + { + this.txtMainContent.Text = "1、交工技术文件，共2册，分别为:管道安装工程册、材料质量证明文件\r\n2、本册为管道安装工程册，册内内容包括:封面、交工技术目录、交工技术总目录、交工技术说明、交工技术文件移交证书等。"; + } + if (!string.IsNullOrEmpty(report.CopiesNum)) + { + this.txtCopiesNum.Text = report.CopiesNum; + } + else + { + this.txtCopiesNum.Text = "1、交工纸质文件归档2份，其中正本1份，副本1份。"; + } } else { - //var project = BLL.Base_ProjectService.GetProjectByProjectId(projectId); - //var isoLists = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(projectId); - //string isoInfos = string.Empty; - //foreach (var item in isoLists) - //{ - // int hdCount = 0; - // int gdCount = 0; - // var joitInfos = (from x in Funs.DB.HJGL_PW_JointInfo where x.ISO_ID == item.ISO_ID select x); - // if (joitInfos.Count() > 0) - // { - // hdCount = joitInfos.Where(x => x.JOT_JointAttribute == "活动").Count(); - // gdCount = joitInfos.Where(x => x.JOT_JointAttribute == "固定").Count(); - // } - // isoInfos += "管线编号" + item.ISO_IsoNo + "，其中活动焊口" + hdCount + "道，固定焊口" + gdCount + "道；"; - //} - //if (!string.IsNullOrEmpty(isoInfos)) - //{ - // isoInfos = isoInfos.Substring(0, isoInfos.LastIndexOf('；')); - //} - //this.txtProjectOverview.Text = "本文件为" + project.ProjectName + "，" + string.Format("{0:yyyy年MM月dd日}", project.StartDate) + "开工，到" + string.Format("{0:yyyy年MM月dd日}", project.EndDate) + "施工结束，主要施工内容：" + isoInfos; + this.txtCompilationBasis.Text = "1、《石油化工建设工程项目交工技术文件规定》(SH/T3503-2017)\r\n2、《国家重大建设项目文件归档要求与档案管理规范》(DA/T28-2018)\r\n3、《石油化工建设工程项目过程技术文件规定》(SH/T3543-2017)"; this.txtConstructionUnit.Text = "浙江石油化工有限公司"; this.txtConstructionCompany.Text = "浙江鼎盛石化工程有限公司"; + this.txtMainContent.Text = "1、交工技术文件，共2册，分别为:管道安装工程册、材料质量证明文件\r\n2、本册为管道安装工程册，册内内容包括:封面、交工技术目录、交工技术总目录、交工技术说明、交工技术文件移交证书等。"; + this.txtCopiesNum.Text = "1、交工纸质文件归档2份，其中正本1份，副本1份。"; } } } @@ -176,6 +199,9 @@ namespace FineUIPro.Web.JGZL newDocumentDescription.DesigningUnit = this.txtDesigningUnit.Text; newDocumentDescription.TestingUnit = this.txtTestingUnit.Text; newDocumentDescription.ConstructionCompany = this.txtConstructionCompany.Text; + newDocumentDescription.CompilationBasis=this.txtCompilationBasis.Text; + newDocumentDescription.MainContent = this.txtMainContent.Text; + newDocumentDescription.CopiesNum = this.txtCopiesNum.Text; if (!string.IsNullOrEmpty(this.DocumentDescriptionId)) { newDocumentDescription.DocumentDescriptionId = this.DocumentDescriptionId; @@ -224,6 +250,9 @@ namespace FineUIPro.Web.JGZL keyValuePairs.Add("DesigningUnit", this.txtDesigningUnit.Text); keyValuePairs.Add("TestingUnit", this.txtTestingUnit.Text); keyValuePairs.Add("ConstructionCompany", this.txtConstructionCompany.Text); + keyValuePairs.Add("CompilationBasis", this.txtCompilationBasis.Text); + keyValuePairs.Add("MainContent", this.txtMainContent.Text); + keyValuePairs.Add("CopiesNum", this.txtCopiesNum.Text); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\JGZL\\交工技术文件说明.frx"; diff --git a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.designer.cs index c24cc3e..3dae246 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.designer.cs @@ -131,6 +131,24 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.Form SimpleForm1; + /// + /// txtProjectOverview 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProjectOverview; + + /// + /// txtCompilationBasis 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtCompilationBasis; + /// /// txtConstructionUnit 控件。 /// @@ -168,13 +186,22 @@ namespace FineUIPro.Web.JGZL protected global::FineUIPro.TextBox txtConstructionCompany; /// - /// txtProjectOverview 控件。 + /// txtMainContent 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextArea txtProjectOverview; + protected global::FineUIPro.TextArea txtMainContent; + + /// + /// txtCopiesNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCopiesNum; /// /// WindowPrint 控件。 diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index 04b4ba4..e6f74d9 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -83974,6 +83974,12 @@ namespace Model private System.Nullable _ReviewDate; + private string _CompilationBasis; + + private string _MainContent; + + private string _CopiesNum; + private EntityRef _Base_Project; private EntityRef _Sys_User; @@ -84006,6 +84012,12 @@ namespace Model partial void OnReviewerChanged(); partial void OnReviewDateChanging(System.Nullable value); partial void OnReviewDateChanged(); + partial void OnCompilationBasisChanging(string value); + partial void OnCompilationBasisChanged(); + partial void OnMainContentChanging(string value); + partial void OnMainContentChanged(); + partial void OnCopiesNumChanging(string value); + partial void OnCopiesNumChanged(); #endregion public JGZL_DocumentDescription() @@ -84248,6 +84260,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompilationBasis", DbType="NVarChar(1000)")] + public string CompilationBasis + { + get + { + return this._CompilationBasis; + } + set + { + if ((this._CompilationBasis != value)) + { + this.OnCompilationBasisChanging(value); + this.SendPropertyChanging(); + this._CompilationBasis = value; + this.SendPropertyChanged("CompilationBasis"); + this.OnCompilationBasisChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainContent", DbType="NVarChar(500)")] + public string MainContent + { + get + { + return this._MainContent; + } + set + { + if ((this._MainContent != value)) + { + this.OnMainContentChanging(value); + this.SendPropertyChanging(); + this._MainContent = value; + this.SendPropertyChanged("MainContent"); + this.OnMainContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CopiesNum", DbType="NVarChar(500)")] + public string CopiesNum + { + get + { + return this._CopiesNum; + } + set + { + if ((this._CopiesNum != value)) + { + this.OnCopiesNumChanging(value); + this.SendPropertyChanging(); + this._CopiesNum = value; + this.SendPropertyChanged("CopiesNum"); + this.OnCopiesNumChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_DocumentDescription_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { From cb84240b73b3d85b758ba90b76aa3167a8e107f8 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Mon, 9 Feb 2026 09:37:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?20260209=20=E7=89=B9=E7=A7=8D=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=AE=89=E8=A3=85=E6=94=B9=E9=80=A0=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=91=8A=E7=9F=A5=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpecialEquipmentMaintenanceService.cs | 20 +- .../File/Fastreport/JGZL/交工技术文件说明.frx | 42 +- .../Fastreport/JGZL/压力管道安装质量证明.frx | 4 +- .../JGZL/特种设备安装改造维修告知书.frx | 4 +- .../JGZL/AcceptanceCertificate.aspx.cs | 2 + ...rrosionEngineeringInspectionRecord.aspx.cs | 2 + .../JGZL/BlowingCleaning.aspx.cs | 2 + .../JGZL/CommencementReport.aspx.cs | 2 + .../JGZL/ConDrawingVerification.aspx.cs | 2 + .../ConcealedWorksInspectionRecord.aspx.cs | 3 +- HJGL_DS/FineUIPro.Web/JGZL/Contact.aspx.cs | 2 + HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs | 2 + .../JGZL/DocumentDescription.aspx.cs | 2 + .../JGZL/ElectrostaticGrounding.aspx.cs | 2 + .../FineUIPro.Web/JGZL/FileDirectory.aspx.cs | 2 + .../JGZL/HandoverCertificate.aspx.cs | 2 + ...lineInstallationQualityCertificate.aspx.cs | 3 +- ...ustrialPipelineInstallationSummary.aspx.cs | 3 +- .../LeakTestOfPipelineSystemRecord.aspx.cs | 2 + ...rialIdentificationInspectionRecord.aspx.cs | 2 + .../JGZL/MeasuringInstruments.aspx.cs | 2 + HJGL_DS/FineUIPro.Web/JGZL/NDTPerson.aspx.cs | 2 + .../JGZL/PipelineTotalTrust.aspx.cs | 1 + .../JGZL/PipelineWeldJointTrust.aspx.cs | 1 + ...OfPipelineSystemConfirmationRecord.aspx.cs | 1 + ...PressureTestOfPipelineSystemRecord.aspx.cs | 1 + .../JGZL/QualifiedWelder.aspx.cs | 1 + .../JGZL/SpecialEquipmentMaintenance.aspx | 103 ++- .../JGZL/SpecialEquipmentMaintenance.aspx.cs | 680 ++++++++++++------ ...ecialEquipmentMaintenance.aspx.designer.cs | 231 +++++- .../JGZL/SteelPipeCheckRecord.aspx.cs | 1 + .../JGZL/TeamWeldingInspection.aspx.cs | 1 + .../JGZL/TestQuantityStatistics.aspx.cs | 1 + .../JGZL/TestResultsSummary.aspx.cs | 1 + .../JGZL/WeldInspectionCheckRecord.aspx.cs | 1 + 35 files changed, 840 insertions(+), 293 deletions(-) diff --git a/HJGL_DS/BLL/JGZL/SpecialEquipmentMaintenanceService.cs b/HJGL_DS/BLL/JGZL/SpecialEquipmentMaintenanceService.cs index fa905da..7f9e1cf 100644 --- a/HJGL_DS/BLL/JGZL/SpecialEquipmentMaintenanceService.cs +++ b/HJGL_DS/BLL/JGZL/SpecialEquipmentMaintenanceService.cs @@ -18,11 +18,21 @@ namespace BLL return Funs.DB.JGZL_SpecialEquipmentMaintenance.FirstOrDefault(e => e.MaintenanceId == maintenanceId); } - /// - /// 增加特种设备安装改造维修告知书 - /// - /// - public static void AddSpecialEquipmentMaintenance(Model.JGZL_SpecialEquipmentMaintenance maintenance) + /// + /// 根据项目Id获取设备安装改造维修告知书 + /// + /// + /// + public static Model.JGZL_SpecialEquipmentMaintenance GetSpecialEquipmentMaintenanceByProjectId(string projectId) + { + return Funs.DB.JGZL_SpecialEquipmentMaintenance.FirstOrDefault(e => e.MaintenanceId == projectId); + } + + /// + /// 增加特种设备安装改造维修告知书 + /// + /// + public static void AddSpecialEquipmentMaintenance(Model.JGZL_SpecialEquipmentMaintenance maintenance) { SGGLDB db = Funs.DB; Model.JGZL_SpecialEquipmentMaintenance newMaintenance = new Model.JGZL_SpecialEquipmentMaintenance(); diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx index 6eae90a..a730338 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx @@ -1,5 +1,27 @@  - + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + + } +} + @@ -26,7 +48,7 @@ - + @@ -55,20 +77,20 @@ - - + + - - + + - - + + - - + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx index 4eea0e5..b1918b7 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx @@ -1,7 +1,7 @@  - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx index 4cf7e25..977cc72 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx @@ -1,7 +1,7 @@  - + - + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs index 4295614..e7c3d79 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs @@ -164,7 +164,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/AnticorrosionEngineeringInspectionRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/AnticorrosionEngineeringInspectionRecord.aspx.cs index d92d1e8..a380f4d 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/AnticorrosionEngineeringInspectionRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/AnticorrosionEngineeringInspectionRecord.aspx.cs @@ -175,7 +175,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs index f1669f5..ee39e1d 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs @@ -164,7 +164,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx.cs index 2a74025..c9f1fb4 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx.cs @@ -166,7 +166,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.cs index d9cec4b..332c838 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.cs @@ -164,7 +164,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs index e2f51aa..3940e43 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs @@ -164,8 +164,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); - this.BindGrid(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/Contact.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/Contact.aspx.cs index daf3ea6..18fc44a 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/Contact.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/Contact.aspx.cs @@ -164,7 +164,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs index 610baaa..85052b9 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs @@ -118,7 +118,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } #endregion diff --git a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs index 0ae6796..44a5f96 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs @@ -112,7 +112,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + PageData(); } #endregion diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ElectrostaticGrounding.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ElectrostaticGrounding.aspx.cs index ed8a73f..a53b9f3 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ElectrostaticGrounding.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ElectrostaticGrounding.aspx.cs @@ -188,7 +188,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx.cs index 1de6f8c..9502f3a 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx.cs @@ -157,7 +157,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } #endregion diff --git a/HJGL_DS/FineUIPro.Web/JGZL/HandoverCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/HandoverCertificate.aspx.cs index 75f1b94..6a53185 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/HandoverCertificate.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/HandoverCertificate.aspx.cs @@ -164,7 +164,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs index 5cf046b..dfb6455 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs @@ -164,8 +164,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); - this.BindGrid(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs index 7085efb..e85896f 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs @@ -167,8 +167,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); - this.BindGrid(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/LeakTestOfPipelineSystemRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/LeakTestOfPipelineSystemRecord.aspx.cs index 1b6c623..7affa70 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/LeakTestOfPipelineSystemRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/LeakTestOfPipelineSystemRecord.aspx.cs @@ -175,7 +175,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecord.aspx.cs index 00962cf..1e2631e 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecord.aspx.cs @@ -179,7 +179,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx.cs index 179467c..d52c212 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx.cs @@ -164,7 +164,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/NDTPerson.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/NDTPerson.aspx.cs index 1dc5240..2de737c 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/NDTPerson.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/NDTPerson.aspx.cs @@ -164,7 +164,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PipelineTotalTrust.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/PipelineTotalTrust.aspx.cs index bb08a92..f5286af 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/PipelineTotalTrust.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/PipelineTotalTrust.aspx.cs @@ -176,6 +176,7 @@ namespace FineUIPro.Web.JGZL protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { this.InitTreeMenu(); + this.BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PipelineWeldJointTrust.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/PipelineWeldJointTrust.aspx.cs index 01bdf66..8d182e7 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/PipelineWeldJointTrust.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/PipelineWeldJointTrust.aspx.cs @@ -174,6 +174,7 @@ namespace FineUIPro.Web.JGZL protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { this.InitTreeMenu(); + this.BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx.cs index a11a49c..5c5eefb 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx.cs @@ -176,6 +176,7 @@ namespace FineUIPro.Web.JGZL protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { this.InitTreeMenu(); + this.BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs index bacf7a3..c32df50 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs @@ -176,6 +176,7 @@ namespace FineUIPro.Web.JGZL protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { this.InitTreeMenu(); + this.BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/QualifiedWelder.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/QualifiedWelder.aspx.cs index 76191eb..45554c2 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/QualifiedWelder.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/QualifiedWelder.aspx.cs @@ -91,6 +91,7 @@ namespace FineUIPro.Web.JGZL protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { this.InitTreeMenu(); + this.BindGrid(); } #endregion diff --git a/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenance.aspx b/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenance.aspx index 7795c5e..21d13a4 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenance.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenance.aspx @@ -39,14 +39,99 @@ - + + + <%----%> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- - + --%> - + --%> - + <%-- - + --%> - + --%> diff --git a/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenance.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenance.aspx.cs index 4a74dca..f6362d8 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenance.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenance.aspx.cs @@ -8,11 +8,29 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using System.IO; +using FineUIPro.Web.common.BaseInfo; namespace FineUIPro.Web.JGZL { public partial class SpecialEquipmentMaintenance : PageBase { + #region 定义变量 + /// + /// 主键 + /// + private string MaintenanceId + { + get + { + return (string)ViewState["MaintenanceId"]; + } + set + { + ViewState["MaintenanceId"] = value; + } + } + #endregion + #region 加载页面 /// /// 加载页面 @@ -23,7 +41,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,11 +52,154 @@ namespace FineUIPro.Web.JGZL this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; this.InitTreeMenu();//加载树 this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; - this.BindGrid(); + //this.BindGrid(); + PageData(); } } #endregion + private void PageData() + { + string projectId = this.tvControlItem.SelectedNodeID; + if (!string.IsNullOrEmpty(projectId)) + { + var pro = BLL.Base_ProjectService.GetProjectByProjectId(projectId); + if (pro != null) + { + var report = BLL.SpecialEquipmentMaintenanceService.GetSpecialEquipmentMaintenanceByProjectId(projectId); + if (report != null) + { + this.MaintenanceId = report.MaintenanceId; + if (!string.IsNullOrEmpty(report.MaintenanceCode)) + { + this.txtMaintenanceCode.Text = report.MaintenanceCode; + } + else + { + this.txtMaintenanceCode.Text = "0XXX-91330921MA2A2R3F6G-2026"; + } + if (!string.IsNullOrEmpty(report.ConUnit)) + { + this.txtConUnit.Text = report.ConUnit; + } + else + { + this.txtConUnit.Text = "浙江鼎盛石化工程有限公司"; + } + if (!string.IsNullOrEmpty(report.EquipmentName)) + { + this.txtEquipmentName.Text = report.EquipmentName; + } + else + { + this.txtEquipmentName.Text = "压力管道（" + pro.ProjectName + "）"; + } + this.txtEquipmentModel.Text = report.EquipmentModel; + if (!string.IsNullOrEmpty(report.EquipmentCode)) + { + this.txtEquipmentCode.Text = report.EquipmentCode; + } + else + { + this.txtEquipmentCode.Text = "/"; + } + if (!string.IsNullOrEmpty(report.ManufacturingNumber)) + { + this.txtManufacturingNumber.Text = report.ManufacturingNumber; + } + else + { + this.txtManufacturingNumber.Text = "/"; + } + if (!string.IsNullOrEmpty(report.ManufacturingUnit)) + { + this.txtManufacturingUnit.Text = report.ManufacturingUnit; + } + else + { + this.txtManufacturingUnit.Text = "/"; + } + if (!string.IsNullOrEmpty(report.ManufacturingLicenseNumber)) + { + this.txtManufacturingLicenseNumber.Text = report.ManufacturingLicenseNumber; + } + else + { + this.txtManufacturingLicenseNumber.Text = "/"; + } + if (!string.IsNullOrEmpty(report.EquipmentLocation)) + { + this.txtEquipmentLocation.Text = report.EquipmentLocation; + } + else + { + this.txtEquipmentLocation.Text = pro.ProjectName; + } + this.txtConstructionDate.Text = report.ConstructionDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.ConstructionDate) : string.Format("{0:yyyy-MM-dd}", pro.StartDate); + this.drpConstructionCategory.SelectedValue = report.ConstructionCategory; + if (!string.IsNullOrEmpty(report.LicenseNumber)) + { + this.txtLicenseNumber.Text = report.LicenseNumber; + } + else + { + this.txtLicenseNumber.Text = "TS3833339-2028"; + } + this.txtLicenseValidityDate.Text = report.LicenseValidityDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.LicenseValidityDate) : string.Format("{0:yyyy-MM-dd}", "2028-8-20"); + this.txtConContactMan.Text = report.ConContactMan; + this.txtConTelephone.Text = report.ConTelephone; + this.txtConFax.Text = report.ConFax; + if (!string.IsNullOrEmpty(report.ConAddress)) + { + this.txtConAddress.Text = report.ConAddress; + } + else + { + this.txtConAddress.Text = "浙江省舟山市岱山县经济技术开发区徐福大道988号810室（岱西片区）"; + } + this.txtConEmail.Text = report.ConEmail; + if (!string.IsNullOrEmpty(report.UseUnit)) + { + this.txtUseUnit.Text = report.UseUnit; + } + else + { + this.txtUseUnit.Text = "浙江石油化工有限公司"; + } + this.txtUseContactMan.Text = report.UseContactMan; + this.txtUseTelephone.Text = report.UseTelephone; + this.txtUseFax.Text = report.UseFax; + if (!string.IsNullOrEmpty(report.UseAddress)) + { + this.txtUseAddress.Text = report.UseAddress; + } + else + { + this.txtUseAddress.Text = "浙江省舟山市定海区临城街道翁山路555号大宗商品交易中心5201室（自贸试验区内）"; + } + this.txtUseEmail.Text = report.UseEmail; + } + else + { + this.txtMaintenanceCode.Text = "0XXX-91330921MA2A2R3F6G-2026"; + this.txtConUnit.Text = "浙江鼎盛石化工程有限公司"; + this.txtEquipmentCode.Text = "/"; + this.txtManufacturingNumber.Text = "/"; + this.txtManufacturingUnit.Text = "/"; + this.txtManufacturingLicenseNumber.Text = "/"; + this.txtEquipmentName.Text = "压力管道（" + pro.ProjectName + "）"; + this.txtEquipmentLocation.Text = pro.ProjectName; + this.txtConstructionDate.Text = pro.StartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", pro.StartDate) : ""; + this.txtLicenseNumber.Text = "TS3833339-2028"; + this.txtLicenseValidityDate.Text = string.Format("{0:yyyy-MM-dd}", "2028-8-20"); + this.txtConAddress.Text = "浙江省舟山市岱山县经济技术开发区徐福大道988号810室（岱西片区）"; + this.txtUseUnit.Text = "浙江石油化工有限公司"; + this.txtUseAddress.Text = "浙江省舟山市定海区临城街道翁山路555号大宗商品交易中心5201室（自贸试验区内）"; + } + } + } + } + #region 加载树项目 /// /// 加载树 @@ -82,7 +243,8 @@ namespace FineUIPro.Web.JGZL { if (this.tvControlItem.SelectedNodeID != "0") { - this.BindGrid(); + this.PageData(); + //this.BindGrid(); } } #endregion @@ -91,30 +253,30 @@ namespace FineUIPro.Web.JGZL /// /// 数据绑定 /// - private void BindGrid() - { - //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1"); - string strSql = @"SELECT * from JGZL_SpecialEquipmentMaintenance 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_SpecialEquipmentMaintenance 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 +286,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 +298,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 +310,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 +326,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + PageData(); } /// @@ -174,7 +338,7 @@ namespace FineUIPro.Web.JGZL /// protected void TextBox_TextChanged(object sender, EventArgs e) { - this.BindGrid(); + //this.BindGrid(); } #endregion @@ -186,88 +350,88 @@ namespace FineUIPro.Web.JGZL /// protected void btnPrint_Click(object sender, EventArgs e) { - string id = this.Grid1.SelectedRowID; - if (!string.IsNullOrEmpty(id)) + string projectId = this.tvControlItem.SelectedNodeID; + if (!string.IsNullOrEmpty(projectId)) { string initTemplatePath = ""; string rootPath = Server.MapPath("~/"); BLL.Common.FastReportService.ResetData(); - var specialEquipmentMaintenance = BLL.SpecialEquipmentMaintenanceService.GetSpecialEquipmentMaintenance(id); - if (specialEquipmentMaintenance != null) + //var specialEquipmentMaintenance = BLL.SpecialEquipmentMaintenanceService.GetSpecialEquipmentMaintenanceByProjectId(projectId); + //if (specialEquipmentMaintenance != null) + //{ + DataTable dt = new DataTable(); + dt.TableName = "Data"; + dt.Columns.Add("MaintenanceCode"); + dt.Columns.Add("ConUnit"); + dt.Columns.Add("EquipmentName"); + dt.Columns.Add("EquipmentModel"); + dt.Columns.Add("EquipmentCode"); + dt.Columns.Add("ManufacturingNumber"); + dt.Columns.Add("ManufacturingUnit"); + dt.Columns.Add("ManufacturingLicenseNumber"); + dt.Columns.Add("EquipmentLocation"); + dt.Columns.Add("ConstructionDate"); + dt.Columns.Add("ConstructionCategory"); + dt.Columns.Add("LicenseNumber"); + dt.Columns.Add("LicenseValidityDate"); + dt.Columns.Add("ConContactMan"); + dt.Columns.Add("ConTelephone"); + dt.Columns.Add("ConFax"); + dt.Columns.Add("ConAddress"); + dt.Columns.Add("ConEmail"); + dt.Columns.Add("UseUnit"); + dt.Columns.Add("UseContactMan"); + dt.Columns.Add("UseTelephone"); + dt.Columns.Add("UseFax"); + dt.Columns.Add("UseAddress"); + dt.Columns.Add("UseEmail"); + + var newRow = dt.NewRow(); + newRow["MaintenanceCode"] = this.txtMaintenanceCode.Text; + newRow["ConUnit"] = this.txtConUnit.Text; + newRow["EquipmentName"] = this.txtEquipmentName.Text; + newRow["EquipmentModel"] = this.txtEquipmentModel.Text; + newRow["EquipmentCode"] = this.txtEquipmentCode.Text; + newRow["ManufacturingNumber"] = this.txtManufacturingNumber.Text; + newRow["ManufacturingUnit"] = this.txtManufacturingUnit.Text; + newRow["ManufacturingLicenseNumber"] = this.txtManufacturingLicenseNumber.Text; + newRow["EquipmentLocation"] = this.txtEquipmentLocation.Text; + string constructionDate = string.Format("{0:yyyy年MM月dd}", this.txtConstructionDate.Text); + newRow["ConstructionDate"] = constructionDate; + newRow["ConstructionCategory"] = this.drpConstructionCategory.SelectedText; + newRow["LicenseNumber"] = this.txtLicenseNumber.Text; + string licenseValidityDate = string.Format("{0:yyyy年MM月dd}", this.txtLicenseValidityDate.Text); + newRow["LicenseValidityDate"] = licenseValidityDate; + newRow["ConContactMan"] = this.txtConContactMan.Text; + newRow["ConTelephone"] = this.txtConTelephone.Text; + newRow["ConFax"] = this.txtConFax.Text; + newRow["ConAddress"] = this.txtConAddress.Text; + newRow["ConEmail"] = this.txtConEmail.Text; + newRow["UseUnit"] = this.txtUseUnit.Text; + newRow["UseContactMan"] = this.txtUseContactMan.Text; + newRow["UseTelephone"] = this.txtUseTelephone.Text; + newRow["UseFax"] = this.txtUseFax.Text; + newRow["UseAddress"] = this.txtUseAddress.Text; + newRow["UseEmail"] = this.txtUseEmail.Text; + + dt.Rows.Add(newRow); + BLL.Common.FastReportService.AddFastreportTable(dt); + + Dictionary keyValuePairs = new Dictionary(); + //keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); + + initTemplatePath = "File\\Fastreport\\JGZL\\特种设备安装改造维修告知书.frx"; + if (File.Exists(rootPath + initTemplatePath)) { - DataTable dt = new DataTable(); - dt.TableName = "Data"; - dt.Columns.Add("MaintenanceCode"); - dt.Columns.Add("ConUnit"); - dt.Columns.Add("EquipmentName"); - dt.Columns.Add("EquipmentModel"); - dt.Columns.Add("EquipmentCode"); - dt.Columns.Add("ManufacturingNumber"); - dt.Columns.Add("ManufacturingUnit"); - dt.Columns.Add("ManufacturingLicenseNumber"); - dt.Columns.Add("EquipmentLocation"); - dt.Columns.Add("ConstructionDate"); - dt.Columns.Add("ConstructionCategory"); - dt.Columns.Add("LicenseNumber"); - dt.Columns.Add("LicenseValidityDate"); - dt.Columns.Add("ConContactMan"); - dt.Columns.Add("ConTelephone"); - dt.Columns.Add("ConFax"); - dt.Columns.Add("ConAddress"); - dt.Columns.Add("ConEmail"); - dt.Columns.Add("UseUnit"); - dt.Columns.Add("UseContactMan"); - dt.Columns.Add("UseTelephone"); - dt.Columns.Add("UseFax"); - dt.Columns.Add("UseAddress"); - dt.Columns.Add("UseEmail"); - - var newRow = dt.NewRow(); - newRow["MaintenanceCode"] = specialEquipmentMaintenance.MaintenanceCode; - newRow["ConUnit"] = specialEquipmentMaintenance.ConUnit; - newRow["EquipmentName"] = specialEquipmentMaintenance.EquipmentName; - newRow["EquipmentModel"] = specialEquipmentMaintenance.EquipmentModel; - newRow["EquipmentCode"] = specialEquipmentMaintenance.EquipmentCode; - newRow["ManufacturingNumber"] = specialEquipmentMaintenance.ManufacturingNumber; - newRow["ManufacturingUnit"] = specialEquipmentMaintenance.ManufacturingUnit; - newRow["ManufacturingLicenseNumber"] = specialEquipmentMaintenance.ManufacturingLicenseNumber; - newRow["EquipmentLocation"] = specialEquipmentMaintenance.EquipmentLocation; - string constructionDate = string.Format("{0:yyyy年MM月dd}", specialEquipmentMaintenance.ConstructionDate); - newRow["ConstructionDate"] = constructionDate; - newRow["ConstructionCategory"] = specialEquipmentMaintenance.ConstructionCategory; - newRow["LicenseNumber"] = specialEquipmentMaintenance.LicenseNumber; - string licenseValidityDate = string.Format("{0:yyyy年MM月dd}", specialEquipmentMaintenance.LicenseValidityDate); - newRow["LicenseValidityDate"] = licenseValidityDate; - newRow["ConContactMan"] = specialEquipmentMaintenance.ConContactMan; - newRow["ConTelephone"] = specialEquipmentMaintenance.ConTelephone; - newRow["ConFax"] = specialEquipmentMaintenance.ConFax; - newRow["ConAddress"] = specialEquipmentMaintenance.ConAddress; - newRow["ConEmail"] = specialEquipmentMaintenance.ConEmail; - newRow["UseUnit"] = specialEquipmentMaintenance.UseUnit; - newRow["UseContactMan"] = specialEquipmentMaintenance.UseContactMan; - newRow["UseTelephone"] = specialEquipmentMaintenance.UseTelephone; - newRow["UseFax"] = specialEquipmentMaintenance.UseFax; - newRow["UseAddress"] = specialEquipmentMaintenance.UseAddress; - newRow["UseEmail"] = specialEquipmentMaintenance.UseEmail; - - dt.Rows.Add(newRow); - BLL.Common.FastReportService.AddFastreportTable(dt); - - Dictionary keyValuePairs = new Dictionary(); - //keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); - 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))); - } + PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); } + //} } else { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); return; } } @@ -279,139 +443,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("SpecialEquipmentMaintenanceEdit.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("SpecialEquipmentMaintenanceEdit.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_SpecialEquipmentMaintenanceMenuId, BLL.Const.BtnModify)) - { - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) - { - if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) - { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SpecialEquipmentMaintenanceEdit.aspx?maintenanceId={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_SpecialEquipmentMaintenanceMenuId, BLL.Const.BtnModify)) + // { + // if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + // { + // if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) + // { + // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SpecialEquipmentMaintenanceEdit.aspx?maintenanceId={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_SpecialEquipmentMaintenanceMenuId, BLL.Const.BtnModify)) - { - if (Grid1.SelectedRowIndexArray.Length == 0) - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SpecialEquipmentMaintenanceEdit.aspx?maintenanceId={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_SpecialEquipmentMaintenanceMenuId, BLL.Const.BtnModify)) + // { + // if (Grid1.SelectedRowIndexArray.Length == 0) + // { + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + // } + // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SpecialEquipmentMaintenanceEdit.aspx?maintenanceId={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_SpecialEquipmentMaintenanceMenuId, 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_SpecialEquipmentMaintenanceMenuId, 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.SpecialEquipmentMaintenanceService.DeleteSpecialEquipmentMaintenanceById(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.SpecialEquipmentMaintenanceService.DeleteSpecialEquipmentMaintenanceById(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 @@ -421,10 +585,80 @@ 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_SpecialEquipmentMaintenanceMenuId, Const.BtnSave)) + { + string projectId = this.tvControlItem.SelectedNodeID; + if (!string.IsNullOrEmpty(projectId)) + { + Model.JGZL_SpecialEquipmentMaintenance newReport = new Model.JGZL_SpecialEquipmentMaintenance(); + newReport.MaintenanceCode = this.txtMaintenanceCode.Text.Trim(); + newReport.ConUnit = this.txtConUnit.Text.Trim(); + newReport.EquipmentName = this.txtEquipmentName.Text.Trim(); + newReport.EquipmentModel = this.txtEquipmentModel.Text.Trim(); + newReport.EquipmentCode = this.txtEquipmentCode.Text.Trim(); + newReport.ManufacturingNumber = this.txtManufacturingNumber.Text.Trim(); + newReport.ManufacturingUnit = this.txtManufacturingUnit.Text.Trim(); + newReport.ManufacturingLicenseNumber = this.txtManufacturingLicenseNumber.Text.Trim(); + newReport.EquipmentLocation = this.txtEquipmentLocation.Text.Trim(); + newReport.ConstructionDate = Funs.GetNewDateTime(this.txtConstructionDate.Text.Trim()); + newReport.ConstructionCategory = this.drpConstructionCategory.SelectedValue; + newReport.LicenseNumber = this.txtLicenseNumber.Text.Trim(); + newReport.LicenseValidityDate = Funs.GetNewDateTime(this.txtLicenseValidityDate.Text); + newReport.ConContactMan = this.txtConContactMan.Text.Trim(); + newReport.ConTelephone = this.txtConTelephone.Text.Trim(); + newReport.ConFax = this.txtConFax.Text.Trim(); + newReport.ConAddress = this.txtConAddress.Text.Trim(); + newReport.ConEmail = this.txtConEmail.Text.Trim(); + newReport.UseUnit = this.txtUseUnit.Text.Trim(); + newReport.UseContactMan = this.txtUseContactMan.Text.Trim(); + newReport.UseTelephone = this.txtUseTelephone.Text.Trim(); + newReport.UseFax = this.txtUseFax.Text.Trim(); + newReport.UseAddress = this.txtUseAddress.Text.Trim(); + newReport.UseEmail = this.txtUseEmail.Text.Trim(); + + if (!string.IsNullOrEmpty(this.MaintenanceId)) + { + newReport.MaintenanceId = this.MaintenanceId; + BLL.SpecialEquipmentMaintenanceService.UpdateSpecialEquipmentMaintenance(newReport); + } + else + { + newReport.ProjectId = projectId; + newReport.CompileMan = this.CurrUser.UserId; + newReport.CompileDate = DateTime.Now; + newReport.MaintenanceId = SQLHelper.GetNewID(typeof(Model.JGZL_SpecialEquipmentMaintenance)); + this.MaintenanceId = newReport.MaintenanceId; + BLL.SpecialEquipmentMaintenanceService.AddSpecialEquipmentMaintenance(newReport); + } + ShowNotify("保存成功！", MessageBoxIcon.Success); + //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + Alert.ShowInTop("请选择项目!", MessageBoxIcon.Warning); + return; + } + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } } #endregion } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenance.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenance.aspx.designer.cs index bde404a..c1eb7b8 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenance.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenance.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,229 @@ namespace FineUIPro.Web.JGZL protected global::FineUIPro.Button btnPrint; /// - /// Grid1 控件。 + /// SimpleForm1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Grid Grid1; + protected global::FineUIPro.Form SimpleForm1; /// - /// ToolbarSeparator1 控件。 + /// txtConUnit 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + protected global::FineUIPro.TextBox txtConUnit; /// - /// ToolbarText1 控件。 + /// txtMaintenanceCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.ToolbarText ToolbarText1; + protected global::FineUIPro.TextBox txtMaintenanceCode; /// - /// ddlPageSize 控件。 + /// txtEquipmentName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList ddlPageSize; + protected global::FineUIPro.TextBox txtEquipmentName; /// - /// Window1 控件。 + /// txtEquipmentModel 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Window Window1; + protected global::FineUIPro.TextBox txtEquipmentModel; + + /// + /// txtEquipmentCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEquipmentCode; + + /// + /// txtManufacturingNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtManufacturingNumber; + + /// + /// txtManufacturingUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtManufacturingUnit; + + /// + /// txtManufacturingLicenseNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtManufacturingLicenseNumber; + + /// + /// txtEquipmentLocation 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEquipmentLocation; + + /// + /// txtConstructionDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtConstructionDate; + + /// + /// drpConstructionCategory 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpConstructionCategory; + + /// + /// txtLicenseNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtLicenseNumber; + + /// + /// txtLicenseValidityDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtLicenseValidityDate; + + /// + /// txtConContactMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtConContactMan; + + /// + /// txtConTelephone 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtConTelephone; + + /// + /// txtConFax 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtConFax; + + /// + /// txtConAddress 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtConAddress; + + /// + /// txtConEmail 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtConEmail; + + /// + /// txtUseUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtUseUnit; + + /// + /// txtUseContactMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtUseContactMan; + + /// + /// txtUseTelephone 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtUseTelephone; + + /// + /// txtUseFax 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtUseFax; + + /// + /// txtUseAddress 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtUseAddress; + + /// + /// txtUseEmail 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtUseEmail; /// /// WindowPrint 控件。 @@ -175,32 +355,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/SteelPipeCheckRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs index ea4c0d4..9b9982d 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs @@ -175,6 +175,7 @@ namespace FineUIPro.Web.JGZL protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { this.InitTreeMenu(); + this.BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs index 4148c1c..8bb35da 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs @@ -215,6 +215,7 @@ namespace FineUIPro.Web.JGZL protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { this.InitTreeMenu(); + this.BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/TestQuantityStatistics.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/TestQuantityStatistics.aspx.cs index beae201..95a8e38 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/TestQuantityStatistics.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/TestQuantityStatistics.aspx.cs @@ -225,6 +225,7 @@ namespace FineUIPro.Web.JGZL protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { this.InitTreeMenu(); + this.BindGrid(); } #endregion diff --git a/HJGL_DS/FineUIPro.Web/JGZL/TestResultsSummary.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/TestResultsSummary.aspx.cs index a789fdd..8835744 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/TestResultsSummary.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/TestResultsSummary.aspx.cs @@ -171,6 +171,7 @@ namespace FineUIPro.Web.JGZL protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { this.InitTreeMenu(); + this.BindGrid(); } /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs index 9f883ed..ca8b7f6 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs @@ -194,6 +194,7 @@ namespace FineUIPro.Web.JGZL protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { this.InitTreeMenu(); + this.BindGrid(); } ///