修改进度报表导出

SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx

@@ -28,7 +28,7 @@
                                         <f:Button ID="btnSearch" Text="查询" MarginLeft="40px" EnablePostBack="true" runat="server" Icon="SystemSearch"
                                             OnClick="btnSearch_Click">
                                         </f:Button>
-                                        <f:Button ID="btnOut" OnClick="btnOut_Click" Text="导出" runat="server" ToolTip="导出" Icon="FolderUp"
+                                        <f:Button ID="btnOut" OnClick="btnOutExcel_Click" Text="导出" runat="server" ToolTip="导出" Icon="FolderUp"
                                             EnableAjax="false" DisableControlBeforePostBack="false">
                                         </f:Button>
                                         <f:ToolbarFill ID="ToolbarFill1" runat="server">

SGGL/FineUIPro.Web/JDGL/WBS/WorkloadStatistics.aspx

@@ -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">

SGGL/FineUIPro.Web/JDGL/WBS/WorkloadStatistics.aspx.cs

@@ -84,7 +84,7 @@ namespace FineUIPro.Web.JDGL.WBS
                 DateTime months = Convert.ToDateTime(this.txtMonths.Text.Trim());
                 //if (this.rblStatisticsType.SelectedValue == "1")
                 //{
-                DataTable table = BLL.WorkloadStatisticsService.GetTreeDataTable(this.CurrUser.LoginProjectId, months, BLL.Const._Null, this.drpCnProfession.SelectedValue, this.drpUnitProject.SelectedValue, this.drpWbsSet.SelectedValue);
+                DataTable table = BLL.WorkloadStatisticsService.GetTreeDataTable(this.CurrUser.LoginProjectId, months, BLL.Const._Null, this.drpCnProfession.SelectedValue, this.drpUnitProject.SelectedValue, this.drpWbsSet.SelectedValue, this.txtEquipmentMaterialType.Text.Trim());
                 Grid1.DataSource = table;
                 Grid1.DataBind();
                 //}
@@ -142,7 +142,7 @@ namespace FineUIPro.Web.JDGL.WBS
                             ppsId = 3,
                             ppsName = "施工",
                             performanceDate = this.txtMonths.Text.Trim() + "-25",
-                            pv = Math.Round((thisDetail.ThisPlanValue??0) / baseMoney,4),
+                            pv = Math.Round((thisDetail.ThisPlanValue ?? 0) / baseMoney, 4),
                             ev = Math.Round((thisDetail.ThisPlanCost ?? 0) / baseMoney, 4),
                             ac = Math.Round((thisDetail.ThisRealCost ?? 0) / baseMoney, 4),
                             totalPv = Math.Round((thisDetail.TotalPlanValue ?? 0) / baseMoney, 4),
@@ -298,7 +298,7 @@ namespace FineUIPro.Web.JDGL.WBS
             Response.Write(GetGridTableHtml2(Grid1));
             Response.End();
             DateTime months = Convert.ToDateTime(this.txtMonths.Text.Trim());
-            DataTable table = BLL.WorkloadStatisticsService.GetTreeDataTable(this.CurrUser.LoginProjectId, months, BLL.Const._Null, this.drpCnProfession.SelectedValue, this.drpUnitProject.SelectedValue, this.drpWbsSet.SelectedValue);
+            DataTable table = BLL.WorkloadStatisticsService.GetTreeDataTable(this.CurrUser.LoginProjectId, months, BLL.Const._Null, this.drpCnProfession.SelectedValue, this.drpUnitProject.SelectedValue, this.drpWbsSet.SelectedValue, this.txtEquipmentMaterialType.Text.Trim());
             Grid1.DataSource = table;
             Grid1.DataBind();
         }

SGGL/FineUIPro.Web/JDGL/WBS/WorkloadStatistics.aspx.designer.cs

@@ -75,24 +75,6 @@ namespace FineUIPro.Web.JDGL.WBS {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitProject;
         
-        /// <summary>
-        /// drpWbsSet 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpWbsSet;
-        
-        /// <summary>
-        /// btnSearch 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnSearch;
-        
         /// <summary>
         /// btnSend 控件。
         /// </summary>
@@ -120,6 +102,42 @@ namespace FineUIPro.Web.JDGL.WBS {
         /// </remarks>
         protected global::FineUIPro.Button btnCheck;
         
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// drpWbsSet 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWbsSet;
+        
+        /// <summary>
+        /// txtEquipmentMaterialType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtEquipmentMaterialType;
+        
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+        
         /// <summary>
         /// btnOut 控件。
         /// </summary>