diff --git a/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道无损检测结果汇总表.frx b/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道无损检测结果汇总表.frx index 740d904b..f67dfe60 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道无损检测结果汇总表.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道无损检测结果汇总表.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -67,7 +67,7 @@ namespace FastReport } } - + @@ -117,7 +117,7 @@ namespace FastReport - + @@ -137,17 +137,17 @@ namespace FastReport - - - + + + - - + + - + @@ -158,23 +158,23 @@ namespace FastReport - - - + + + - - + + - - + + - + @@ -259,17 +259,17 @@ namespace FastReport - - - - + + + + - + - - - - + + + + @@ -291,17 +291,17 @@ namespace FastReport - - - - + + + + - + - - - - + + + + @@ -320,17 +320,17 @@ namespace FastReport - - - - + + + + - + - - - - + + + + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx b/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx index d30f3ed1..b3415779 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx +++ b/SGGL/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 } - + @@ -67,11 +67,11 @@ namespace FastReport - + - - + + @@ -80,8 +80,8 @@ namespace FastReport - - + + @@ -128,8 +128,8 @@ namespace FastReport - - + + @@ -138,8 +138,8 @@ namespace FastReport - - + + @@ -159,8 +159,8 @@ namespace FastReport - - + + @@ -169,8 +169,8 @@ namespace FastReport - - + + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx b/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx index 5abb8cb5..648a0914 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx @@ -1,10 +1,10 @@  - + - - + + @@ -39,10 +39,10 @@ - + - + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验记录.frx b/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验记录.frx index dd619c15..99fa687c 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验记录.frx +++ b/SGGL/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 } - + @@ -62,6 +62,8 @@ namespace FastReport + + @@ -183,9 +185,9 @@ namespace FastReport - + - + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道试压包尾项清单.frx b/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道试压包尾项清单.frx index 56cc5f45..83eee40a 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道试压包尾项清单.frx +++ b/SGGL/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 } - + @@ -62,6 +62,8 @@ namespace FastReport + + @@ -133,8 +135,8 @@ namespace FastReport - - + + diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx index 4f906477..33fe1cfc 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx @@ -27,6 +27,14 @@ + + + + + + + + testPackageLists = (from x in Funs.DB.PTP_TestPackage - where x.ProjectId == this.CurrUser.LoginProjectId - select x).ToList(); + List testPackageLists = new List(); + if (!string.IsNullOrEmpty(this.txtCode.Text.Trim())) + { + testPackageLists = (from x in Funs.DB.PTP_TestPackage + where x.ProjectId == this.CurrUser.LoginProjectId + && x.TestPackageNo.Contains(this.txtCode.Text.Trim()) + select x).ToList(); + } + else + { + testPackageLists = (from x in Funs.DB.PTP_TestPackage + where x.ProjectId == this.CurrUser.LoginProjectId + select x).ToList(); + } List unitWork1 = null; List unitWork2 = null; @@ -585,5 +596,17 @@ namespace FineUIPro.Web.HJGL.TestPackage ShowNotify("您没有这个权限，请与管理员联系！"); } } + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void txtCode_TextChanged(object sender, EventArgs e) + { + InitTreeMenu(); + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.designer.cs index 26995e98..32659e13 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.designer.cs @@ -57,6 +57,15 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// protected global::FineUIPro.Panel panelLeftRegion; + /// + /// txtCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCode; + /// /// tvControlItem 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheckEdit.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheckEdit.aspx index 11be2440..9925e252 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheckEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheckEdit.aspx @@ -96,7 +96,7 @@ - - + + + + + + + + testPackageLists = (from x in Funs.DB.PTP_TestPackage - where x.ProjectId == this.CurrUser.LoginProjectId - select x).ToList(); + List testPackageLists = new List(); + if (!string.IsNullOrEmpty(this.txtCode.Text.Trim())) + { + testPackageLists = (from x in Funs.DB.PTP_TestPackage + where x.ProjectId == this.CurrUser.LoginProjectId + && x.TestPackageNo.Contains(this.txtCode.Text.Trim()) + select x).ToList(); + } + else + { + testPackageLists = (from x in Funs.DB.PTP_TestPackage + where x.ProjectId == this.CurrUser.LoginProjectId + select x).ToList(); + } List unitWork1 = null; List unitWork2 = null; @@ -649,5 +660,17 @@ namespace FineUIPro.Web.HJGL.TestPackage } } #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void txtCode_TextChanged(object sender, EventArgs e) + { + InitTreeMenu(); + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.designer.cs index ef5ac8e7..5799cbc8 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.designer.cs @@ -57,6 +57,15 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// protected global::FineUIPro.Panel panelLeftRegion; + /// + /// txtCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCode; + /// /// tvControlItem 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx index 9927d305..0037daf8 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx @@ -46,6 +46,14 @@ + + + + + + + + - + diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs index 4e160bba..900817fe 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs @@ -136,9 +136,20 @@ where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null select x).ToList(); - List testPackageLists = (from x in Funs.DB.PTP_TestPackage - where x.ProjectId == this.CurrUser.LoginProjectId - select x).ToList(); + List testPackageLists = new List(); + if (!string.IsNullOrEmpty(this.txtCode.Text.Trim())) + { + testPackageLists = (from x in Funs.DB.PTP_TestPackage + where x.ProjectId == this.CurrUser.LoginProjectId + && x.TestPackageNo.Contains(this.txtCode.Text.Trim()) + select x).ToList(); + } + else + { + testPackageLists = (from x in Funs.DB.PTP_TestPackage + where x.ProjectId == this.CurrUser.LoginProjectId + select x).ToList(); + } List unitWork1 = null; List unitWork2 = null; @@ -796,4 +807,16 @@ return; } } + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void txtCode_TextChanged(object sender, EventArgs e) + { + InitTreeMenu(); + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.designer.cs index 2134dac8..47dc3a8e 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.designer.cs @@ -57,6 +57,15 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// protected global::FineUIPro.Panel panelLeftRegion; + /// + /// txtCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCode; + /// /// tvControlItem 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx index f57b4fe2..c05f9df3 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx @@ -34,6 +34,7 @@ +