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

111

Browse Source
This commit is contained in:
李超
2024-02-27 18:13:26 +08:00
parent 7f67a750c8
commit 6106fb7d9c
33 changed files with 2769 additions and 1820 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx.cs
+32 -14
View File
@@ -50,11 +50,23 @@
this.txtWorkPalce.Text = getFireWork.WorkPalce;
this.txtTools.Text = getFireWork.Tools;
this.txtElectrician.Text = getFireWork.Electrician;
string name = getFireWork.WatchManName;
string name = getFireWork.WatchManName;
if (!string.IsNullOrEmpty(getFireWork.HasSpecialProgramme))
{
this.txtHasSpecialProgramme.Text = getFireWork.HasSpecialProgramme;
}
if (!string.IsNullOrEmpty(getFireWork.OtherAttach))
{
txtOtherAttach.Text = getFireWork.OtherAttach;
}
if (string.IsNullOrEmpty(getFireWork.WatchManName))
{
name = UserService.GetUserNameByUserId(getFireWork.WatchManId);
}
if (!string.IsNullOrEmpty(getFireWork.WorkLeaderId))
{
this.txtWorkLeader.Text = UserService.GetUserNameByUserId(getFireWork.WorkLeaderId);
}
this.txtFireWatchManName.Text = name;
if (getFireWork.ValidityStartTime.HasValue)
{
@@ -65,13 +77,7 @@
}
}
this.txtWorkMeasures.Text = getFireWork.WorkMeasures;
if (!string.IsNullOrEmpty(getFireWork.SignatureUrl))
{
this.txtTime0.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getFireWork.ApplyDate);
this.txtOpinion0.Text = "同意。";
this.txtName0.Text = this.txtApplyManName.Text;
this.Image0.ImageUrl = "~/" + getFireWork.SignatureUrl;
}
if (!string.IsNullOrEmpty(getFireWork.CancelManId))
{
@@ -104,6 +110,7 @@
public string FlowOperateId1;
public string FlowOperateId2;
public string FlowOperateId3;
public string FlowOperateId4;
/// <summary>
///
/// </summary>
@@ -134,7 +141,7 @@
var signUser1 = UserService.GetUserByUserId(getF1.OperaterId);
if (signUser1 != null)
{
this.txtName1.Text = signUser1.UserName;
this.txtName1.Text = signUser1.UserName;
}
this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime);
}
@@ -163,7 +170,7 @@
if (signUser2 != null)
{
this.txtName2.Text = signUser2.UserName;
}
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
}
@@ -192,7 +199,7 @@
var signUser3 = UserService.GetUserByUserId(getF3.OperaterId);
if (signUser3 != null)
{
this.txtName3.Text = signUser3.UserName;
this.txtName3.Text = signUser3.UserName;
}
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
}
@@ -200,22 +207,33 @@
var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
if (getF4 != null)
{
FlowOperateId4 = getF4.FlowOperateId;
this.txtForm4.Title = getF4.AuditFlowName + "：";
if (getF4.OperaterTime.HasValue)
{
if (getF4.IsAgree == true)
{
// this.txtOpinion4.Text = "同意。";
this.txtOpinion4.Text = "同意。";
}
else
{
this.txtOpinion4.Text = getF4.Opinion;
}
this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId);
if (!string.IsNullOrEmpty(getF4.SignatureUrl))
{
this.Image4.ImageUrl = "~/" + getF4.SignatureUrl;
}
var signUser4= UserService.GetUserByUserId(getF4.OperaterId);
if (signUser4 != null)
{
this.txtName4.Text = signUser4.UserName;
}
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
}
}
}
}
}
#endregion