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

11

Browse Source
This commit is contained in:
佘春生
2024-11-11 16:10:08 +08:00
parent 2e14c723c8
commit 809c06a3cb
55 changed files with 769 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EProject/FineUIPro.Web/ResourcePlan/ResourcePlan.aspx
+1 -1
View File
@@ -21,7 +21,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
EProject/FineUIPro.Web/ResourcePlan/ResourcePlan.aspx.cs
+14 -1
View File
@@ -75,7 +75,7 @@ namespace FineUIPro.Web.ResourcePlan
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -578,6 +578,19 @@ namespace FineUIPro.Web.ResourcePlan
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/ResourcePlan/ResourcePlanAdd.aspx.cs
+11 -9
View File
@@ -617,15 +617,17 @@ namespace FineUIPro.Web.ResourcePlan
ProjectControlAccount = string.Empty;
}
// 后加条件，当创建第二个资源时，项目批准日期不为空时项目状态为On Going
if (eProject.PM_MA_ProjectApproval.HasValue && (eProject.ProjectControl_JobStatus == "Not Start" || eProject.ProjectControl_JobStatus == "Study"))
{
EProjects.ProjectControl_JobStatus = "On Going";
}
else
{
EProjects.ProjectControl_JobStatus = eProject.ProjectControl_JobStatus;
}
// 后加条件，当创建第二个资源时，项目批准日期不为空时项目状态为On Going 不要了 修改于2024.07.03
//if (eProject.ProjectControl_JobType == "Other" && eProject.PM_MA_ProjectApproval.HasValue && !eProject.CM_MA_MC.HasValue
// && (eProject.ProjectControl_JobStatus == "Not Start" || eProject.ProjectControl_JobStatus == "Study"))
//{
// EProjects.ProjectControl_JobStatus = "On Going";
//}
//else
//{
// EProjects.ProjectControl_JobStatus = eProject.ProjectControl_JobStatus;
//}
//(现增加第二张资源一个月后关闭)
//if(eProject.ProjectControl_JobType == "MOC")
//{