lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0225-001-gaofei

This commit is contained in:
gaofei 2022-02-25 10:16:00 +08:00
parent 74f7cd5c17
commit 84b15f0d8b
2 changed files with 100 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SGGL/BLL/JDGL/WBS/WorkloadStatisticsService.cs
View File

@ -766,6 +766,8 @@ namespace BLL
newList = (from x in newList where x.WBSType != "Installation" && x.WBSType != "CnProfession" && x.OldCnProfessionId.ToString() == cnProfessionId && x.OldUnitProjectCode == unitProjectCode select x).ToList(); newList = (from x in newList where x.WBSType != "Installation" && x.WBSType != "CnProfession" && x.OldCnProfessionId.ToString() == cnProfessionId && x.OldUnitProjectCode == unitProjectCode select x).ToList();
var up = newList.FirstOrDefault(x => x.WBSType == "UnitProject" && x.OldUnitProjectCode == unitProjectCode); var up = newList.FirstOrDefault(x => x.WBSType == "UnitProject" && x.OldUnitProjectCode == unitProjectCode);
parentRow = table.NewRow(); parentRow = table.NewRow();
if (up != null)
{
parentRow[0] = up.Id; parentRow[0] = up.Id;
parentRow[1] = "0"; parentRow[1] = "0";
parentRow[2] = up.Name; parentRow[2] = up.Name;
@ -880,6 +882,7 @@ namespace BLL
table.Rows.Add(parentRow); table.Rows.Add(parentRow);
} }
} }
}
#endregion #endregion
#region 按工作包 #region 按工作包
else else

2
SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs
View File

@ -84,7 +84,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.EndDate); this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.EndDate);
} }
} }
this.txtPeriod.ReadOnly = true; //this.txtPeriod.ReadOnly = true;
//this.txtStartDate.Enabled = false; //this.txtStartDate.Enabled = false;
//this.txtEndDate.Enabled = false; //this.txtEndDate.Enabled = false;
GetThisWeekOrMonthContentList(this.ReportId);//本月主要工作内容 GetThisWeekOrMonthContentList(this.ReportId);//本月主要工作内容