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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2023-03-09 15:02:20 +08:00
parent ffa50f752f 2d08616184
commit d9263b8489
6 changed files with 65 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
+1 -1
View File
@@ -191,7 +191,7 @@ namespace FineUIPro.Web.CQMS.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.States == Const.ProjectPersonStates_1 && 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.States == Const.ProjectPersonStates_1 && x.UnitId == item.UnitId select x).ToList();
if (!string.IsNullOrEmpty(txtQueryWelderCode.Text.Trim()))
{
getWelders = getWelders.Where(x => x.WelderCode.Contains(txtQueryWelderCode.Text.Trim())).ToList();
SGGL/FineUIPro.Web/Person/DepartPerson.aspx
+2 -2
View File
@@ -106,7 +106,7 @@
<asp:Label ID="lbIsPost" runat="server" Text='<%# GetIsPost(Eval("IsPost")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="90px" ColumnID="CurrentProjectName" DataField="CurrentProjectName"
<f:RenderField Width="120px" ColumnID="CurrentProjectName" DataField="CurrentProjectName"
FieldType="String" HeaderText="当前项目" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="CurrentProjectWorkPostName" DataField="CurrentProjectWorkPostName"
@@ -157,7 +157,7 @@
<f:RenderField Width="100px" ColumnID="RelativeTel" DataField="RelativeTel" Hidden="true"
FieldType="String" HeaderText="亲属电话" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="80px" ColumnID="Actions" HeaderText="操作" HeaderTextAlign="Center" TextAlign="Center">
<f:TemplateField Width="70px" ColumnID="Actions" HeaderText="操作" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<div class="action btncontainer"></div>
</ItemTemplate>