shecs/Basf_EProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20241213 Key Quantity

Browse Source
This commit is contained in:
毕文静
2024-12-13 15:54:19 +08:00
parent 6387cf58bc
commit 90c2df3d24
27 changed files with 4196 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EProject/FineUIPro.Web/common/Main.aspx
+62 -23
View File
@@ -19,7 +19,7 @@
.f-grid-row.color1,
.f-grid-row.color1 .f-icon,
.f-grid-row.color1 a {
color:lightgray;
color: lightgray;
}
</style>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
@@ -41,11 +41,11 @@
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnFind"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" EnableCheckBoxSelect="true" EnableMultiSelect="true" NextFocusControl="btnFind" AutoPostBack="true" OnSelectedIndexChanged="drpJobStatus_Click"></f:DropDownList>
<f:DropDownList ID="drpDivision" runat="server" AutoPostBack="true" OnSelectedIndexChanged="dropDownList_Click" NextFocusControl="btnFind"></f:DropDownList>
<f:TextBox ID="txtJobNoS" runat="server" EmptyText="Enter the Job No." EnableBlurEvent="true" OnBlur="dropDownList_Click" NextFocusControl="btnFind"></f:TextBox>
<f:Button ID="btnFind" runat="server" OnClick="btnFind_Click" Hidden="true"></f:Button>
<f:TextBox ID="txtJobNoS" runat="server" EmptyText="Enter the Job No." EnableBlurEvent="true" OnBlur="dropDownList_Click" NextFocusControl="btnFind"></f:TextBox>
<f:Button ID="btnFind" runat="server" OnClick="btnFind_Click" Hidden="true"></f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:HyperLink runat="server" Text="Projects Transmittals" NavigateUrl="\\wcnnji008219389\Projects_Transmittals" Width="160px" Target="_blank"></f:HyperLink>
<f:HyperLink runat="server" Text="Projects Transmittals" NavigateUrl="\\wcnnji008219389\Projects_Transmittals" Width="160px" Target="_blank"></f:HyperLink>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
<f:Button ID="btnViewDetail" Icon="User" runat="server" ToolTip="View details" Text="View details" OnClick="btnViewDetail_Click">
</f:Button>
@@ -73,40 +73,40 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="90px" ColumnID="ProjectControl_JobNo" DataField="ProjectControl_JobNo" SortField="ProjectControl_JobNo"
FieldType="String" HeaderText="Job No." HeaderTextAlign="Center" >
FieldType="String" HeaderText="Job No." HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectControl_JobType" DataField="ProjectControl_JobType" SortField="ProjectControl_JobType"
FieldType="String" HeaderText="Job Type" HeaderTextAlign="Center" >
FieldType="String" HeaderText="Job Type" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="350px" ColumnID="ProjectControl_JobTitle" DataField="ProjectControl_JobTitle" SortField="ProjectControl_JobTitle"
FieldType="String" HeaderText="Job Title" HeaderTextAlign="Center">
FieldType="String" HeaderText="Job Title" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectControl_OrginalBudget" DataField="ProjectControl_OrginalBudget"
FieldType="Int" HeaderText="Approved<br/>Budget(RMB)" HeaderTextAlign="Center" RendererFunction="renderSalary">
<Editor>
<f:NumberBox runat="server" EnableCommas="true" Readonly="true" />
</Editor>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectControl_ProjectManager" DataField="ProjectControl_ProjectManager"
FieldType="String" HeaderText="Project<br/>Manager" HeaderTextAlign="Center" >
FieldType="String" HeaderText="Project<br/>Manager" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectControl_ConstManager" DataField="ProjectControl_ConstManager"
FieldType="String" HeaderText="Const.<br/>Manager" HeaderTextAlign="Center" >
FieldType="String" HeaderText="Const.<br/>Manager" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectControl_OperationRep" DataField="ProjectControl_OperationRep"
FieldType="String" HeaderText="Operation<br/>Rep." HeaderTextAlign="Center" >
FieldType="String" HeaderText="Operation<br/>Rep." HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectControl_JobStatus" DataField="ProjectControl_JobStatus"
FieldType="String" HeaderText="Job Status" HeaderTextAlign="Center">
FieldType="String" HeaderText="Job Status" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="ProjectControl_BUCode" DataField="ProjectControl_BUCode"
FieldType="String" HeaderText="Bu.Code" HeaderTextAlign="Center" >
FieldType="String" HeaderText="Bu.Code" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="PM_MA_ProjectApproval" DataField="PM_MA_ProjectApproval"
FieldType="String" Renderer="Date" HeaderText="Approval<br/>Date" HeaderTextAlign="Center" >
FieldType="String" Renderer="Date" HeaderText="Approval<br/>Date" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectControl_MS_MC" DataField="ProjectControl_MS_MC"
FieldType="String" Renderer="Date" HeaderText="MC Plan<br/>Date" HeaderTextAlign="Center" >
FieldType="String" Renderer="Date" HeaderText="MC Plan<br/>Date" HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField HeaderText="Schedule" runat="server" HeaderTextAlign="Center" ColumnID="tfSchedule" TextAlign="Center" Width="60px">
<ItemTemplate>
@@ -293,7 +293,7 @@
<asp:Label ID="lblActualProgress" runat="server" Text='<%# ConvertPro(Eval("ActualProgress")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%-- <f:RenderField Width="90px" ColumnID="SchProgress" DataField="SchProgress"
<%-- <f:RenderField Width="90px" ColumnID="SchProgress" DataField="SchProgress"
FieldType="String" HeaderText="Sch.Progress" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="ActualProgress" DataField="ActualProgress"
@@ -387,7 +387,7 @@
runat="server" BodyPadding="1px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Grid ID="Grid6" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"
BoxFlex="1" DataKeyNames="" DataIDField="" OnRowDataBound="Grid6_RowDataBound"
BoxFlex="1" DataKeyNames="" DataIDField="" OnRowDataBound="Grid6_RowDataBound"
Height="300px" EnableSummary="true" SummaryPosition="Flow">
<Columns>
<f:RowNumberField EnablePagingNumber="true" Width="40px" HeaderTextAlign="Center"
@@ -485,7 +485,7 @@
<f:Tab Title="TDC" BodyPadding="1px" runat="server" AutoScroll="true">
<Items>
<f:Grid ID="GridTDC" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"
BoxFlex="1" DataKeyNames="TDCId" DataIDField="TDCId" Height="300px" >
BoxFlex="1" DataKeyNames="TDCId" DataIDField="TDCId" Height="300px">
<Columns>
<f:TemplateField Width="50px" TextAlign="Center">
<ItemTemplate>
@@ -643,6 +643,45 @@
</f:Grid>
</Items>
</f:Tab>
<f:Tab Title="Key Quantity" BodyPadding="1px" runat="server">
<Items>
<f:Grid ID="GridKeyQuantity" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"
BoxFlex="1" DataKeyNames="KeyQuantityId" DataIDField="KeyQuantityId" Height="300px">
<Columns>
<f:RenderField Width="120px" ColumnID="ProjectControl_JobNo" DataField="ProjectControl_JobNo" SortField="ProjectControl_JobNo"
FieldType="String" HeaderText="Job No" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DepartName" DataField="DepartName" SortField="DepartName"
FieldType="String" HeaderText="Type" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="DisciplinesWBSCode" DataField="DisciplinesWBSCode"
SortField="DisciplinesWBSCode" FieldType="String" HeaderText="Identifier" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="DisciplinesWBSName" DataField="DisciplinesWBSName"
FieldType="String" HeaderText="Descipline" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="QuantityDesctiption" DataField="QuantityDesctiption"
FieldType="String" HeaderText="Quantity Desctiption" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="InputQuantity" DataField="InputQuantity"
FieldType="String" HeaderText="Input Quantity" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="PlanMHRsUnit" DataField="PlanMHRsUnit"
FieldType="String" HeaderText="Plan MHRs/Unit" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="PlanMHRs" DataField="PlanMHRs"
FieldType="String" HeaderText="Plan MHRs" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="PlanMHRsSummary" DataField="PlanMHRsSummary"
FieldType="String" HeaderText="Plan MHRs Summary" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="ActualMHRs" DataField="ActualMHRs"
FieldType="String" HeaderText="Actual MHRs" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
</Items>
@@ -780,17 +819,17 @@
var ManHours = '';
var Hours = '';
var spanValue1 = 0;
var spanValue2= 0;
var spanValue2 = 0;
for (var i = 0; i < ResourcesArr.length; i++) {
if (ResourcesArr[i].DateMonth != "") {
Legendata += "'" + ResourcesArr[i].DateMonth + "',";
spanValue1 += ResourcesArr[i].ManHours;
ManHours += "" + spanValue1 + ",";
spanValue2 += ResourcesArr[i].Hours;
Hours += "" + spanValue2 + ",";
Hours += "" + spanValue2 + ",";
}
}
console.log("ManHours:"+ManHours);
console.log("ManHours:" + ManHours);
Legendata = '[' + Legendata.substring(0, Legendata.length - 1) + ']';
Legendata = eval(Legendata);
@@ -823,7 +862,7 @@
{
type: 'category',
data: Legendata,
axisLabel: {
axisLabel: {
interval: 0, //控制坐标轴刻度标签的显示间隔.设置成 0 强制显示所有标签。设置为 1，隔一个标签显示一个标签。设置为2，间隔2个标签。以此类推
rotate: -20,//倾斜度 -90 至 90 默认为0
textStyle: {
EProject/FineUIPro.Web/common/Main.aspx.cs
+21 -1
View File
@@ -226,6 +226,10 @@ namespace FineUIPro.Web.common
{
BindGrid9(eProjectId);//FCR Log
}
else if (this.TabStrip1.ActiveTabIndex == 11)
{
BindGridKeyQuantity(eProjectId);//Key Quantity
}
else
{
#region General
@@ -335,7 +339,7 @@ namespace FineUIPro.Web.common
}
else
{
this.txtCivilEng.Text = string.Empty;
this.txtCivilEng.Text = string.Empty;
}
//变更范围
if (eProject.PM_SC_ApprovedQty.HasValue)//批准的质量
@@ -995,6 +999,22 @@ namespace FineUIPro.Web.common
#endregion
#endregion
#region 加载Key Quantity
private void BindGridKeyQuantity(string eProjectId)
{
List<SqlParameter> listStr = new List<SqlParameter>
{
new SqlParameter("@eprojectId", eProjectId)
};
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("Proc_KeyQuantityLists", parameter);
this.GridKeyQuantity.RecordCount = tb.Rows.Count;
//var table = this.GetPagedDataTable(GridKeyQuantity, tb);
GridKeyQuantity.DataSource = tb;
GridKeyQuantity.DataBind();
}
#endregion
#region 查看编辑器详细信息
/// <summary>
/// 查看编辑器详细信息
EProject/FineUIPro.Web/common/Main.aspx.designer.cs
Generated
+9
View File
@@ -1013,6 +1013,15 @@ namespace FineUIPro.Web.common
/// </remarks>
protected global::FineUIPro.Grid Grid9;
/// <summary>
/// GridKeyQuantity 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid GridKeyQuantity;
/// <summary>
/// Window1 控件。
/// </summary>