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] =?UTF-8?q?20260207=20=E4=BA=A4=E5=B7=A5=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=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; } ///