diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs index cdd7ea8a..3ba9a950 100644 --- a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs @@ -37,7 +37,7 @@ 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.btnEdit.Hidden = false; //this.btnNew.Hidden = false; //this.btnDelete.Hidden = false; this.txtWelderCode.Text = welder.WelderCode; @@ -47,29 +47,33 @@ namespace FineUIPro.Web.HJGL.PersonManage { this.drpUnitId.Text = UnitService.GetUnitNameByUnitId(welder.UnitId); } - //this.rblSex.Text = welder.Sex == "1" ? "男" : "女"; - //if (welder.Birthday.HasValue) - //{ - // this.txtBirthday.Text = string.Format("{0:yyyy-MM-dd}", welder.Birthday); - //} - this.txtCertificateCode.Text = welder.CertificateCode; - //if (string.IsNullOrEmpty(welder.CertificateCode)) - //{ - // this.txtCertificateCode.Text = welder.IdentityCard; - //} - if (welder.CertificateLimitTime.HasValue) + Model.Person_Persons person = BLL.Person_PersonsService.GetPerson_PersonsById(welder.PersonId); + if (person != null) { - this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", welder.CertificateLimitTime); + this.rblSex.Text = person.Sex == "1" ? "男" : "女"; + if (person.Birthday.HasValue) + { + this.txtBirthday.Text = string.Format("{0:yyyy-MM-dd}", person.Birthday); + } + this.txtCertificateCode.Text = welder.CertificateCode; + if (string.IsNullOrEmpty(welder.CertificateCode)) + { + this.txtCertificateCode.Text = welder.CertificateCode; + } + if (welder.CertificateLimitTime.HasValue) + { + this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", welder.CertificateLimitTime); + } + this.txtWelderLevel.Text = welder.WelderLevel; + if (welder.States == Const.State_1) + { + cbIsOnDuty.Checked = true; + } + else + { + cbIsOnDuty.Checked = false; + } } - this.txtWelderLevel.Text = welder.WelderLevel; - //if (welder.IsUsed == true) - //{ - // cbIsOnDuty.Checked = true; - //} - //else - //{ - // cbIsOnDuty.Checked = false; - //} } else {