lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改实施计划导出

Browse Source
This commit is contained in:
高飞
2023-07-27 09:17:32 +08:00
parent da7aaf15bd
commit 3c1ac7f7fa
2 changed files with 103 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs
+5 -2
View File
@@ -389,7 +389,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
string Id = Grid1.SelectedRowID; string Id = Grid1.SelectedRowID;
Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(Id); Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(Id);
if (actionPlanList.States != BLL.Const.ActionPlanList_Complete) if (actionPlanList.States != BLL.Const.ActionPlanList_Complete && this.CurrUser.PersonId != BLL.Const.sysglyId && this.CurrUser.PersonId != BLL.Const.hfnbdId)
{ {
Alert.ShowInTop("状态必须为审批完成的才能导出！", MessageBoxIcon.Warning); Alert.ShowInTop("状态必须为审批完成的才能导出！", MessageBoxIcon.Warning);
return; return;
@@ -645,6 +645,8 @@ namespace FineUIPro.Web.HSSE.ActionPlan
builder.EndRow(); builder.EndRow();
#endregion #endregion
foreach (var item in approves) foreach (var item in approves)
{
if (item.ApproveDate != null)
{ {
//部门名称 //部门名称
builder.InsertCell(); builder.InsertCell();
@@ -701,9 +703,10 @@ namespace FineUIPro.Web.HSSE.ActionPlan
} }
builder.EndRow(); builder.EndRow();
} }
}
foreach (var item in ActionPlan_ActionPlanListApproveList2) foreach (var item in ActionPlan_ActionPlanListApproveList2)
{ {
if (item.ApproveMan != "905a75d6-e733-449f-9742-4dcd71e8d2e1" && item.DepartId != BLL.Const.Depart_CompanyLeaderId) if (item.ApproveMan != "905a75d6-e733-449f-9742-4dcd71e8d2e1" && item.DepartId != BLL.Const.Depart_CompanyLeaderId && item.ApproveDate != null)
{ {
//部门名称 //部门名称
builder.InsertCell(); builder.InsertCell();
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanList.aspx.cs
+5 -2
View File
@@ -371,7 +371,7 @@ namespace FineUIPro.Web.ZHGL.Plan
string Id = Grid1.SelectedRowID; string Id = Grid1.SelectedRowID;
Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(Id); Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(Id);
if (actionPlanList.States != BLL.Const.ActionPlanList_Complete) if (actionPlanList.States != BLL.Const.ActionPlanList_Complete && this.CurrUser.PersonId != BLL.Const.sysglyId && this.CurrUser.PersonId != BLL.Const.hfnbdId)
{ {
Alert.ShowInTop("状态必须为审批完成的才能导出！", MessageBoxIcon.Warning); Alert.ShowInTop("状态必须为审批完成的才能导出！", MessageBoxIcon.Warning);
return; return;
@@ -627,6 +627,8 @@ namespace FineUIPro.Web.ZHGL.Plan
builder.EndRow(); builder.EndRow();
#endregion #endregion
foreach (var item in approves) foreach (var item in approves)
{
if (item.ApproveDate != null)
{ {
//部门名称 //部门名称
builder.InsertCell(); builder.InsertCell();
@@ -683,9 +685,10 @@ namespace FineUIPro.Web.ZHGL.Plan
} }
builder.EndRow(); builder.EndRow();
} }
}
foreach (var item in ActionPlan_ActionPlanListApproveList2) foreach (var item in ActionPlan_ActionPlanListApproveList2)
{ {
if (item.ApproveMan != "905a75d6-e733-449f-9742-4dcd71e8d2e1" && item.DepartId != BLL.Const.Depart_CompanyLeaderId) if (item.ApproveMan != "905a75d6-e733-449f-9742-4dcd71e8d2e1" && item.DepartId != BLL.Const.Depart_CompanyLeaderId && item.ApproveDate != null)
{ {
//部门名称 //部门名称
builder.InsertCell(); builder.InsertCell();