diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx index 7b784837..7e4e615a 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx @@ -14,7 +14,7 @@
- + @@ -45,6 +45,9 @@ + + diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs index c48a61bb..fc0e7289 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs @@ -330,6 +330,7 @@ namespace FineUIPro.Web.HJGL.DataIn dt.Columns.Add("description"); dt.Columns.Add("spec"); dt.Columns.Add("qty"); + dt.Columns.Add("code"); dt.Columns.Add("page_no"); dt.Columns.Add("remark"); @@ -376,7 +377,8 @@ namespace FineUIPro.Web.HJGL.DataIn row["id"] = item.Value("id"); row["pipe_no"] = item.Value("pipe_no"); row["drawing_number"] = item.Value("drawing_number"); - + + row["code"] = item.Value("code"); row["seq_no"] = item.Value("seq_no"); row["category"] = item.Value("category"); row["description"] = item.Value("description"); @@ -453,7 +455,9 @@ namespace FineUIPro.Web.HJGL.DataIn DrawingRecognitionContentEdit.dicDt.Add(CurrUser.PersonId, dt); } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DrawingRecognitionContentEdit.aspx?Index={0}", Grid1.SelectedRowIndex, "维护 - "))); + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdIds.ClientID) + Window1.GetShowReference(String.Format("DrawingRecognitionContentEdit.aspx?Index={0}", Grid1.SelectedRowIndex, "编辑 - "))); + + //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DrawingRecognitionContentEdit.aspx?Index={0}", Grid1.SelectedRowIndex, "维护 - "))); } else { diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.designer.cs index f73611ab..77edb7e7 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.designer.cs @@ -23,6 +23,15 @@ namespace FineUIPro.Web.HJGL.DataIn /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; + /// + /// hdIds 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdIds; + /// /// resultdata 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx index 8ae52538..2cf9f8f6 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx @@ -51,7 +51,11 @@ - + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.cs index 47b4cfbe..3d34288b 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.cs @@ -74,9 +74,16 @@ dataInTemp["page_no"] = this.txtPageNo.Text; dataInTemp["description"] = this.txtDescription; Alert.ShowInTop("信息修改完成！", MessageBoxIcon.Success); - - PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference("") + ActiveWindow.GetHidePostBackReference()); + if (ckAll.Checked) + { + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(Index.ToString()) + ActiveWindow.GetHidePostBackReference()); + } + else + { + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference("") + ActiveWindow.GetHidePostBackReference()); + + } dicDt.Remove(CurrUser.PersonId); } #endregion diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.designer.cs index 3c9f3981..94a7470b 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContentEdit.aspx.designer.cs @@ -130,5 +130,14 @@ namespace FineUIPro.Web.HJGL.DataIn /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtDescription; + + /// + /// ckAll 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckAll; } }