diff --git a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx index 87887775..2abd8e8b 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + @@ -63,7 +63,7 @@ namespace FastReport - + @@ -116,7 +116,8 @@ namespace FastReport - + + @@ -137,6 +138,6 @@ namespace FastReport - + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 6aebfda8..7757fefe 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -16839,7 +16839,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx index 30291d97..e33da1c4 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx @@ -47,18 +47,17 @@ - - + - - - - + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs index 4607b2cc..635e3d9f 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs @@ -18,6 +18,7 @@ namespace FineUIPro.Web.HJGL.PreDesign { this.GetButtonPower(); this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + Funs.FineUIPleaseSelect(ddlState); // 绑定表格 this.BindGrid(); } @@ -49,7 +50,7 @@ namespace FineUIPro.Web.HJGL.PreDesign table.TrainNumber = txtTrainNumber.Text.Trim(); } - if (!string.IsNullOrEmpty(ddlState.SelectedValue)) + if (!string.IsNullOrEmpty(ddlState.SelectedValue)&& ddlState.SelectedValue !=Const._Null) { table.State = Convert.ToInt32(ddlState.SelectedValue); } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.designer.cs index 1e456a77..97dbebd6 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.designer.cs @@ -95,6 +95,15 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected global::FineUIPro.DropDownList ddlState; + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + /// /// btnFilter 控件。 /// @@ -104,15 +113,6 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected global::FineUIPro.Button btnFilter; - /// - /// btnClearFilter 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnClearFilter; - /// /// Toolbar2 控件。 ///