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

111

Browse Source
This commit is contained in:
佘春生
2024-06-21 17:46:05 +08:00
parent b4cb26f6f8
commit 8368dfde9b
18 changed files with 572 additions and 1244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EProject/FineUIPro.Web/Report/ProjectListReport.aspx.cs
+3
View File
@@ -1380,6 +1380,9 @@ namespace FineUIPro.Web.Report
projectList.GetRow(rowIndex).GetCell(72).SetCellValue((DateTime)Convert.ToDateTime(itemOver.PM_Pre_Approval));
projectList.GetRow(rowIndex).GetCell(72).CellStyle = styleDate;
}
if (projectList.GetRow(rowIndex).GetCell(73) == null) projectList.GetRow(rowIndex).CreateCell(73);
projectList.GetRow(rowIndex).GetCell(73).SetCellValue(itemOver.Job_Hold);
projectList.GetRow(rowIndex).GetCell(73).CellStyle = styleQfw;
#endregion
EProject/FineUIPro.Web/Report/TimeSheetReport.aspx.cs
+34 -1
View File
@@ -283,7 +283,40 @@ namespace FineUIPro.Web.Report
reportModel.GetRow(rowIndex).GetCell(5).CellStyle = styleCenter;
//Act. Type
if (reportModel.GetRow(rowIndex).GetCell(6) == null) reportModel.GetRow(rowIndex).CreateCell(6);
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(table.Rows[i]["ActType"].ToString());
if (table.Rows[i]["Type"].ToString().Contains("T01_OverTime"))
{
string actType = table.Rows[i]["ActType"].ToString();
if (actType.Contains("2"))
{
string actStr = actType + "1";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
}
else if (table.Rows[i]["Type"].ToString().Contains("T02_OverTime"))
{
string actType = table.Rows[i]["ActType"].ToString();
if (actType.Contains("2"))
{
string actStr = actType + "2";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
}
else if (table.Rows[i]["Type"].ToString().Contains("T03_OverTime"))
{
string actType = table.Rows[i]["ActType"].ToString();
if (actType.Contains("2"))
{
string actStr = actType + "3";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
}
else
{
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(table.Rows[i]["ActType"].ToString());
}
reportModel.GetRow(rowIndex).GetCell(6).CellStyle = styleCenter;
//Hours
if (!string.IsNullOrEmpty(table.Rows[i]["Hours"].ToString()))