From 82af4988703ee9a0f2ec1243879d0a23e3667774 Mon Sep 17 00:00:00 2001
From: gaofei <231232131@163.com>
Date: Thu, 23 Sep 2021 17:31:16 +0800
Subject: [PATCH] 0923-04-gaofei

---
 .../JDGL/WBS/WorkloadStatistics.aspx          | 30 +++++++++----------
 .../JDGL/WBS/WorkloadStatistics.aspx.cs       | 30 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadStatistics.aspx b/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadStatistics.aspx
index f416d1c4..90601aa8 100644
--- a/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadStatistics.aspx
+++ b/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadStatistics.aspx
@@ -54,38 +54,38 @@
             </Toolbars>
             <Columns>
                 <f:RowNumberField />
-                <f:BoundField Width="400px" ColumnID="Name" ExpandUnusedSpace="true" DataField="Name" HeaderTextAlign="Center"
+                <f:BoundField Width="350px" ColumnID="Name" ExpandUnusedSpace="true" DataField="Name" HeaderTextAlign="Center"
                     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">
                             </f:RenderField>
                 <f:RenderField Width="80px" ColumnID="RealPrice" DataField="RealPrice" FieldType="Double"
-                                HeaderText="成本单价(A)" HeaderTextAlign="Center" TextAlign="Center">
+                                HeaderText="实际单价(AC)" HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
-                <f:RenderField Width="80px" ColumnID="PlanNum" DataField="PlanNum" FieldType="Double"
-                                HeaderText="本月计划完成量(B)" HeaderTextAlign="Center" TextAlign="Center">
+                <f:RenderField Width="100px" ColumnID="PlanNum" DataField="PlanNum" FieldType="Double"
+                                HeaderText="本月计划完成量(WS)" HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
-                <f:RenderField Width="80px" ColumnID="ThisNum" DataField="ThisNum" FieldType="Double"
-                                HeaderText="本月完成量(C)" HeaderTextAlign="Center" TextAlign="Center">
+                <f:RenderField Width="100px" ColumnID="ThisNum" DataField="ThisNum" FieldType="Double"
+                                HeaderText="本月实际完成量(WP)" HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
                 <f:RenderField Width="80px" ColumnID="PlanPrice" DataField="PlanPrice" FieldType="Double"
-                                HeaderText="控制预算单价(D)" HeaderTextAlign="Center" TextAlign="Center">
+                                HeaderText="预算单价(BC)" HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
-                <f:RenderField Width="80px" ColumnID="ThisRealCost" DataField="ThisRealCost" FieldType="Double"
-                                HeaderText="本月已完工作实际费用-ACWP(A*C)" HeaderTextAlign="Center" TextAlign="Center">
+                <f:RenderField Width="100px" ColumnID="ThisRealCost" DataField="ThisRealCost" FieldType="Double"
+                                HeaderText="本月已完工作实际费用-ACWP" HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
-                <f:RenderField Width="80px" ColumnID="ThisPlanValue" DataField="ThisPlanValue" FieldType="Double"
-                                HeaderText="本月计划工作预算费用-BCWS(B*D)" HeaderTextAlign="Center" TextAlign="Center">
+                <f:RenderField Width="100px" ColumnID="ThisPlanValue" DataField="ThisPlanValue" FieldType="Double"
+                                HeaderText="本月计划工作预算费用-BCWS" HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
-                <f:RenderField Width="80px" ColumnID="ThisPlanCost" DataField="ThisPlanCost" FieldType="Double"
-                                HeaderText="本月已完工作预算费用-BCWP(C*D)" HeaderTextAlign="Center" TextAlign="Center">
+                <f:RenderField Width="100px" ColumnID="ThisPlanCost" DataField="ThisPlanCost" FieldType="Double"
+                                HeaderText="本月已完工作预算费用-BCWP" HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
                 <f:RenderField Width="100px" ColumnID="TotalPlanNum" DataField="TotalPlanNum" FieldType="Double"
-                                HeaderText="累计计划完成量" HeaderTextAlign="Center" TextAlign="Center">
+                                HeaderText="累计计划完成量(WS)" HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
                 <f:RenderField Width="100px" ColumnID="TotalThisNum" DataField="TotalThisNum" FieldType="Double"
