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

20250710 报表project_list页面与导出列表匹配

This commit is contained in:
毕文静 2025-07-10 14:12:12 +08:00
parent a4b1a94dd9
commit f3013d8c1a
4 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EProject/FineUIPro.Web/File/Excel/Project_List_Report.xlsx
View File

Binary file not shown.

10
EProject/FineUIPro.Web/Global.asax.cs
View File

@ -332,7 +332,8 @@
#region 1、填写第二张资源时，第一张资源预留一个月的时候填写人工时 2、Cancelled或Hold也预留一个月
/// <summary>
/// 填写第二张资源时，第一张资源预留一个月的时候填写人工时
/// --填写第二张资源时，第一张资源预留一个月的时候填写人工时
/// MOC和Projects项目，第一张资源Phase为Study/Concept Planning时PM_MA_ProjectApproval+一个月≤当前时间AccountDisabled为1
/// MOC和Projects项目
/// </summary>
/// <param name="sender"></param>
@ -347,10 +348,11 @@
var planLists = (from x in Funs.DB.Resource_Plan
join y in Funs.DB.Editor_EProject on x.EProjectId equals y.EProjectId
where x.EProjectId == epr.Key && (y.ProjectControl_JobType == "Projects" || y.ProjectControl_JobType == "MOC")
&& x.Phase == "Study/Concept Planning"
orderby x.CreateDate ascending
select new { x.ResourcePlanId, y.PM_MA_ProjectApproval }).ToList();
if (planLists.Count == 2)
{
//if (planLists.Count == 2)
//{
if (planLists[0].PM_MA_ProjectApproval.HasValue && planLists[0].PM_MA_ProjectApproval.Value.AddMonths(1) <= DateTime.Now)
{
string resourcePlanId = planLists[0].ResourcePlanId.ToString();
@ -361,7 +363,7 @@
Funs.DB.SubmitChanges();
}
}
}
//}
}
}

54
EProject/FineUIPro.Web/Report/ProjectListReport.aspx
View File

