diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx index a5a4c52e..e4fd4eaa 100644 --- a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx +++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx @@ -95,7 +95,7 @@ + Text="查看" Icon="Find" OnClick="btnView_Click" Hidden="true"> diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs index 9056aff7..56a9fae8 100644 --- a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs @@ -130,13 +130,13 @@ namespace FineUIPro.Web.DataShow /// private void EditData() { - if (Grid1.SelectedRowIndexArray.Length == 0) - { - Alert.ShowInTop("请至少选择一条记录!", MessageBoxIcon.Warning); - return; - } + //if (Grid1.SelectedRowIndexArray.Length == 0) + //{ + // Alert.ShowInTop("请至少选择一条记录!", MessageBoxIcon.Warning); + // return; + //} - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HJGL/PersonManage/PersonManageView.aspx?welderId={0}", Grid1.SelectedRowID, "查看 - "))); + //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HJGL/PersonManage/PersonManageView.aspx?welderId={0}", Grid1.SelectedRowID, "查看 - "))); } #endregion diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs index 815fcc60..aa91e5e9 100644 --- a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs @@ -163,7 +163,7 @@ namespace FineUIPro.Web.DataShow return; } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/SitePerson/PersonListEdit.aspx?PersonId={0}", Grid1.SelectedRowID, "查看 - "))); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/SitePerson/PersonListEdit.aspx?PersonId={0}&type=show", Grid1.SelectedRowID, "查看 - "))); } #endregion diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs index ed9dea5e..ba070c9a 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs @@ -81,7 +81,10 @@ namespace FineUIPro.Web.HSSE.SitePerson { btnClose.OnClientClick = ActiveWindow.GetHideReference(); ////权限按钮方法 - this.GetButtonPower(); + if (string.IsNullOrEmpty(Request.Params["type"])) + { + this.GetButtonPower(); + } this.ProjectId = Request.Params["ProjectId"]; this.UnitId = Request.Params["UnitId"]; this.PersonId = Request.Params["PersonId"];