提交代码

This commit is contained in:
2023-11-23 16:50:57 +08:00
parent aedd071d96
commit 1530dd850b
27 changed files with 974 additions and 250 deletions
@@ -37,9 +37,9 @@ namespace FineUIPro.Web.HJGL.PersonManage
Model.SitePerson_Person welder = BLL.SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, this.tvControlItem.SelectedNodeID);
if (welder != null)
{
this.btnEdit.Hidden = false;
this.btnNew.Hidden = false;
this.btnDelete.Hidden = false;
//this.btnEdit.Hidden = false;
//this.btnNew.Hidden = false;
//this.btnDelete.Hidden = false;
this.txtWelderCode.Text = welder.WelderCode;
this.txtWelderName.Text = welder.PersonName;
@@ -191,7 +191,15 @@ namespace FineUIPro.Web.HJGL.PersonManage
rootNode.Text = item.UnitName;
rootNode.EnableClickEvent = true;
this.tvControlItem.Nodes.Add(rootNode);
var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Welder && x.UnitId == item.UnitId && x.WelderCode.Contains(txtQueryWelderCode.Text.Trim()) select x).ToList();
var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Welder && x.UnitId == item.UnitId select x).ToList();
if (!string.IsNullOrEmpty(txtQueryWelderCode.Text.Trim()))
{
getWelders = getWelders.Where(x => x.WelderCode.Contains(txtQueryWelderCode.Text.Trim())).ToList();
}
if (!string.IsNullOrEmpty(txtName.Text.Trim()))
{
getWelders = getWelders.Where(x => x.PersonName.Contains(txtName.Text.Trim())).ToList();
}
foreach (var sitem in getWelders)
{
TreeNode tn = new TreeNode();
@@ -202,7 +210,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
}
else
{
tn.Text = sitem.PersonName+"【"+ sitem.WelderCode + "】";
tn.Text = sitem.PersonName + "【" + sitem.WelderCode + "】";
}
tn.EnableClickEvent = true;
rootNode.Nodes.Add(tn);
@@ -565,6 +573,6 @@ namespace FineUIPro.Web.HJGL.PersonManage
#endregion
}
}