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/PZHGL/GJSX/GJSXListEdit.aspx.cs
+2 -2
View File
@@ -111,9 +111,9 @@ namespace FineUIPro.Web.PZHGL.GJSX
this.UserId = Request.Params["userId"];
this.UnitId = Request.Params["UnitId"];
if (!string.IsNullOrEmpty(Const.UnitId_TCC))
if (!string.IsNullOrEmpty(Const.UnitId_XJYJ))
{
this.DropUnitId.SelectedValue = Const.UnitId_TCC;
this.DropUnitId.SelectedValue = Const.UnitId_XJYJ;
}
// this.drpDepart.SelectedValue = Const.Depart_constructionId;
///角色下拉框
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionPlanEdit.aspx.cs
+9 -9
View File
@@ -95,14 +95,14 @@ namespace FineUIPro.Web.PZHGL.InformationProject
rblIsAgree.Hidden = true;
drpHandleMan.Enabled = true;
drpHandleMan.Required = true;
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
//drpHandleMan.Items.AddRange(UserService.GetAllUserList(CurrUser.LoginProjectId));
drpHandleMan.SelectedIndex = 0;
}
else
{
//------------
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
//drpHandleMan.Items.AddRange(UserService.GetAllUserList(CurrUser.LoginProjectId));
HideOptions.Hidden = false;
//Url.Visible = true; 附件查看权限 - 1
@@ -121,11 +121,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject
drpHandleMan.Items.Clear();
if (State != Const.ConstructionPlan_Audit1)
{
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
}
else
{
UserService.InitUserProjectIdUnitIdRoleIdDropDownList(drpHandleMan, string.Empty, Const.UnitId_TCC, Const.SystemManager, false);
UserService.InitUserProjectIdUnitIdRoleIdDropDownList(drpHandleMan, string.Empty, Const.UnitId_XJYJ, Const.SystemManager, false);
}
drpHandleMan.Enabled = true;
drpHandleMan.Required = true;
@@ -145,7 +145,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
State = Const.ConstructionPlan_Compile;
ConstructionPlanService.InitHandleType(drpHandleType, false, State);
this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
drpHandleMan.SelectedIndex = 0;
plApprove2.Hidden = true;
string unitId = string.Empty;
@@ -364,11 +364,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject
drpHandleType.SelectedIndex = 0;
if (drpHandleType.SelectedValue != Const.ConstructionPlan_Audit2)
{
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
}
else
{
UserService.InitUserProjectIdUnitIdRoleIdDropDownList(drpHandleMan, string.Empty, Const.UnitId_TCC, Const.SystemManager, false);
UserService.InitUserProjectIdUnitIdRoleIdDropDownList(drpHandleMan, string.Empty, Const.UnitId_XJYJ, Const.SystemManager, false);
}
drpHandleMan.SelectedIndex = 0;
if (drpHandleType.SelectedValue == Const.ConstructionPlan_Complete)
@@ -389,11 +389,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject
drpHandleType.SelectedIndex = 1;
if (drpHandleType.SelectedValue != Const.ConstructionPlan_Audit2)
{
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
}
else
{
UserService.InitUserProjectIdUnitIdRoleIdDropDownList(drpHandleMan, string.Empty, Const.UnitId_TCC, Const.SystemManager, false);
UserService.InitUserProjectIdUnitIdRoleIdDropDownList(drpHandleMan, string.Empty, Const.UnitId_XJYJ, Const.SystemManager, false);
}
drpHandleMan.SelectedIndex = 0;
if (drpHandleType.SelectedValue == Const.ConstructionPlan_ReCompile)
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionReportEdit.aspx.cs
+6 -6
View File
@@ -104,14 +104,14 @@ namespace FineUIPro.Web.PZHGL.InformationProject
rblIsAgree.Hidden = true;
drpHandleMan.Enabled = true;
drpHandleMan.Required = true;
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
//drpHandleMan.Items.AddRange(UserService.GetAllUserList(CurrUser.LoginProjectId));
drpHandleMan.SelectedIndex = 0;
}
else
{
//------------
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
//drpHandleMan.Items.AddRange(UserService.GetAllUserList(CurrUser.LoginProjectId));
HideOptions.Hidden = false;
//Url.Visible = true; 附件查看权限 - 1
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
drpHandleMan.Items.Clear();
//if (State != Const.ConstructionReport_Audit1)
//{
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
//}
//else
//{
@@ -154,7 +154,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
State = Const.ConstructionReport_Compile;
ConstructionReportService.InitHandleType(drpHandleType, false, State);
this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
drpHandleMan.SelectedIndex = 0;
plApprove2.Hidden = true;
string unitId = string.Empty;
@@ -410,7 +410,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
drpHandleType.SelectedIndex = 0;
//if (drpHandleType.SelectedValue != Const.ConstructionReport_Audit2)
//{
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
//}
//else
//{
@@ -435,7 +435,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
drpHandleType.SelectedIndex = 1;
//if (drpHandleType.SelectedValue != Const.ConstructionReport_Audit2)
//{
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
//}
//else
//{
SGGL/FineUIPro.Web/PZHGL/InformationProject/ReceiveFileManagerEdit.aspx.cs
+1 -1
View File
@@ -291,7 +291,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
if (this.rbFileType.SelectedValue == "0")
{
this.drpUnit.Readonly = true;
string unitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId;
string unitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId;
this.drpUnit.SelectedValue = unitId;
}
else
SGGL/FineUIPro.Web/PZHGL/InformationProject/WorkHandoverEdit.aspx.cs
+8 -8
View File
@@ -78,8 +78,8 @@ namespace FineUIPro.Web.PZHGL.InformationProject
HideOptions.Hidden = true;
rblIsAgree.Hidden = true;
BindData();
UserService.InitUserDropDownList(drpTransferMan, CurrUser.LoginProjectId, true, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpReceiveMan, CurrUser.LoginProjectId, true, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpTransferMan, CurrUser.LoginProjectId, true, Const.UnitId_XJYJ);
UserService.InitUserDropDownList(drpReceiveMan, CurrUser.LoginProjectId, true, Const.UnitId_XJYJ);
WorkPostService.InitWorkPostNameByTypeDropDownList2(this.drpWorkPost, "1", true); //加载管理岗位
HandleImg = 0;
if (!string.IsNullOrEmpty(WorkHandoverId))
@@ -130,14 +130,14 @@ namespace FineUIPro.Web.PZHGL.InformationProject
rblIsAgree.Hidden = true;
drpHandleMan.Enabled = true;
drpHandleMan.Required = true;
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
//drpHandleMan.Items.AddRange(UserService.GetAllUserList(CurrUser.LoginProjectId));
drpHandleMan.SelectedIndex = 0;
}
else
{
//------------
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
//drpHandleMan.Items.AddRange(UserService.GetAllUserList(CurrUser.LoginProjectId));
HideOptions.Hidden = false;
//Url.Visible = true; 附件查看权限 - 1
@@ -154,7 +154,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
else
{
drpHandleMan.Items.Clear();
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
drpHandleMan.Enabled = true;
drpHandleMan.Required = true;
}
@@ -173,7 +173,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
State = Const.WorkHandover_Compile;
WorkHandoverService.InitHandleType(drpHandleType, false, State);
this.txtTransferDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
drpHandleMan.SelectedValue = this.CurrUser.UserId;
Model.SitePerson_Person person = BLL.PersonService.GetPersonByIdentityCard(this.CurrUser.LoginProjectId, this.CurrUser.IdentityCard);
if (person != null)
@@ -404,7 +404,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
if (rblIsAgree.SelectedValue.Equals("true"))
{
drpHandleType.SelectedIndex = 0;
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
drpHandleMan.SelectedIndex = 0;
if (drpHandleType.SelectedValue == Const.WorkHandover_Complete)
{
@@ -422,7 +422,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
{
drpHandleMan.Items.Clear();
drpHandleType.SelectedIndex = 1;
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC);
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ);
drpHandleMan.SelectedIndex = 0;
if (drpHandleType.SelectedValue == Const.WorkHandover_ReCompile)
{