2023-10-19

This commit is contained in:
2023-10-19 21:44:34 +08:00
parent c90f8f4cba
commit 3f9510cede
13 changed files with 250 additions and 329 deletions
@@ -255,27 +255,35 @@ namespace FineUIPro.Web.CQMS.Solution
}
else if (constructSolution.State == Const.CQMSConstructSolution_Audit || constructSolution.State == Const.CQMSConstructSolution_ReCompile)
{
Model.Solution_CQMSConstructSolutionApprove approve = CQMSConstructSolutionApproveService.GetConstructSolutionApproveByApproveMan(id, CurrUser.UserId);
if (approve != null || CurrUser.UserId == Const.sysglyId)
var approve = CQMSConstructSolutionApproveService.GetThisApproveByConstructSolutionId(id);
if (approve!=null && approve.ApproveMan==this.CurrUser.UserId)
{
PageContext.RegisterStartupScript(window_tt.GetShowReference(String.Format("EditConstructSolution.aspx?constructSolutionId={0}", id)));
return;
//Response.Redirect("CQMSConstructSolutionAudit.aspx?constructSolutionId=" + id);
//PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckListView.aspx?CheckControlCode={0}", id, "查看 - ")));
}
else
{
if (constructSolution.CompileMan.Equals(CurrUser.UserId))
{
PageContext.RegisterStartupScript(window_tt.GetShowReference(String.Format("EditConstructSolution.aspx?constructSolutionId={0}", id)));
}
else
{
Alert.ShowInTop("您不是办理用户,无法操作!请右键查看", MessageBoxIcon.Warning);
return;
}
Alert.ShowInTop("您不是办理用户,无法操作!请右键查看", MessageBoxIcon.Warning);
return;
}
//Model.Solution_CQMSConstructSolutionApprove approve = CQMSConstructSolutionApproveService.GetConstructSolutionApproveByApproveMan(id, CurrUser.UserId);
//if (approve != null || CurrUser.UserId == Const.sysglyId)
//{
// PageContext.RegisterStartupScript(window_tt.GetShowReference(String.Format("EditConstructSolution.aspx?constructSolutionId={0}", id)));
// return;
//}
//else
//{
// if (constructSolution.CompileMan.Equals(CurrUser.UserId))
// {
// PageContext.RegisterStartupScript(window_tt.GetShowReference(String.Format("EditConstructSolution.aspx?constructSolutionId={0}", id)));
// }
// else
// {
// Alert.ShowInTop("您不是办理用户,无法操作!请右键查看", MessageBoxIcon.Warning);
// return;
// }
//}
}