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-01-25 19:19:59 +08:00
parent f590c95d94
commit 12ecb5309e
9 changed files with 334 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/License/Apply.aspx.cs
+1 -1
View File
@@ -293,7 +293,7 @@ namespace FineUIPro.Web.HSSE.License
}
else if (state.ToString() == "1")
{
return "总包安全工程师深夜";
return "总包安全工程师审核";
}
else if (state.ToString() == "2")
{
SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx
+15 -12
View File
@@ -91,7 +91,7 @@
<f:FormRow>
<Items>
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全人员意见：">
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全审核：">
<Rows>
<f:FormRow >
<Items>
@@ -115,7 +115,7 @@
</Rows>
</f:Form>
<f:Form ID="txtForm2" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包单位专业工程师意见：">
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位施工经理审批：">
<Rows>
<f:FormRow>
<Items>
@@ -143,7 +143,7 @@
<f:FormRow>
<Items>
<f:Form ID="txtForm3" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包单位安全人员意见：">
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包安全审批：">
<Rows>
<f:FormRow>
<Items>
@@ -167,8 +167,8 @@
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left" Hidden="true" HideMode="Visibility"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包单位安全人员：">
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包施工经理签发：">
<Rows>
<f:FormRow>
<Items>
@@ -176,14 +176,17 @@
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:Label ID="Label5" runat="server" >
</f:Label>
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Label ID="txtTime4" runat="server" Text="年月日时分">
</f:Label>
<f:HyperLink ID="HyperLink4" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(3);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image4" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime4" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs
+15 -6
View File
@@ -124,7 +124,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);
}
@@ -153,7 +153,7 @@
if (signUser2 != null)
{
this.txtName2.Text = signUser2.UserName;
}
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
}
@@ -182,7 +182,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);
}
@@ -195,17 +195,26 @@
{
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
SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs
Generated
+11 -2
View File
@@ -312,13 +312,13 @@ namespace FineUIPro.Web.HSSE.License
protected global::FineUIPro.TextArea txtOpinion4;
/// <summary>
/// Label5 控件。
/// HyperLink4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label5;
protected global::FineUIPro.HyperLink HyperLink4;
/// <summary>
/// txtName4 控件。
@@ -329,6 +329,15 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtName4;
/// <summary>
/// Image4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image4;
/// <summary>
/// txtTime4 控件。
/// </summary>