zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20231128

Browse Source
This commit is contained in:
李超
2023-11-28 15:50:28 +08:00
parent a198d4c9ec
commit d696348af5
10 changed files with 77 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs
+14 -5
View File
@@ -95,8 +95,10 @@ namespace FineUIPro.Web.HSSE.QualityAudit
this.drpCertificate.SelectedValue = personQuality.CertificateId;
this.txtGrade.Text = personQuality.Grade;
this.txtSendUnit.Text = personQuality.SendUnit;
if(personQuality.SendDate.HasValue)
this.txtSendDate.Text = string.Format("{0:yyyy-MM-dd}", personQuality.SendDate);
this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", personQuality.LimitDate);
if (personQuality.LimitDate.HasValue)
this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", personQuality.LimitDate);
this.txtLateCheckDate.Text = string.Format("{0:yyyy-MM-dd}", personQuality.LateCheckDate);
if (!string.IsNullOrEmpty(personQuality.AuditorId))
{
@@ -108,8 +110,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit
}
else
{
this.txtSendDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
// this.txtSendDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
// this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_CD, true);
}
@@ -178,14 +180,21 @@ namespace FineUIPro.Web.HSSE.QualityAudit
CertificateName = this.drpCertificate.SelectedItem.Text,
Grade = this.txtGrade.Text.Trim(),
SendUnit = this.txtSendUnit.Text.Trim(),
SendDate = Funs.GetNewDateTime(this.txtSendDate.Text.Trim()),
LimitDate = Funs.GetNewDateTime(this.txtLimitDate.Text.Trim()),
LateCheckDate = Funs.GetNewDateTime(this.txtLateCheckDate.Text.Trim()),
Remark = this.txtRemark.Text.Trim(),
CompileMan = this.CurrUser.UserId,
CompileDate = DateTime.Now,
AuditDate = Funs.GetNewDateTime(this.txtAuditDate.Text.Trim())
};
if (!string.IsNullOrEmpty(this.txtSendDate.Text.Trim()))
{
personQuality.SendDate = Funs.GetNewDateTime(this.txtSendDate.Text.Trim());
}
if (!string.IsNullOrEmpty(this.txtLimitDate.Text.Trim()))
{
personQuality.LimitDate = Funs.GetNewDateTime(this.txtLimitDate.Text.Trim());
}
if (this.drpAuditor.SelectedValue != Const._Null)
{
personQuality.AuditorId = this.drpAuditor.SelectedValue;