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
@@ -129,6 +129,19 @@ namespace FineUIPro.Web.Report
valid = true;
}
}
if (column == "ProjectControl_ProjectType")
{
string sourceValue = sourceObj.ToString();
string fillteredValue = fillteredObj.ToString();
if (fillteredOperator == "equal" && sourceValue == fillteredValue)
{
valid = true;
}
else if (fillteredOperator == "contain" && sourceValue.Contains(fillteredValue))
{
valid = true;
}
}
if (column == "ProjectControl_LeadByName")
{
string sourceValue = sourceObj.ToString();
@@ -823,6 +836,7 @@ namespace FineUIPro.Web.Report
if (projectList.GetRow(rowIndex).GetCell(2) == null) projectList.GetRow(rowIndex).CreateCell(2);
projectList.GetRow(rowIndex).GetCell(2).SetCellValue(itemOver.ProjectControl_JobType);
projectList.GetRow(rowIndex).GetCell(2).CellStyle.SetFont(cs_content_Font);
//Lead By
if (projectList.GetRow(rowIndex).GetCell(3) == null) projectList.GetRow(rowIndex).CreateCell(3);
projectList.GetRow(rowIndex).GetCell(3).SetCellValue(itemOver.ProjectControl_LeadByName);
@@ -1384,6 +1398,11 @@ namespace FineUIPro.Web.Report
projectList.GetRow(rowIndex).GetCell(73).SetCellValue(itemOver.Job_Hold);
projectList.GetRow(rowIndex).GetCell(73).CellStyle = styleQfw;
//Proj.Type
if (projectList.GetRow(rowIndex).GetCell(74) == null) projectList.GetRow(rowIndex).CreateCell(74);
projectList.GetRow(rowIndex).GetCell(74).SetCellValue(itemOver.ProjectControl_ProjectType);
projectList.GetRow(rowIndex).GetCell(74).CellStyle.SetFont(cs_content_Font);
#endregion
rowIndex++;