gaofei/SGGL_HBAZ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/gaofei/SGGL_HBAZ

Browse Source
This commit is contained in:
杨家亮
2025-04-06 23:26:34 +08:00
parent 8aba5b01bc a3e06cfc69
commit 0a692147f7
5 changed files with 133 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/QuantityManagement/Base.aspx
+11 -11
View File
@@ -13,8 +13,8 @@
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工程量基础表" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="BaseId" AllowCellEditing="true" EnableColumnLines="true"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工程量基础表" EnableCollapse="true" DataParentIDField="SupId" ExpandAllTreeNodes="true"
runat="server" BoxFlex="1" DataKeyNames="BaseId" AllowCellEditing="true" EnableColumnLines="true" TreeColumn="Name" EnableTree="true"
ClicksToEdit="2" DataIDField="BaseId" AllowSorting="true" SortField="DrawingNo,Part,ProjectContent" ForceFit="true"
SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
@@ -42,21 +42,21 @@
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField ColumnID="WorkSection" DataField="WorkSection" FieldType="String" HeaderText="工段" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
<f:RenderField ColumnID="Name" DataField="Name" FieldType="String" HeaderText="层级" TextAlign="Center"
HeaderTextAlign="Center" Width="420px">
</f:RenderField>
<%--<f:RenderField ColumnID="WorkSection" DataField="WorkSection" FieldType="String" HeaderText="工段" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>--%>
<f:RenderField ColumnID="DrawingNo" DataField="DrawingNo" FieldType="String" HeaderText="图号" TextAlign="Center"
HeaderTextAlign="Center" Width="250px">
</f:RenderField>
<f:RenderField ColumnID="DrawingName" DataField="DrawingName" FieldType="String" HeaderText="图纸名称" TextAlign="Center"
<%--<f:RenderField ColumnID="DrawingName" DataField="DrawingName" FieldType="String" HeaderText="图纸名称" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Major" DataField="Major" FieldType="String" HeaderText="专业" TextAlign="Center"
</f:RenderField>--%>
<%--<f:RenderField ColumnID="Part" DataField="Part" FieldType="String" HeaderText="部位" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="Part" DataField="Part" FieldType="String" HeaderText="部位" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField ColumnID="ProjectContent" DataField="ProjectContent" FieldType="String" HeaderText="项目内容" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
SGGL/FineUIPro.Web/CQMS/QuantityManagement/Base.aspx.cs
+4 -1
View File
@@ -20,7 +20,10 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
if (!IsPostBack)
{
GetButtonPower();
BindGrid();
DataTable table = BLL.BaseService.GetAllTreeDataTable(this.CurrUser.LoginProjectId);
Grid1.DataSource = table;
Grid1.DataBind();
//BindGrid();
}
}
SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx
-3
View File
@@ -60,9 +60,6 @@
<f:RenderField ColumnID="Amount" DataField="Amount" FieldType="Float" HeaderText="总数" TextAlign="Center"
HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField ColumnID="WorkTeam" DataField="WorkTeam" FieldType="String" HeaderText="作业队" TextAlign="Center"
HeaderTextAlign="Center" Width="150px">
</f:RenderField>
<f:RenderField ColumnID="TotalComplete" DataField="TotalComplete" FieldType="Float" HeaderText="累计完成" TextAlign="Center"
HeaderTextAlign="Center" Width="100px">
</f:RenderField>
SGGL/FineUIPro.Web/CQMS/QuantityManagement/WorkTeamStatistics.aspx.cs
+1 -1
View File
@@ -113,7 +113,7 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
}
completedAmount= totalDayInputs.Where(x => x.WorkSection == workSection && x.ProjectContent == projectContent && x.WorkTeam == workTeam).ToList().Sum(x => x.DayAmount ?? 0);
totalCompletedAmount = totalDayInputs.Where(x => x.WorkSection == workSection && x.ProjectContent == projectContent).ToList().Sum(x => x.DayAmount ?? 0);
this.Grid1.Rows[i].Values[4] = totalAmount.ToString("0.##");
this.Grid1.Rows[i].Values[5] = totalAmount.ToString("0.##");
this.Grid1.Rows[i].Values[6] = completedAmount.ToString("0.##");
this.Grid1.Rows[i].Values[7] = (totalAmount - totalCompletedAmount).ToString("0.##");
this.Grid1.Rows[i].Values[8] = monthComplete.ToString("0.##");