From 256c67cf5203827e88f8d0239e91e7f38924862d Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 16 Aug 2024 15:35:27 +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

---
 .../File/Excel/DataIn/WBS定制导入模板.xls     | Bin 19456 -> 19456 bytes
 .../HSSE/SitePerson/WorkPostStatistic.aspx    |  17 ++++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/WBS定制导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/WBS定制导入模板.xls
index 991ba49a53ac1779370ea242bd9703219a134433..a662c9996ceb3ef1ead4cd481f10d4d0bd20f7c7 100644
GIT binary patch
delta 22
dcmZpe!Pqc^aYGIZ`vkkVN?(~<n~Pa`-2q-92tWV;

delta 22
ecmZpe!Pqc^aYGIZdxF~MHpksJHW#z>x&r`Z4GAj%

diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx
index 7427dcf2..09efbe9e 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx
@@ -15,13 +15,13 @@
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="现场岗位人工时统计" EnableCollapse="true"
                 runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true" ForceFit="true" 
                  SortField="UnitName,WorkPostName" SortDirection="ASC"  EnableColumnLines="true" EnableTextSelection="True"
-                AllowPaging="true" IsDatabasePaging="true" PageSize="1000"    OnPageIndexChange="Grid1_PageIndexChange">
+                AllowPaging="false" IsDatabasePaging="false" PageSize="1000"    OnPageIndexChange="Grid1_PageIndexChange">
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                         <Items>
-                            <f:DropDownList runat="server" ID="drpUnit" Label="单位" 
+                            <f:DropDownList runat="server" ID="drpUnit" Label="单位"  EnableEdit="true"
                                     Width="300px" LabelAlign="Right" LabelWidth="50px"></f:DropDownList>
-                              <f:DropDownList runat="server" ID="drpWorkPost" Label="岗位"
+                              <f:DropDownList runat="server" ID="drpWorkPost" Label="岗位" EnableEdit="true"
                                     Width="200px" LabelAlign="Right" LabelWidth="50px"></f:DropDownList>
                             <f:DatePicker ID="txtStartDate" runat="server" Label="开始日期" LabelWidth="80px" Width="210px" EnableEdit="false">
                             </f:DatePicker>
@@ -55,17 +55,16 @@
                         SortField="PersonCount" FieldType="Int" HeaderText="人数" HeaderTextAlign="Center"
                         TextAlign="Right">
                     </f:RenderField>
-                    <f:TemplateField Width="120px" HeaderText="人工时" HeaderTextAlign="Center" TextAlign="Right" ColumnID="tfAge">
-                        <ItemTemplate>
-                            <asp:Label ID="lbAge" runat="server" Text='<%# ConvertWorkTime(Eval("UnitWorkPostID")) %>'></asp:Label>                            
-                        </ItemTemplate>
-                    </f:TemplateField>
+                     <f:RenderField Width="100px" ColumnID="WorkTime" DataField="WorkTime"
+                        SortField="WorkTime" FieldType="Int" HeaderText="人工时" HeaderTextAlign="Center"
+                        TextAlign="Right">
+                    </f:RenderField>
                     <f:RenderField Width="120px" ColumnID="EngineeringQuantity" DataField="EngineeringQuantity" FieldType="Double" 
                             HeaderText="工程量" HeaderTextAlign="Center" TextAlign="Right">
                         </f:RenderField>
                     <f:TemplateField Width="120px" HeaderText="工效" HeaderTextAlign="Center" TextAlign="Right" ColumnID="tfIsPost">
                         <ItemTemplate>
-                            <asp:Label ID="lbIsPost" runat="server" Text='<%# ConvertWorkEfficiency(Eval("UnitWorkPostID"),Eval("EngineeringQuantity")) %>'></asp:Label>                            
+                            <asp:Label ID="lbIsPost" runat="server" Text='<%# ConvertWorkEfficiency(Eval("WorkTime"),Eval("EngineeringQuantity")) %>'></asp:Label>                            
                         </ItemTemplate>
                     </f:TemplateField>
                 </Columns>