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/ManHours/ManHours.aspx.cs
+11 -1
View File
@@ -87,7 +87,7 @@ namespace FineUIPro.Web.ManHours
{
JobType = this.drpJobType.SelectedValue;
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
JobStatus = this.drpJobStatus.SelectedValue;
}
@@ -155,6 +155,16 @@ namespace FineUIPro.Web.ManHours
/// <param name="e"></param>
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);
}
if (hidpersonnel.Text == "D@" + BLL.Const.CTE_DepartId)
{
BindGrid("");
EProject/FineUIPro.Web/ManHours/SelectPlan.aspx.cs
+1 -1
View File
@@ -54,7 +54,7 @@ namespace FineUIPro.Web.ManHours
{
string strSql = @"SELECT * from View_NewManHours_Plan
WHERE AccountDisabled=0 and IsCalculated=1
AND (ProjectControl_JobStatus='Detail Design' OR ProjectControl_JobStatus='In Construction' OR ProjectControl_JobStatus='In Procurement'
AND (ProjectControl_JobStatus='Detailed Design' OR ProjectControl_JobStatus='In Construction' OR ProjectControl_JobStatus='In Procurement'
OR ProjectControl_JobStatus='Not Start' OR ProjectControl_JobStatus='On Going'
OR (ProjectControl_JobStatus='Cancelled' AND DATEDIFF(DAY,ProjectControl_PC_CancelDate,GETDATE())<=31)
OR (ProjectControl_JobStatus='MC' and DATEDIFF(MONTH,CM_MA_MC,GETDATE())<=4)