lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
+9 -10
View File
@@ -1,5 +1,4 @@
using BLL;
using FastReport.Editor.Syntax;
using Model;
using Newtonsoft.Json.Linq;
using System;
@@ -97,7 +96,7 @@ namespace FineUIPro.Web.Person
{
SetPersonInfo(getPersons);
}
this.txtIdentityCard.Focus();
}
@@ -165,7 +164,7 @@ namespace FineUIPro.Web.Person
this.drpProjectRole.Enabled = true;
}
}
}
}
}
#endregion
#endregion
@@ -202,7 +201,7 @@ namespace FineUIPro.Web.Person
this.txtIdentityCard.Readonly = true;
}
var getProjectPersom = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.drpProject.SelectedValue,this.PersonId);
var getProjectPersom = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.drpProject.SelectedValue, this.PersonId);
if (getProjectPersom != null)
{
this.SitePersonId = getProjectPersom.SitePersonId;
@@ -215,7 +214,7 @@ namespace FineUIPro.Web.Person
this.SitePersonId = getProjectPerson.SitePersonId;
}
}
#region 基本信息
this.txtPersonName.Text = person.PersonName;
this.drpUnit.SelectedValue = person.UnitId;
@@ -224,13 +223,13 @@ namespace FineUIPro.Web.Person
string name = UnitService.GetUnitNameByUnitId(person.UnitId);
var getIsPost = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == person.IdentityCard && x.States != Const.ProjectPersonStates_2 && x.ProjectId != this.drpProject.SelectedValue);
if (getIsPost != null)
{
{
Alert.ShowInParent("当前人员所属单位【" + name + "】不在该项目单位中且人员在项目" + ProjectService.GetProjectNameByProjectId(getIsPost.ProjectId) + "不是【离岗】状态，请查证！", MessageBoxIcon.Warning);
}
else
{
Alert.ShowInParent("当前人员所属单位【" + name + "】不在该项目单位中，请重新选择所属单位！", MessageBoxIcon.Warning);
}
}
}
this.txtAccount.Text = person.Account;
if (person.IsForeign.HasValue)
@@ -431,7 +430,7 @@ namespace FineUIPro.Web.Person
{
this.drpUnit.SelectedValue = this.CurrUser.UnitId ?? ProjectService.getProjectUnitIdByUnitType(this.drpProject.SelectedValue, Const.ProjectUnitType_1);
}
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAuditor, this.drpProject.SelectedValue, ProjectService.getProjectUnitIdByUnitType(this.drpProject.SelectedValue,Const.ProjectUnitType_1), BLL.Const.HSSEManager + "," + BLL.Const.HSSEAssistantManager, false);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAuditor, this.drpProject.SelectedValue, ProjectService.getProjectUnitIdByUnitType(this.drpProject.SelectedValue, Const.ProjectUnitType_1), BLL.Const.HSSEManager + "," + BLL.Const.HSSEAssistantManager, false);
TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, this.drpProject.SelectedValue, this.drpUnit.SelectedValue, false);
gvWorkArea.DataSource = UnitWorkService.GetUnitWorkLists(this.drpProject.SelectedValue);
gvWorkArea.DataBind();//单位工程
@@ -774,7 +773,7 @@ namespace FineUIPro.Web.Person
}
else
{
string info="提示：";
string info = "提示：";
if (!string.IsNullOrEmpty(personInfo))
{
info += personInfo;
@@ -888,7 +887,7 @@ namespace FineUIPro.Web.Person
OutTime = Funs.GetNewDateTime(this.txtOutTime.Text),
OutResult = this.txtOutResult.Text.Trim(),
States = string.IsNullOrEmpty(this.hdStates.Text) ? Const.ProjectPersonStates_0 : this.hdStates.Text,
IsSafetyMonitoring=this.ckIsSafetyMonitoring.Checked,
IsSafetyMonitoring = this.ckIsSafetyMonitoring.Checked,
IsCQMSCheck = this.ckIsCQMSCheck.Checked
};
if (newPerson.States == Const.ProjectPersonStates_2 || newPerson.States == Const.ProjectPersonStates_R)