From 1b7463957c47954d12941a955f3bc350f2034189 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Mon, 6 Nov 2023 11:00:06 +0800
Subject: [PATCH] 2023-11-06

---
 .../PHTGL/ContractCompile/ContractTrackComparison.aspx     | 6 +++---
 .../PHTGL/ContractCompile/ContractTrackComparison.aspx.cs  | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx
index 4cb71d60..8d72ddc3 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx
@@ -40,9 +40,9 @@
                     <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="合同执行跟踪表" EnableCollapse="true"
                             runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
                             ClicksToEdit="1" DataIDField="Id" AllowSorting="true" SortField="Id"
-                            SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"
-                            AllowPaging="True" IsDatabasePaging="true" PageSize="500" OnPageIndexChange="Grid1_PageIndexChange" 
-                            EnableRowDoubleClickEvent="true" EnableRowClickEvent="True">
+                            SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"   OnRowDataBound="Grid1_RowDataBound"  IsFluid="True"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="500" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" >
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                                     <Items>
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs
index f4997206..4539de66 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs
@@ -101,8 +101,11 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
         {
             try
-            {
-                var model = (Model.PHTGL_ContractTrack)e.DataItem;
+            { 
+                
+                string Id =e.DataItem.GetType().GetProperty("Id").GetValue(e.DataItem).ToString();
+                var model = PhtglContractTrackService.GetPHTGL_ContractTrackById(Id);
+             
                 // 工程量偏差
                 decimal? QuantityOffset = Funs.GetNewDecimalOrZero(model.EstimatedQuantity) -
                                          Funs.GetNewDecimalOrZero(model.SettledQuantity);