lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20210829

Browse Source
This commit is contained in:
杨红卫
2021-08-29 12:41:15 +08:00
parent c2b5344d0f
commit 969c81925b
5 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs
+4
View File
@@ -250,6 +250,10 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
result += "第" + (i + 2).ToString() + "行," + "身份证号码" + "," + "[" + col4 + "]已存在！" + "|";
}
if (!IDCardValid.CheckIDCard(col4))
{
result += "第" + (i + 2).ToString() + "行," + "身份证号码" + "," + "[" + col4 + "]非法！" + "|";
}
}
else
{
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx
+1 -5
View File
@@ -90,7 +90,6 @@
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="dataload" Handler="onGridDataLoad" />
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
@@ -133,10 +132,7 @@
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
function onGridDataLoad(event) {
this.mergeColumns(['UnitName']);
}
</script>
</body>
</html>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx.cs
+4 -11
View File
@@ -120,11 +120,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
if (person != null)
{
idCards += person.IdentityCard + ",";
workAreaIds += person.WorkAreaId;
if (!string.IsNullOrEmpty(person.WorkAreaId))
{
workAreaNames += BLL.UnitWorkService.getUnitWorkByUnitWorkId(person.WorkAreaId).UnitWorkName + ",";
}
workAreaIds += person.WorkAreaId;
}
}
if (!string.IsNullOrEmpty(idCards))
@@ -134,11 +130,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
if (!string.IsNullOrEmpty(workAreaIds))
{
this.drpWorkArea.SelectedValueArray = workAreaIds.Split(',');
}
if (!string.IsNullOrEmpty(workAreaNames))
{
this.txtWorkArea.Text = workAreaNames.Substring(0, workAreaNames.LastIndexOf(','));
}
this.txtWorkArea.Text = UnitWorkService.GetUnitWorkName(workAreaIds);
}
}
}
#endregion
@@ -258,7 +251,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
if (!string.IsNullOrEmpty(person.WorkAreaId))
{
personInfo.WorkAreaId = person.WorkAreaId;
personInfo.WorkAreaName = BLL.UnitWorkService.getUnitWorkByUnitWorkId(person.WorkAreaId).UnitWorkName;
personInfo.WorkAreaName = BLL.UnitWorkService.GetUnitWorkName(person.WorkAreaId);
}
}
personInfo.Address = this.txtAddress.Text.Trim();