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-03 09:47:13 +08:00
parent a4f541fd35
commit f5a5663374
3 changed files with 94 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs
+29 -29
View File
@@ -171,26 +171,26 @@ namespace FineUIPro.Web.HSSE.ActionPlan
Panel2.Enabled = false;
}
//提交版本人多次修改
if (actionPlanList.CompileMan.Equals(CurrUser.PersonId))
{
txtActionPlanListCode.Enabled = true;
txtActionPlanListName.Enabled = true;
txtVersionNo.Enabled = true;
drpProjectType.Enabled = true;
drpCompileMan.Enabled = true;
txtCompileDate.Enabled = true;
ContactImg = 0;
Panel2.Enabled = true;
Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId);
if (approve == null)
{
rblIsAgree.Hidden = true;
rblIsAgree.Required = false;
options.Hidden = true;
txtOptions.Required = false;
optio.Hidden = true;
}
}
//if (actionPlanList.CompileMan.Equals(CurrUser.PersonId))
//{
// txtActionPlanListCode.Enabled = true;
// txtActionPlanListName.Enabled = true;
// txtVersionNo.Enabled = true;
// drpProjectType.Enabled = true;
// drpCompileMan.Enabled = true;
// txtCompileDate.Enabled = true;
// ContactImg = 0;
// Panel2.Enabled = true;
// Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId);
// if (approve == null)
// {
// rblIsAgree.Hidden = true;
// rblIsAgree.Required = false;
// options.Hidden = true;
// txtOptions.Required = false;
// optio.Hidden = true;
// }
//}
}
WindowAtt_Close(null, null);
}
@@ -514,15 +514,15 @@ namespace FineUIPro.Web.HSSE.ActionPlan
actionPlanList.States = actionPlanList1.States;
}
//提交时候，更新提交版本
if (CurrUser.PersonId.Equals(actionPlanList1.CompileMan))
{
if (actionPlanList1.States != Const.ActionPlanList_Audit)
{
edtion++;
}
actionPlanList.Edition = Convert.ToInt32(edtion);
actionPlanList.States = Const.ActionPlanList_Audit;
}
//if (CurrUser.PersonId.Equals(actionPlanList1.CompileMan))
//{
// if (actionPlanList1.States != Const.ActionPlanList_Audit)
// {
// edtion++;
// }
// actionPlanList.Edition = Convert.ToInt32(edtion);
// actionPlanList.States = Const.ActionPlanList_Audit;
//}
BLL.ActionPlanListService.UpdateActionPlanList(actionPlanList);
//判断状态，全部会签同意，则审批完成
if (type == BLL.Const.BtnSubmit)
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs
+19 -19
View File
@@ -228,25 +228,25 @@ namespace FineUIPro.Web.ZHGL.Plan
this.gvDepart.EnableRowDoubleClickEvent = false;
}
//提交版本人多次修改
if (actionPlanList.CompileMan.Equals(CurrUser.PersonId))
{
txtActionPlanListCode.Enabled = true;
txtActionPlanListName.Enabled = true;
txtVersionNo.Enabled = true;
drpProjectType.Enabled = true;
drpCompileMan.Enabled = true;
txtCompileDate.Enabled = true;
ContactImg = 0;
Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId);
if (approve == null)
{
rblIsAgree.Hidden = true;
rblIsAgree.Required = false;
options.Hidden = true;
txtOptions.Required = false;
optio.Hidden = true;
}
}
//if (actionPlanList.CompileMan.Equals(CurrUser.PersonId))
//{
// txtActionPlanListCode.Enabled = true;
// txtActionPlanListName.Enabled = true;
// txtVersionNo.Enabled = true;
// drpProjectType.Enabled = true;
// drpCompileMan.Enabled = true;
// txtCompileDate.Enabled = true;
// ContactImg = 0;
// Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId);
// if (approve == null)
// {
// rblIsAgree.Hidden = true;
// rblIsAgree.Required = false;
// options.Hidden = true;
// txtOptions.Required = false;
// optio.Hidden = true;
// }
//}
}
WindowAtt_Close(null, null);
}