修改进度报表导出

2023-06-30 09:01:01 +08:00
parent 2e4e6d7403
commit 74b11ca61a
8 changed files with 2044 additions and 89 deletions
@@ -36,11 +36,7 @@
                                            </f:DropDownList>
                        <f:DropDownList ID="drpUnitProject" OnSelectedIndexChanged="drpUnitProject_SelectedIndexChanged" AutoPostBack="true" runat="server" Label="分部工程" LabelAlign="Right" EnableEdit="true">
                                            </f:DropDownList>
-                        <f:DropDownList ID="drpWbsSet" runat="server" Label="工作包" LabelAlign="Right" EnableEdit="true">
-                                            </f:DropDownList>
-                        <f:Button ID="btnSearch" Text="查询" MarginLeft="40px" EnablePostBack="true" runat="server"
-                            OnClick="btnSearch_Click">
-                        </f:Button>
+                        
                        <f:Button ID="btnSend" Text="推送数据" EnablePostBack="true" runat="server" Hidden="true"
                            OnClick="btnSend_Click">
                        </f:Button>
@@ -50,6 +46,17 @@
                        <f:Button ID="btnCheck" Text="查询数据" EnablePostBack="true" runat="server" Hidden="true"
                            OnClick="btnCheck_Click">
                        </f:Button>
+                        
+                    </Items>
+                </f:Toolbar>
+                <f:Toolbar ID="Toolbar1" Position="Top" runat="server">
+                    <Items>
+                        <f:DropDownList ID="drpWbsSet" runat="server" Label="工作包" LabelAlign="Right" EnableEdit="true">
+                                            </f:DropDownList>
+                        <f:TextBox runat="server" ID="txtEquipmentMaterialType" Label="设备材料分类" LabelAlign="Right" LabelWidth="120px"></f:TextBox>
+                        <f:Button ID="btnSearch" Text="查询" MarginLeft="40px" EnablePostBack="true" runat="server"
+                            OnClick="btnSearch_Click">
+                        </f:Button>
                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
                                    EnableAjax="false" DisableControlBeforePostBack="false">
                                </f:Button>
@@ -59,7 +66,7 @@
            <Columns>
                <f:RowNumberField />
                <f:BoundField Width="350px" ColumnID="Name" ExpandUnusedSpace="true" DataField="Name" HeaderTextAlign="Center"
-                    HeaderText="施工工作包" />
+                    HeaderText="" />
                <f:BoundField Width="100px" DataField="Unit" HeaderText="单位" TextAlign="Center" />
                <f:RenderField Width="100px" ColumnID="TotalNum" DataField="TotalNum" FieldType="Double"
                                HeaderText="合同工作量" HeaderTextAlign="Center" TextAlign="Center">