-                                HeaderText="累计完成量" HeaderTextAlign="Center" TextAlign="Center">
+                                HeaderText="累计实际完成量(WP)" HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
                 <f:RenderField Width="100px" ColumnID="TotalRealCost" DataField="TotalRealCost" FieldType="Double"
                                 HeaderText="累计已完工作实际费用-ACWP" HeaderTextAlign="Center" TextAlign="Center">
diff --git a/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadStatistics.aspx.cs b/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadStatistics.aspx.cs
index f521ed1d..e4c40077 100644
--- a/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadStatistics.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadStatistics.aspx.cs
@@ -37,11 +37,11 @@ namespace FineUIPro.Web.JDGL.WBS
         {
             if (!string.IsNullOrEmpty(this.txtMonths.Text.Trim()))
             {
-                this.Grid1.Columns[5].HeaderText = "本月计划完成量(B)";
-                this.Grid1.Columns[6].HeaderText = "本月完成量(C)";
-                this.Grid1.Columns[8].HeaderText = "本月已完工作实际费用-ACWP(A*C)";
-                this.Grid1.Columns[9].HeaderText = "本月计划工作预算费用-BCWS(B*D)";
-                this.Grid1.Columns[10].HeaderText = "本月已完工作预算费用-BCWP(C*D)";
+                this.Grid1.Columns[5].HeaderText = "本月计划完成量(WS)";
+                this.Grid1.Columns[6].HeaderText = "本月实际完成量(WP)";
+                this.Grid1.Columns[8].HeaderText = "本月已完工作实际费用-ACWP";
+                this.Grid1.Columns[9].HeaderText = "本月计划工作预算费用-BCWS";
+                this.Grid1.Columns[10].HeaderText = "本月已完工作预算费用-BCWP";
                 this.drpWeek.Items.Clear();
                 DateTime months = Convert.ToDateTime(this.txtMonths.Text.Trim() + "-01");
                 string costControlId = BLL.CostControlDetailService.GetHasWeekPlanCostControlIdByProjectIdAndMonth(this.CurrUser.LoginProjectId, months);
@@ -199,19 +199,19 @@ namespace FineUIPro.Web.JDGL.WBS
         {
             if (this.drpWeek.SelectedValue == BLL.Const._Null)
             {
-                this.Grid1.Columns[5].HeaderText = "本月计划完成量(B)";
-                this.Grid1.Columns[6].HeaderText = "本月完成量(C)";
-                this.Grid1.Columns[8].HeaderText = "本月已完工作实际费用-ACWP(A*C)";
-                this.Grid1.Columns[9].HeaderText = "本月计划工作预算费用-BCWS(B*D)";
-                this.Grid1.Columns[10].HeaderText = "本月已完工作预算费用-BCWP(C*D)";
+                this.Grid1.Columns[5].HeaderText = "本月计划完成量(WS)";
+                this.Grid1.Columns[6].HeaderText = "本月实际完成量(WP)";
+                this.Grid1.Columns[8].HeaderText = "本月已完工作实际费用-ACWP";
+                this.Grid1.Columns[9].HeaderText = "本月计划工作预算费用-BCWS";
+                this.Grid1.Columns[10].HeaderText = "本月已完工作预算费用-BCWP";
             }
             else
             {
-                this.Grid1.Columns[5].HeaderText = "本周计划完成量(B)";
-                this.Grid1.Columns[6].HeaderText = "本周完成量(C)";
-                this.Grid1.Columns[8].HeaderText = "本周已完工作实际费用-ACWP(A*C)";
-                this.Grid1.Columns[9].HeaderText = "本周计划工作预算费用-BCWS(B*D)";
-                this.Grid1.Columns[10].HeaderText = "本周已完工作预算费用-BCWP(C*D)";
+                this.Grid1.Columns[5].HeaderText = "本周计划完成量(WS)";
+                this.Grid1.Columns[6].HeaderText = "本周实际完成量(WP)";
+                this.Grid1.Columns[8].HeaderText = "本周已完工作实际费用-ACWP";
+                this.Grid1.Columns[9].HeaderText = "本周计划工作预算费用-BCWS";
+                this.Grid1.Columns[10].HeaderText = "本周已完工作预算费用-BCWP";
             }
         }
     }