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

项目人员信息档案新增、导入补充：机构划分、组织单元、人员分类、员工子组、备注信息

Browse Source
This commit is contained in:
夏菊
2025-08-08 17:54:10 +08:00
parent fd849d42e1
commit 8e4dec9037
212 changed files with 2489 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Check/CheckWorkEdit.aspx.cs
+1 -1
View File
@@ -124,7 +124,7 @@ namespace FineUIPro.Web.HSSE.Check
this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
//var thisUnit = BLL.CommonService.GetIsThisUnit();
//if (thisUnit != null && thisUnit.UnitId == Const.UnitId_CWCEC)
if (this.CurrUser.UnitId == Const.UnitId_TCC)
if (this.CurrUser.UnitId == Const.UnitId_XJYJ)
{
SaveNew(true);
}
SGGL/FineUIPro.Web/HSSE/Check/IncentiveNoticeAdd.aspx.cs
+1 -1
View File
@@ -88,7 +88,7 @@ namespace FineUIPro.Web.HSSE.Check
Funs.FineUIPleaseSelect(this.drpTeamGroup);
Funs.FineUIPleaseSelect(this.drpPerson);
BLL.ConstValue.InitConstValueDropDownList(this.drpRewardType, BLL.ConstValue.Group_RewardType, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
//BindGrid(string.Empty);
this.IncentiveNoticeId = Request.Params["IncentiveNoticeId"];
this.txtCurrency.Text = "人民币";
SGGL/FineUIPro.Web/HSSE/Check/IncentiveNoticeEdit.aspx.cs
+4 -4
View File
@@ -149,14 +149,14 @@ namespace FineUIPro.Web.HSSE.Check
{
this.IsAgree.Hidden = false;
this.GroupPanel2.Hidden = false;
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//总包项目经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//总包项目经理
this.drpHandleMan.Label = "总包项目经理";
if (!string.IsNullOrEmpty(incentiveNotice.ApproveMan))
{
this.drpHandleMan.SelectedValue = incentiveNotice.ApproveMan;
}
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//施工经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//施工经理
BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpUnitHeadMan, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true);//分包单位
}
@@ -348,7 +348,7 @@ namespace FineUIPro.Web.HSSE.Check
this.NoAgree.Hidden = true;
if (State == "1")
{
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//总包项目经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//总包项目经理
this.drpHandleMan.Label = "总包项目经理";
this.GroupPanel2.Hidden = false;
}
SGGL/FineUIPro.Web/HSSE/Check/PauseNoticeAdd.aspx.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace FineUIPro.Web.HSSE.Check
this.ProjectId = this.CurrUser.LoginProjectId;
this.PauseNoticeId = Request.Params["PauseNoticeId"];
this.InitDropDownList();
BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC,Const.ConstructionManager, true);
BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ,Const.ConstructionManager, true);
if (!string.IsNullOrEmpty(PauseNoticeId))
{
SGGL/FineUIPro.Web/HSSE/Check/PauseNoticeEdit.aspx.cs
+5 -5
View File
@@ -118,16 +118,16 @@ namespace FineUIPro.Web.HSSE.Check
{
this.IsAgree.Hidden = false;
//UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, Const.ProjectManager, true);
//UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, Const.ProjectManager, true);
this.drpHandleMan.Label = "总包项目经理";
if (!string.IsNullOrEmpty(pauseNotice.ApproveManId)) {
this.drpHandleMan.SelectedValue = pauseNotice.ApproveManId;
}
this.GroupPanel2.Hidden = false;
gvCarryUser.DataSource = BLL.UserService.GetProjectRoleUserListByProjectId(this.CurrUser.LoginProjectId, Const.UnitId_TCC);
gvCarryUser.DataSource = BLL.UserService.GetProjectRoleUserListByProjectId(this.CurrUser.LoginProjectId, Const.UnitId_XJYJ);
gvCarryUser.DataBind();//专业工程师
BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, Const.ConstructionManager, true);
BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, Const.ConstructionManager, true);
//施工经理
//UserService.InitUserProjectIdUnitIdDropDownList(this.drpUnitHeadMan, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true);//分包单位
girdConMan.DataSource = BLL.UserService.GetProjectRoleUserListByProjectId(this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue);
@@ -442,7 +442,7 @@ namespace FineUIPro.Web.HSSE.Check
this.NoAgree.Hidden = true;
if (State == "1") {
UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
this.drpHandleMan.Label = "总包项目经理";
this.GroupPanel2.Hidden = false;
}
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.cs
+3 -3
View File
@@ -60,8 +60,8 @@ namespace FineUIPro.Web.HSSE.Check
this.InitDropDownList();
this.PunishNoticeId = Request.Params["PunishNoticeId"];
this.txtCurrency.Text = "人民币";
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpPunishPersonId, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpPunishPersonId, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
if (!string.IsNullOrEmpty(this.PunishNoticeId))
{
BindGrid();
@@ -495,7 +495,7 @@ namespace FineUIPro.Web.HSSE.Check
}
else
{
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpPunishPersonId, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpPunishPersonId, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
}
}
}
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.cs
+4 -4
View File
@@ -133,14 +133,14 @@ namespace FineUIPro.Web.HSSE.Check
{
this.IsAgree.Hidden = false;
this.GroupPanel2.Hidden = false;
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//总包项目经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//总包项目经理
this.drpHandleMan.Label = "总包施工经理";
if (!string.IsNullOrEmpty(punishNotice.ApproveMan))
{
this.drpHandleMan.SelectedValue = punishNotice.ApproveMan;
}
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//施工经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//施工经理
BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpUnitHeadMan, this.CurrUser.LoginProjectId, this.drpUnitId.SelectedValue, true);//分包单位
}
@@ -430,7 +430,7 @@ namespace FineUIPro.Web.HSSE.Check
this.NoAgree.Hidden = true;
if (State == "1")
{
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//总包施工经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//总包施工经理
this.drpHandleMan.Label = "总包施工经理";
this.GroupPanel2.Hidden = false;
}
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs
+4 -4
View File
@@ -36,11 +36,11 @@ namespace FineUIPro.Web.HSSE.Check
{
RectifyNoticesId = Request.Params["RectifyNoticesId"];
/// 专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
/// 施工经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
/// 项目经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProjectManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProjectManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
var getRectifyNotices = RectifyNoticesService.GetRectifyNoticesById(RectifyNoticesId);
if (getRectifyNotices != null)
{
@@ -292,7 +292,7 @@ namespace FineUIPro.Web.HSSE.Check
//else if (getRectifyNotices.States == Const.State_3)
//{
// this.drpOperateMan.Label = "安全经理/安全工程师";
// UserService.InitUserProjectIdUnitIdDropDownList(this.drpOperateMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
// UserService.InitUserProjectIdUnitIdDropDownList(this.drpOperateMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
// this.drpOperateMan.SelectedValue = getRectifyNotices.CompleteManId;
//}
}
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs
+5 -5
View File
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.HSSE.Check
//区域
BLL.UnitWorkService.InitUnitWorkDownList(this.drpWorkAreaId, this.CurrUser.LoginProjectId, true);
///安全经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
///检察人员
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpCheckMan, this.CurrUser.LoginProjectId, null, true);
@@ -138,9 +138,9 @@ namespace FineUIPro.Web.HSSE.Check
//this.Itemcontent.Hidden = true;
//this.btnSure.Hidden = true;
BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpDutyPerson, this.CurrUser.LoginProjectId, this.drpUnitId.SelectedValue, true);//接收人
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//施工经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProjectManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//项目经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//施工经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProjectManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//项目经理
var datas = Grid1.GetMergedData();
if (datas != null)
@@ -234,7 +234,7 @@ namespace FineUIPro.Web.HSSE.Check
//this.Itemcontent.Hidden = true;
//this.btnSure.Hidden = true;
//复查人
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpCheckPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpCheckPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
this.drpCheckPerson.SelectedValue = RectifyNotices.CompleteManId;
}
else if (State == "4")