lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改施工方案和关键事项

Browse Source
This commit is contained in:
潘鸿锋
2024-10-12 15:27:37 +08:00
parent a360cb9448
commit d35d9efdcb
54 changed files with 10572 additions and 2051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs
+15 -9
View File
@@ -128,12 +128,12 @@ namespace FineUIPro.Web.CQMS.Solution
if (drpState.SelectedValue == "1") //已闭合
{
strSql += " AND State=@State";
listStr.Add(new SqlParameter("@State", "3"));
listStr.Add(new SqlParameter("@State", "4"));
}
else //未闭合
{
strSql += " AND State!=@State";
listStr.Add(new SqlParameter("@State", "3"));
listStr.Add(new SqlParameter("@State", "4"));
}
}
strSql += " order by chec.code desc ";
@@ -253,16 +253,21 @@ namespace FineUIPro.Web.CQMS.Solution
return;
}
}
else if (constructSolution.State == Const.CQMSConstructSolution_Audit || constructSolution.State == Const.CQMSConstructSolution_ReCompile)
//一级审核、二级审批、重报
else if (constructSolution.State == Const.CQMSConstructSolution_Audit
|| constructSolution.State == Const.CQMSConstructSolution_Audit1
|| constructSolution.State == Const.CQMSConstructSolution_ReCompile)
{
var approve = CQMSConstructSolutionApproveService.GetThisApproveByConstructSolutionId(id);
if (approve!=null && approve.ApproveMan==this.CurrUser.UserId)
//审批列表中是否包含当前用户
var approve = CQMSConstructSolutionApproveService.GetThisApproveByConstructSolutionId(id, constructSolution.State);
//if (approve!=null && approve.ApproveMan==this.CurrUser.UserId)
if (approve.Any(x=>x.ApproveMan.IndexOf(CurrUser.UserId)>-1))
{
PageContext.RegisterStartupScript(window_tt.GetShowReference(String.Format("EditConstructSolution.aspx?constructSolutionId={0}", id)));
}
else
{
Alert.ShowInTop("您不是办理用户，无法操作！请右键查看", MessageBoxIcon.Warning);
Alert.ShowInTop("您不是审核人员，无法操作！请右键查看", MessageBoxIcon.Warning);
return;
}
//Model.Solution_CQMSConstructSolutionApprove approve = CQMSConstructSolutionApproveService.GetConstructSolutionApproveByApproveMan(id, CurrUser.UserId);
@@ -285,6 +290,7 @@ namespace FineUIPro.Web.CQMS.Solution
//}
}
}
@@ -324,7 +330,7 @@ namespace FineUIPro.Web.CQMS.Solution
}
else
{
Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Success);
Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}
else
@@ -339,14 +345,14 @@ namespace FineUIPro.Web.CQMS.Solution
Alert.ShowInTop("删除成功！", MessageBoxIcon.Success);
return;
}
Alert.ShowInTop("删除失败，方案正在审批中！", MessageBoxIcon.Success);
Alert.ShowInTop("删除失败，只能删除未上报的数据！", MessageBoxIcon.Warning);
}
}
else
{
Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Success);
Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}