Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New
This commit is contained in:
@@ -79,12 +79,17 @@ namespace FineUIPro.Web.HSSE.Manager
|
||||
{
|
||||
MonthReportId = Request.Params["MonthReportId"];
|
||||
}
|
||||
|
||||
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.CompileManId, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, null, false);
|
||||
var units = BLL.ProjectUnitService.GetProjectUnitListByProjectIdUnitType(this.CurrUser.LoginProjectId,BLL.Const.ProjectUnitType_1);
|
||||
string unitId = Const.UnitId_SEDIN;
|
||||
if (units.Count > 0)
|
||||
{
|
||||
unitId = units[0].UnitId;
|
||||
}
|
||||
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.CompileManId, this.CurrUser.LoginProjectId, unitId, null, false);
|
||||
this.CompileManId.SelectedValue = this.CurrUser.PersonId;
|
||||
|
||||
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.AuditManId, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, Const.ProjectSafetyDirector, false);
|
||||
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.ApprovalManId, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, Const.ProjectAssistantManager + "," + Const.ProjectManager, false);
|
||||
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.AuditManId, this.CurrUser.LoginProjectId, unitId, Const.ProjectSafetyDirector, false);
|
||||
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.ApprovalManId, this.CurrUser.LoginProjectId, unitId, Const.ProjectAssistantManager + "," + Const.ProjectManager, false);
|
||||
|
||||
string montvalues = ReporMonth.Text;
|
||||
var getMont = Funs.DB.SeDin_MonthReport.FirstOrDefault(x => x.MonthReportId == this.MonthReportId);
|
||||
@@ -1373,7 +1378,13 @@ namespace FineUIPro.Web.HSSE.Manager
|
||||
if (this.rbIsAgree.SelectedValue == "0")
|
||||
{
|
||||
this.drpStep.Hidden = true;
|
||||
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, null, false);
|
||||
var units = BLL.ProjectUnitService.GetProjectUnitListByProjectIdUnitType(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_1);
|
||||
string unitId = Const.UnitId_SEDIN;
|
||||
if (units.Count > 0)
|
||||
{
|
||||
unitId = units[0].UnitId;
|
||||
}
|
||||
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, unitId, null, false);
|
||||
this.drpAudit.SelectedValue = this.CompileManId.SelectedValue;
|
||||
this.drpAudit.Readonly = true;
|
||||
|
||||
@@ -1412,13 +1423,19 @@ namespace FineUIPro.Web.HSSE.Manager
|
||||
private void SetStepDrp()
|
||||
{
|
||||
this.drpAudit.Items.Clear();
|
||||
var units = BLL.ProjectUnitService.GetProjectUnitListByProjectIdUnitType(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_1);
|
||||
string unitId = Const.UnitId_SEDIN;
|
||||
if (units.Count > 0)
|
||||
{
|
||||
unitId = units[0].UnitId;
|
||||
}
|
||||
if (this.drpStep.SelectedValue == Const.State_1)
|
||||
{
|
||||
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, Const.ProjectSafetyDirector, false);
|
||||
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, unitId, Const.ProjectSafetyDirector, false);
|
||||
}
|
||||
else
|
||||
{
|
||||
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, Const.ProjectManager + "," + Const.ProjectAssistantManager, false);
|
||||
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, unitId, Const.ProjectManager + "," + Const.ProjectAssistantManager, false);
|
||||
}
|
||||
if (this.States == Const.State_0 || string.IsNullOrEmpty(this.States)) ///待提交
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user