@ -64,17 +64,6 @@
</Operator>
</Filter>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectControl_ProjectType" DataField="ProjectControl_ProjectType"
FieldType="String" HeaderText="Proj.Type" HeaderTextAlign="Center" TextAlign="Left" EnableFilter="true">
<Filter EnableMultiFilter="true" ShowMatcher="true">
<Operator>
<f:DropDownList ID="DropDownList58" runat="server">
<f:ListItem Text="equal to" Value="equal" />
<f:ListItem Text="include" Value="contain" Selected="true" />
</f:DropDownList>
</Operator>
</Filter>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectControl_LeadByName" DataField="ProjectControl_LeadByName"
FieldType="String" HeaderText="Lead By" HeaderTextAlign="Center" TextAlign="Left" EnableFilter="true">
<Filter EnableMultiFilter="true" ShowMatcher="true">
@ -458,12 +447,6 @@
</Operator>
</Filter>
</f:RenderField>
<f:RenderField Width="80px" ColumnID="PM_Critical" DataField="PM_Critical"
FieldType="String" HeaderText="Critical" HeaderTextAlign="Center" TextAlign="Center" >
</f:RenderField>
<f:RenderField Width="120px" ColumnID="PM_ReasonForCritical" DataField="PM_ReasonForCritical"
FieldType="String" HeaderText="Reason Of Critical" HeaderTextAlign="Center" TextAlign="Center" >
</f:RenderField>
<f:RenderField Width="100px" ColumnID="IFC_Received" DataField="IFC_Received"
FieldType="String" HeaderText="IFC Received" HeaderTextAlign="Center" TextAlign="Left" EnableFilter="true">
<Filter EnableMultiFilter="true" ShowMatcher="true">
@ -698,9 +681,6 @@
<f:RenderField Width="220px" ColumnID="ProjectControl_Revised_MC_Date" DataField="ProjectControl_Revised_MC_Date"
FieldType="Date" Renderer="Date" HeaderText="Revised MC Date" HeaderTextAlign="Center" TextAlign="Left" EnableFilter="true">
</f:RenderField>
<f:RenderField Width="220px" ColumnID="CM_KickOffMetting" DataField="CM_KickOffMetting"
FieldType="Date" Renderer="Date" HeaderText="Const.Kick-off Meeting" HeaderTextAlign="Center" TextAlign="Left" EnableFilter="true">
</f:RenderField>
<%--<f:RenderField Width="150px" ColumnID="RevisedMCDate" DataField="RevisedMCDate"
FieldType="Date" Renderer="Date" HeaderText="Revised MC Date" HeaderTextAlign="Center" TextAlign="Left" EnableFilter="true">
<Filter EnableMultiFilter="true" ShowMatcher="true">
@ -728,9 +708,25 @@
</Operator>
</Filter>
</f:RenderField>
<f:RenderField Width="80px" ColumnID="PM_Critical" DataField="PM_Critical"
FieldType="String" HeaderText="Critical" HeaderTextAlign="Center" TextAlign="Center" >
</f:RenderField>
<f:RenderField Width="120px" ColumnID="PM_ReasonForCritical" DataField="PM_ReasonForCritical"
FieldType="String" HeaderText="Reason Of Critical" HeaderTextAlign="Center" TextAlign="Center" >
</f:RenderField>
<f:BoundField Width="100px" TextAlign="Center" DataField="StudyWo" HeaderTextAlign="Center" HeaderText="Study Wo" />
<f:BoundField Width="100px" TextAlign="Center" DataField="CTEInvolved" HeaderTextAlign="Center" HeaderText="CTE Involved" />
<f:BoundField Width="100px" TextAlign="Center" DataField="CAPEXPlanNo" HeaderTextAlign="Center" HeaderText="CAPEX Plan No" />
<f:BoundField Width="100px" TextAlign="Center" DataField="OutSourceType" HeaderTextAlign="Center" HeaderText="OutSource Type" />
<f:RenderField Width="100px" ColumnID="MC_ReceivedDate" DataField="MC_ReceivedDate"
FieldType="Date" Renderer="Date" HeaderText="MC Received Date" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>
<f:RenderField Width="220px" ColumnID="CM_KickOffMetting" DataField="CM_KickOffMetting"
FieldType="Date" Renderer="Date" HeaderText="Const.Kick-off Meeting" HeaderTextAlign="Center" TextAlign="Left" EnableFilter="true">
</f:RenderField>
<f:BoundField Width="100px" TextAlign="Center" DataField="ProjectControl_EMManager" HeaderTextAlign="Center" HeaderText="Engineering Manager" />
<f:BoundField Width="100px" TextAlign="Center" DataField="PM_SC_ApprovedQty" HeaderTextAlign="Center" HeaderText="Approved Qty" />
<f:BoundField Width="100px" TextAlign="Center" DataField="PM_SC_ApprovedCost" HeaderTextAlign="Center" HeaderText="Approved Cost" />
@ -740,9 +736,21 @@
<f:RenderField Width="120px" ColumnID="PM_Pre_Approval" DataField="PM_Pre_Approval"
FieldType="Date" Renderer="Date" HeaderText="Pre-Approval" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>
<%--<f:RenderField Width="120px" ColumnID="CM_KickOffMetting" DataField="CM_KickOffMetting"
FieldType="Date" Renderer="Date" HeaderText="Construction Kick Off Meeting" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>--%>
<f:BoundField Width="100px" TextAlign="Center" DataField="Job_Hold" HeaderTextAlign="Center" HeaderText="Hold" />
<f:RenderField Width="100px" ColumnID="ProjectControl_ProjectType" DataField="ProjectControl_ProjectType"
FieldType="String" HeaderText="Proj.Type" HeaderTextAlign="Center" TextAlign="Left" EnableFilter="true">
<Filter EnableMultiFilter="true" ShowMatcher="true">
<Operator>
<f:DropDownList ID="DropDownList58" runat="server">
<f:ListItem Text="equal to" Value="equal" />
<f:ListItem Text="include" Value="contain" Selected="true" />
</f:DropDownList>
</Operator>
</Filter>
</f:RenderField>
<f:RenderField Width="120px" ColumnID="PM_Remarks_Engineering" DataField="PM_Remarks_Engineering"
FieldType="String" HeaderText="Engineering Remark" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>

18
EProject/FineUIPro.Web/Report/ProjectListReport.aspx.designer.cs generated
View File

@ -131,15 +131,6 @@ namespace FineUIPro.Web.Report
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList2;
/// <summary>
/// DropDownList58 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList58;
/// <summary>
/// DropDownList3 控件。
/// </summary>
@ -644,6 +635,15 @@ namespace FineUIPro.Web.Report
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList59;
/// <summary>
/// DropDownList58 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList58;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>