lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-10-25

Browse Source
This commit is contained in:
李鹏飞
2023-10-25 23:30:52 +08:00
parent 1580bbcbf7
commit 81d0edb9e7
23 changed files with 386 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx
+26 -16
View File
@@ -21,6 +21,12 @@
.f-grid-row.red {
background-color: Yellow;
}
.color1 {
background-color: #ff0000;
color: #fff;
}
</style>
</head>
@@ -35,9 +41,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"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" OnRowDataBound="Grid1_RowDataBound" IsFluid="True"
AllowPaging="False" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowClick="Grid1_OnRowClick" EnableRowClickEvent="True">
EnableRowDoubleClickEvent="true" >
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
@@ -153,24 +159,24 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="TotalPrice" DataField="TotalPrice" SortField="TotalPrice" EnableColumnEdit="False"
FieldType="String" HeaderText="合价/元" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="合价(元)" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox14" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CalculationRule" DataField="CalculationRule" SortField="CalculationRule" EnableColumnEdit="False"
<f:RenderField Width="150px" ColumnID="CalculationRule" DataField="CalculationRule" SortField="CalculationRule" EnableColumnEdit="False" Hidden="True"
FieldType="String" HeaderText="计算规则" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox15" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="WorkContent" DataField="WorkContent" SortField="WorkContent" EnableColumnEdit="False"
<f:RenderField Width="150px" ColumnID="WorkContent" DataField="WorkContent" SortField="WorkContent" EnableColumnEdit="False" Hidden="True"
FieldType="String" HeaderText="工作内容" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox16" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks" SortField="Remarks" EnableColumnEdit="False"
<f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks" SortField="Remarks" EnableColumnEdit="False" Hidden="True"
FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox17" runat="server" Required="true"></f:TextBox>
@@ -183,7 +189,7 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ContractWeight" DataField="ContractWeight" SortField="ContractWeight" EnableColumnEdit="False"
FieldType="String" HeaderText="合同权重 " TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="合同权重/% " TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox19" runat="server" Required="true"></f:TextBox>
</Editor>
@@ -203,7 +209,7 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="EstimatedAmount" DataField="EstimatedAmount" SortField="EstimatedAmount"
FieldType="String" HeaderText="概算金额" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="概算金额(元)" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:NumberBox ID="NumberBox2" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
</f:NumberBox>
@@ -215,14 +221,23 @@
<f:TextBox ID="TextBox24" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SettledAmount" DataField="SettledAmount" SortField="SettledAmount"
FieldType="String" HeaderText="预算金额 " TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="SettledAmount" DataField="SettledAmount" SortField="SettledAmount" EnableColumnEdit="False"
FieldType="String" HeaderText="预算金额(元) " TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:NumberBox ID="NumberBox3" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:TemplateField ColumnID="QuantityOffset" Width="120px" HeaderText="工程量偏差" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# BLL.PhtglContractTrackService.GetQuantityOffset(Eval("Id")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="AmountOffset" Width="120px" HeaderText="费用偏差" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.PhtglContractTrackService.GetAmountOffset(Eval("Id")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<%-- <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -256,11 +271,6 @@
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1200px" Height="650px">
</f:Window>
<f:Window ID="Window3" runat="server" Hidden="true" ShowHeader="true"
IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window3_OnClose"
Title="匹配WBS" EnableIFrame="true" Height="650px"
Width="1200px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnEdit_Click" EnablePostBack="true"
Hidden="true" runat="server" Text="编辑" Icon="TableEdit">
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs
+87 -106
View File
@@ -1,7 +1,9 @@
using BLL;
using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Web;
@@ -47,51 +49,38 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
table.ContractId = this.ContractId;
table.ProjectCode = this.txtProjectCode.Text.Trim();
table.ProjectName = this.txtProjectName.Text.Trim();
var tb = BLL.PhtglContractTrackService.GetListData(table, Grid1);
Grid1.RecordCount = PhtglContractTrackService.Count;
var tb = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackByModle(table);
Grid1.RecordCount = tb.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb;
Grid1.DataBind();
}
private void BindGrid2()
{
var db = Funs.DB;
var q = from x in db.PHTGL_ContractTrackMatchWBS
join y in db.WBS_ControlItemAndCycle on x.ControlItemAndCycleId equals y.ControlItemAndCycleId
where x.ContractTrackId == Grid1.SelectedRowID
select new
{
x.Id,
x.ContractTrackId,
x.ControlItemAndCycleId,
y.ControlItemAndCycleCode,
y.ControlItemContent,
y.Weights,
x.WorkPackageEstimate
};
;
}
private string GetDeleteScript()
protected void DropMainContractCode_SelectedIndexChanged(object sender, EventArgs e)
{
return Confirm.GetShowReference("确定删除当前数据吗？", String.Empty, MessageBoxIcon.Question, Grid1.GetDeleteSelectedRowsReference(), String.Empty);
if (!string.IsNullOrEmpty(DropContractCode.SelectedValue))
{
var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue);
if (model != null)
{
ContractId = model.ContractId;
this.txtContractName.Text = model.ContractName;
}
else
{
ContractId = "";
this.txtContractName.Text = string.Empty;
}
}
BindGrid();
}
#endregion
#region GV 数据操作
/// <summary>
/// 过滤表头
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
//protected void Grid1_FilterChange(object sender, EventArgs e)
//{
// this.BindGrid();
//}
/// <summary>
/// 分页
@@ -104,6 +93,36 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
this.BindGrid();
}
protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
{
try
{
var model = (Model.PHTGL_ContractTrack)e.DataItem;
// 工程量偏差
decimal QuantityOffset = Funs.GetNewDecimalOrZero(model.EstimatedQuantity) -
Funs.GetNewDecimalOrZero(model.SettledQuantity);
TemplateField bfQuantityOffset = Grid1.FindColumn("QuantityOffset") as TemplateField;
if (QuantityOffset < 0)
{
e.CellCssClasses[bfQuantityOffset.ColumnIndex] = "color1";
}
// 费用偏差
decimal AmountOffset = (model.EstimatedAmount ?? 0) - (model.SettledAmount ?? 0);
TemplateField bfAmountOffset = Grid1.FindColumn("AmountOffset") as TemplateField;
if (AmountOffset < 0)
{
e.CellCssClasses[bfAmountOffset.ColumnIndex] = "color1";
}
}
catch (Exception ex)
{
}
}
/// <summary>
/// 排序
/// </summary>
@@ -150,16 +169,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
}
}
/// <summary>
/// Grid行单击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_OnRowClick(object sender, GridRowClickEventArgs e)
{
BindGrid2();
}
/// <summary>
/// Grid行双击事件
/// </summary>
@@ -194,41 +203,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
}
}
#region 更新上级WBS内容每月实际费用
/// <summary>
/// 更新上级WBS内容每月实际费用
/// </summary>
/// <param name="years"></param>
/// <param name="months"></param>
/// <param name="PlanNum"></param>
/// <param name="parentId"></param>
private void UpdateWorkPackageParentThisValue(Model.SGGLDB db, string SuperWorkPackageId, DateTime months, decimal thisValue)
{
Model.WBS_WorkPackage workPackage = db.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == SuperWorkPackageId);
if (workPackage != null)
{
Model.WBS_WorkPackageParentDetail parentDetail = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(SuperWorkPackageId, months);
if (parentDetail != null)
{
parentDetail.ThisValue += thisValue;
}
else
{
parentDetail = new Model.WBS_WorkPackageParentDetail();
parentDetail.WorkPackageParentDetailId = SQLHelper.GetNewID();
parentDetail.ParentId = SuperWorkPackageId;
parentDetail.Months = months;
parentDetail.ThisValue = thisValue;
db.WBS_WorkPackageParentDetail.InsertOnSubmit(parentDetail);
}
if (workPackage.SuperWorkPackageId != null) //还存在上级节点，需要继续循环
{
UpdateWorkPackageParentThisValue(db, workPackage.SuperWorkPackageId, months, thisValue);
}
}
}
#endregion
protected void btnSave_OnClick(object sender, EventArgs e)
{
JArray EditorArr = Grid1.GetMergedData();
@@ -285,7 +259,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
model.EstimatedQuantity = EstimatedQuantity;
model.EstimatedAmount = Funs.GetNewDecimal(EstimatedAmount);
model.SettledQuantity = SettledQuantity;
model.SettledAmount = Funs.GetNewDecimal(SettledAmount);
model.SettledAmount = Funs.GetNewDecimalOrZero(SettledQuantity)* Funs.GetNewDecimalOrZero(TotalCostFixedComprehensiveUnitPrice);
PhtglContractTrackService.UpdatePHTGL_ContractTrack(model);
}
@@ -302,6 +276,41 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
BindGrid();
}
#region 更新上级WBS内容每月实际费用
/// <summary>
/// 更新上级WBS内容每月实际费用
/// </summary>
/// <param name="years"></param>
/// <param name="months"></param>
/// <param name="PlanNum"></param>
/// <param name="parentId"></param>
private void UpdateWorkPackageParentThisValue(Model.SGGLDB db, string SuperWorkPackageId, DateTime months, decimal thisValue)
{
Model.WBS_WorkPackage workPackage = db.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == SuperWorkPackageId);
if (workPackage != null)
{
Model.WBS_WorkPackageParentDetail parentDetail = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(SuperWorkPackageId, months);
if (parentDetail != null)
{
parentDetail.ThisValue += thisValue;
}
else
{
parentDetail = new Model.WBS_WorkPackageParentDetail();
parentDetail.WorkPackageParentDetailId = SQLHelper.GetNewID();
parentDetail.ParentId = SuperWorkPackageId;
parentDetail.Months = months;
parentDetail.ThisValue = thisValue;
db.WBS_WorkPackageParentDetail.InsertOnSubmit(parentDetail);
}
if (workPackage.SuperWorkPackageId != null) //还存在上级节点，需要继续循环
{
UpdateWorkPackageParentThisValue(db, workPackage.SuperWorkPackageId, months, thisValue);
}
}
}
#endregion
protected void btnQuery_OnClick(object sender, EventArgs e)
{
BindGrid();
@@ -400,33 +409,5 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
return sb.ToString();
}
#endregion
protected void DropMainContractCode_SelectedIndexChanged(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(DropContractCode.SelectedValue))
{
var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue);
if (model != null)
{
ContractId = model.ContractId;
this.txtContractName.Text = model.ContractName;
}
else
{
ContractId = "";
this.txtContractName.Text = string.Empty;
}
}
BindGrid();
}
protected void Window3_OnClose(object sender, WindowCloseEventArgs e)
{
BindGrid2();
}
}
}
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs
Generated
+18 -9
View File
@@ -356,6 +356,24 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.NumberBox NumberBox3;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -401,15 +419,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Window3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window3;
/// <summary>
/// Menu1 控件。
/// </summary>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx
+7 -7
View File
@@ -48,7 +48,7 @@
<Items>
<f:TextBox ID="txtSubProject" runat="server" Label="分部工程" MaxLength="200" >
</f:TextBox>
<f:TextBox ID="txtSubItemProject" runat="server" Label="分项工程" MaxLength="200" >
<f:TextBox ID="txtSubItemProject" runat="server" Label="子分部工程" MaxLength="200" >
</f:TextBox>
</Items>
</f:FormRow>
@@ -86,10 +86,10 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtTotalCostFixedComprehensiveUnitPrice" runat="server" Label="全费用固定综合单价" MaxLength="200">
<f:TextBox ID="txtTotalCostFixedComprehensiveUnitPrice" runat="server" Label="全费用固定综合单价(元)" MaxLength="200">
</f:TextBox>
<f:TextBox ID="txtMainMaterialCost" runat="server" Label="主材费" MaxLength="200">
<f:TextBox ID="txtMainMaterialCost" runat="server" Label="其中:主材费(元)" MaxLength="200">
</f:TextBox>
</Items>
</f:FormRow>
@@ -99,7 +99,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtTotalPrice" runat="server" Label="合价/元" MaxLength="200">
<f:TextBox ID="txtTotalPrice" runat="server" Label="合价(元)" MaxLength="200">
</f:TextBox>
<f:TextBox ID="txtCalculationRule" runat="server" Label="计算规则" MaxLength="200">
@@ -154,20 +154,20 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtEstimatedAmount" runat="server" Label="概算金额"
<f:NumberBox ID="txtEstimatedAmount" runat="server" Label="概算金额(元)"
NoDecimal="false" DecimalPrecision="2" Increment="0.01">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtSettledQuantity" runat="server" Label="结算工程量" MaxLength="200">
<f:TextBox ID="txtSettledQuantity" runat="server" Label="预算工程量" MaxLength="200">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtSettledAmount" runat="server" Label="结算金额"
<f:NumberBox ID="txtSettledAmount" runat="server" Label="预算金额(元)"
NoDecimal="false" DecimalPrecision="2" Increment="0.01">
</f:NumberBox>
</Items>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
+3 -3
View File
@@ -150,19 +150,19 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="TotalCostFixedComprehensiveUnitPrice" DataField="TotalCostFixedComprehensiveUnitPrice" SortField="TotalCostFixedComprehensiveUnitPrice"
FieldType="String" HeaderText="全费用固定综合单价" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="全费用固定综合单价(元)" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox12" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost"
FieldType="String" HeaderText="主材费" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="其中:主材费(元)" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox13" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="TotalPrice" DataField="TotalPrice" SortField="TotalPrice"
FieldType="String" HeaderText="合价/元" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="合价(元)" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox14" runat="server" Required="true"></f:TextBox>
</Editor>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx.cs
+8 -8
View File
@@ -118,7 +118,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
bf = new FineUIPro.BoundField();
bf.ColumnID = date + "BCWS_OutputValue";
bf.DataField = date + "BCWS_OutputValue";
bf.HeaderText = "产值";
bf.HeaderText = "产值(元)";
bf.HeaderTextAlign = TextAlign.Center;
bf.TextAlign = TextAlign.Center;
p1BCWS.Columns.Add(bf);
@@ -127,7 +127,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
bf = new FineUIPro.BoundField();
bf.ColumnID = date + "BCWS_Percentage";
bf.DataField = date + "BCWS_Percentage";
bf.HeaderText = "百分比";
bf.HeaderText = "百分比/%";
bf.HeaderTextAlign = TextAlign.Center;
bf.TextAlign = TextAlign.Center;
p1BCWS.Columns.Add(bf);
@@ -150,7 +150,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
bf = new FineUIPro.BoundField();
bf.ColumnID = date + "ACWP_OutputValue";
bf.DataField = date + "ACWP_OutputValue";
bf.HeaderText = "产值";
bf.HeaderText = "产值(元)";
bf.HeaderTextAlign = TextAlign.Center;
bf.TextAlign = TextAlign.Center;
p1ACWP.Columns.Add(bf);
@@ -159,7 +159,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
bf = new FineUIPro.BoundField();
bf.ColumnID = date + "ACWP_Percentage";
bf.DataField = date + "ACWP_Percentage";
bf.HeaderText = "百分比";
bf.HeaderText = "百分比/%";
bf.HeaderTextAlign = TextAlign.Center;
bf.TextAlign = TextAlign.Center;
p1ACWP.Columns.Add(bf);
@@ -188,7 +188,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
bf = new FineUIPro.BoundField();
bf.ColumnID = date + "SumBCWS_OutputValue";
bf.DataField = date + "SumBCWS_OutputValue";
bf.HeaderText = "产值";
bf.HeaderText = "产值(元)";
bf.HeaderTextAlign = TextAlign.Center;
bf.TextAlign = TextAlign.Center;
p2BCWS.Columns.Add(bf);
@@ -197,7 +197,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
bf = new FineUIPro.BoundField();
bf.ColumnID = date + "SumBCWS_Percentage";
bf.DataField = date + "SumBCWS_Percentage";
bf.HeaderText = "百分比";
bf.HeaderText = "百分比/%";
bf.HeaderTextAlign = TextAlign.Center;
bf.TextAlign = TextAlign.Center;
p2BCWS.Columns.Add(bf);
@@ -220,7 +220,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
bf = new FineUIPro.BoundField();
bf.ColumnID = date + "SumACWP_OutputValue";
bf.DataField = date + "SumACWP_OutputValue";
bf.HeaderText = "产值";
bf.HeaderText = "产值(元)";
bf.HeaderTextAlign = TextAlign.Center;
bf.TextAlign = TextAlign.Center;
p2ACWP.Columns.Add(bf);
@@ -229,7 +229,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
bf = new FineUIPro.BoundField();
bf.ColumnID = date + "SumACWP_Percentage";
bf.DataField = date + "SumACWP_Percentage";
bf.HeaderText = "百分比";
bf.HeaderText = "百分比/%";
bf.HeaderTextAlign = TextAlign.Center;
bf.TextAlign = TextAlign.Center;
p2ACWP.Columns.Add(bf);
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx
+5 -7
View File
@@ -67,12 +67,10 @@
</f:Toolbar>
</Toolbars>
<Columns>
<%--<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>--%>
<f:RenderField Width="150px" ColumnID="SerialNumber" DataField="SerialNumber" SortField="SerialNumber"
FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode" EnableColumnEdit="False"
FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
@@ -142,7 +140,7 @@
FieldType="String" HeaderText="权重" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="WorkPackageEstimate" DataField="WorkPackageEstimate" FieldType="Double"
HeaderText="概算" HeaderTextAlign="Center">
HeaderText="概算(元)" HeaderTextAlign="Center">
<Editor>
<f:NumberBox ID="NumberBox2" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
</f:NumberBox>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs
+3 -2
View File
@@ -91,11 +91,12 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
x.EstimatedAmount,
x.SettledQuantity,
x.SettledAmount,
x.ContractId
x.ContractId,
x.SerialNumber
};
;
Grid1.RecordCount = q.Count();
Grid1.DataSource = q.ToList();
Grid1.DataSource = q.ToList().OrderBy(x => x.SerialNumber, new CustomComparer()).ToList();
Grid1.DataBind();
}