From 302bfd143425b5aa905edbcd795eca093de21f86 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 13 Dec 2023 10:33:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj             |  2 +-
 SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx    |  7 ++++---
 SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs | 13 ++++++++++---
 .../JDGL/Check/CompleteInput.aspx.designer.cs       |  9 ---------
 SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx          |  3 ++-
 SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs       |  9 ++++++++-
 6 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index d1136fa3..de4ba068 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -14379,7 +14379,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8733/</IISUrl>
+          <IISUrl>http://localhost:8736/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx
index 57d1f8d6..184daffa 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx
+++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx
@@ -24,15 +24,16 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目情况" BoxFlex="1" AllowColumnLocking="true"
                     runat="server" EnableCollapse="true" DataKeyNames="Id,Name,ShowId" EnableTree="true" EnableColumnLines="true" ClicksToEdit="1" AllowCellEditing="true"
-                    TreeColumn="Name" DataIDField="Id" DataParentIDField="SupId" ExpandAllTreeNodes="true">
+                    TreeColumn="Name" DataIDField="Id" DataParentIDField="SupId" ExpandAllTreeNodes="true" SortField="Code" SortDirection="ASC"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
                             <Items>
                                 <f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnShow" Icon="ChartPie" runat="server" ToolTip="统计" Text="统计"
+                                <%--<f:Button ID="btnShow" Icon="ChartPie" runat="server" ToolTip="统计" Text="统计"
                                     OnClick="btnShow_Click">
-                                </f:Button>
+                                </f:Button>--%>
                                 <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存"
                                     OnClick="btnSave_Click">
                                 </f:Button>
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs
index 0680367e..fdc7db29 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs
@@ -132,14 +132,21 @@ namespace FineUIPro.Web.JDGL.Check
             {
                 errorInfos = string.Empty;
                 string Id = Request.Params["Id"];
-             
+                BindGrid();
             }
         }
 
-        protected void btnShow_Click(object sender, EventArgs e)
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        private void BindGrid()
         {
             DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, null, null, "0");
-            Grid1.DataSource = table;
+            Grid1.RecordCount = table.Rows.Count;
+            var table2 = this.GetPagedDataTable(Grid1, table);
+            Grid1.DataSource = table2;
             Grid1.DataBind();
             for (int i = 0; i < this.Grid1.Rows.Count; i++)
             {
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs
index 43a25ccb..c6abcb68 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs
@@ -66,15 +66,6 @@ namespace FineUIPro.Web.JDGL.Check {
         /// </remarks>
         protected global::FineUIPro.TextBox hdId;
         
-        /// <summary>
-        /// btnShow 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnShow;
-        
         /// <summary>
         /// btnSave 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx
index 541af605..aba5d188 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx
+++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx
@@ -28,7 +28,8 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目情况" BoxFlex="1" AllowColumnLocking="true" ForceFit="true"
                     runat="server" EnableCollapse="true" DataKeyNames="Id,Name,ShowId" EnableTree="true" EnableColumnLines="true" ClicksToEdit="1" AllowCellEditing="true"
-                    TreeColumn="Name" DataIDField="Id" DataParentIDField="SupId" ExpandAllTreeNodes="true">
+                    TreeColumn="Name" DataIDField="Id" DataParentIDField="SupId" ExpandAllTreeNodes="true" SortField="Code" SortDirection="ASC"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
                             <Items>
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs
index bf4ca249..f7dfca45 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs
@@ -29,7 +29,9 @@ namespace FineUIPro.Web.JDGL.Check
         private void BindGrid()
         {
             var table = BLL.WorkPackageService.GetAllTreeDataTable2(this.CurrUser.LoginProjectId, string.Empty,this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim(),this.rblIsOK.SelectedValue);
-            Grid1.DataSource = table;
+            Grid1.RecordCount = table.Count;
+            var table2 = this.GetPagedDataTable(Grid1, table);
+            Grid1.DataSource = table2;
             Grid1.DataBind();
             for (int i = 0; i < this.Grid1.Rows.Count; i++)
             {
@@ -66,6 +68,11 @@ namespace FineUIPro.Web.JDGL.Check
             }
         }
 
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
         #region 保存
         /// <summary>
         /// 保存按钮