2023-11-01

This commit is contained in:
2023-11-01 23:12:52 +08:00
parent 8d25d69061
commit 32c893fdc3
20 changed files with 496 additions and 203 deletions
@@ -30,6 +30,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
this.DropContractCode.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
this.DropContractCode.DataBind();
Funs.FineUIPleaseSelect(this.DropContractCode);
PHTGL_QuantityService.IniGetMajorItems3DownList(drpMajorItems, true);
DropMainContractCode_SelectedIndexChanged(null, null);
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
// 绑定表格
@@ -49,12 +51,15 @@ 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.GetPHTGL_ContractTrackByModle(table);
Grid1.RecordCount = tb.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb;
table.MainItemName = this.txtMainItemName.Text.Trim();
if (drpMajorItems.SelectedValue != Const._Null)
{
table.MajorName = drpMajorItems.SelectedValue;
}
Grid1.DataSource = PhtglContractTrackService.GetListData(table, Grid1);
Grid1.RecordCount = PhtglContractTrackService.Count;
Grid1.DataBind();
}
@@ -99,7 +104,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
{
var model = (Model.PHTGL_ContractTrack)e.DataItem;
// 工程量偏差
decimal QuantityOffset = Funs.GetNewDecimalOrZero(model.EstimatedQuantity) -
decimal? QuantityOffset = Funs.GetNewDecimalOrZero(model.EstimatedQuantity) -
Funs.GetNewDecimalOrZero(model.SettledQuantity);
TemplateField bfQuantityOffset = Grid1.FindColumn("QuantityOffset") as TemplateField;
if (QuantityOffset < 0)
@@ -246,9 +251,9 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
model.ProjectDescription = ProjectDescription;
model.UnitOfMeasurement = UnitOfMeasurement;
model.Quantity = Quantity;
model.TotalCostFixedComprehensiveUnitPrice = TotalCostFixedComprehensiveUnitPrice;
model.MainMaterialCost = MainMaterialCost;
model.TotalPrice = TotalPrice;
model.TotalCostFixedComprehensiveUnitPrice = Funs.GetNewDecimalOrZero( TotalCostFixedComprehensiveUnitPrice);
model.MainMaterialCost = Funs.GetNewDecimalOrZero(MainMaterialCost);
model.TotalPrice = Funs.GetNewDecimalOrZero(TotalPrice);
model.CalculationRule = CalculationRule;
model.WorkContent = WorkContent;
model.Remarks = Remarks;