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-02-19 09:01:54 +08:00
parent 032a26538d 7e66339f48
commit 564cd04a44
36 changed files with 997 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/PersonManage/CheckerManage.aspx.cs
+2 -2
View File
@@ -117,11 +117,11 @@ namespace FineUIPro.Web.CQMS.PersonManage
tn.NodeID = sitem.PersonId;
if (sitem.States != Const.State_1)
{
tn.Text = "<font color='#EE0000'>" + sitem.PersonName + "</font>";
tn.Text = "<font color='#EE0000'>" + sitem.PersonName + "【" + sitem.WelderCode + "】" + "</font>";
}
else
{
tn.Text = sitem.PersonName;
tn.Text = sitem.PersonName + "【" + sitem.WelderCode + "】";
}
tn.EnableClickEvent = true;
rootNode.Nodes.Add(tn);
SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx
+1 -1
View File
@@ -29,7 +29,7 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="200px" Title="单位名称"
EnableCollapse="true" Width="250px" Title="单位名称"
ShowBorder="true" Layout="VBox" ShowHeader="true" AutoScroll="true" BodyPadding="5px"
IconFont="ArrowCircleLeft">
<Items>
SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
+2 -2
View File
@@ -198,11 +198,11 @@ namespace FineUIPro.Web.CQMS.PersonManage
tn.NodeID = sitem.PersonId;
if (sitem.States != Const.State_1)
{
tn.Text = "<font color='#EE0000'>" + sitem.PersonName + "</font>";
tn.Text = "<font color='#EE0000'>" + sitem.PersonName + "【" + sitem.WelderCode + "】" + "</font>";
}
else
{
tn.Text = sitem.PersonName;
tn.Text = sitem.PersonName+"【" + sitem.WelderCode + "】";
}
tn.EnableClickEvent = true;
rootNode.Nodes.Add(tn);