From c9f78bfbaa31df2d7825ce42dd853c5908196f14 Mon Sep 17 00:00:00 2001
From: yhw0507 <yhw0508@163.com>
Date: Sun, 9 Oct 2022 12:09:01 +0800
Subject: [PATCH] =?UTF-8?q?20221009=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=90=8E=E9=A1=B5=E7=A0=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=8D=E5=88=B7=E6=96=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/Person/DepartPerson.aspx   |  2 +-
 .../FineUIPro.Web/Person/DepartPerson.aspx.cs | 26 +++++++++++++++++++
 SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs  |  2 +-
 SGGL/FineUIPro.Web/Person/ProjectPerson.aspx  |  2 +-
 .../Person/ProjectPerson.aspx.cs              |  5 ++++
 .../Person/ProjectPersonEdit.aspx.cs          |  2 +-
 6 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Person/DepartPerson.aspx b/SGGL/FineUIPro.Web/Person/DepartPerson.aspx
index 426a1ffa..f996ce72 100644
--- a/SGGL/FineUIPro.Web/Person/DepartPerson.aspx
+++ b/SGGL/FineUIPro.Web/Person/DepartPerson.aspx
@@ -175,7 +175,7 @@
         </f:Panel>
         <f:Window ID="Window1" Title="员工信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" Maximized="true"
-            Height="620px">
+            Height="620px" OnClose="Window1_Close">
         </f:Window>
         <f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="false"
diff --git a/SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs b/SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs
index c47fdb35..bc56e01b 100644
--- a/SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs
@@ -7,6 +7,21 @@ namespace FineUIPro.Web.Person
 {
     public partial class DepartPerson : PageBase
     {
+        /// <summary>
+        /// 页面
+        /// </summary>
+        //public int? PageSize
+        //{
+        //    get
+        //    {
+        //        return (int?)ViewState["PageSize"];
+        //    }
+        //    set
+        //    {
+        //        ViewState["PageSize"] = value;
+        //    }
+        //}
+
         /// <summary>
         /// 加载页面
         /// </summary>
@@ -93,6 +108,10 @@ namespace FineUIPro.Web.Person
         protected void btSearch_Click(object sender, EventArgs e)
         {
             this.BindGrid();
+            //if (this.PageSize.HasValue)
+            //{
+            //    this.ddlPageSize.SelectedValue = this.PageSize.ToString();
+            //}
         }
         #endregion 
 
@@ -132,6 +151,7 @@ namespace FineUIPro.Web.Person
         /// <param name="e"></param>
         protected void btnMenuDelete_Click(object sender, EventArgs e)
         {
+           // this.PageSize = this.Grid1.PageIndex;
             this.DeleteData();
         }
 
@@ -214,6 +234,7 @@ namespace FineUIPro.Web.Person
         /// </summary>
         private void EditData()
         {
+            //this.PageSize = this.Grid1.PageIndex;
             if (Grid1.SelectedRowIndexArray.Length == 0)
             {
                 Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning);
@@ -276,5 +297,10 @@ namespace FineUIPro.Web.Person
             Response.End();
         }
         #endregion
+
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs
index 4e0ec9dc..e4ccea2a 100644
--- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs
@@ -566,7 +566,7 @@ namespace FineUIPro.Web.Person
                     LogService.AddSys_Log(this.CurrUser, newPerson.PersonName, newPerson.PersonId, BLL.Const.PersonLibMenuId, BLL.Const.BtnAdd);
                 }
                 Alert.ShowInParent("保存成功！", MessageBoxIcon.Success);
-                PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+                PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
             }
             else
             {
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx b/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx
index 2df3936c..7aa6aab7 100644
--- a/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx
+++ b/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx
@@ -138,7 +138,7 @@
         </f:Panel>
       <f:Window ID="Window1" Title="项目人员" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"  Maximized="true"
-            Height="620px">
+            Height="620px" OnClose="Window1_Close">
         </f:Window>
         <f:Window ID="Window2" Title="导入项目人员" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="false"
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs b/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs
index b9d84e76..ae5c07de 100644
--- a/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs
@@ -304,5 +304,10 @@ namespace FineUIPro.Web.Person
             Funs.FineUIPleaseSelect(drpUnit, "按单位查询");
             this.BindGrid();
         }
+
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            this.BindGrid();
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
index 120fe015..5c172403 100644
--- a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
@@ -659,7 +659,7 @@ namespace FineUIPro.Web.Person
                     }
 
                     Alert.ShowInParent("保存成功！", MessageBoxIcon.Success);
-                    PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+                    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
                 }
                 else
                 {