lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

202305291、修改奖励通知单、奖惩通知单。

Browse Source
This commit is contained in:
杨红卫
2023-05-29 09:09:30 +08:00
parent cd3d51ae3f
commit 9c804196e7
43 changed files with 3070 additions and 3544 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Check/IncentiveNotice.aspx
+2 -2
View File
@@ -105,8 +105,8 @@
</Items>
</f:Panel>
<f:Window ID="Window1" Title="奖励通知单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
Height="620px">
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"
Height="650px" Maximized="true">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
SGGL/FineUIPro.Web/HSSE/Check/IncentiveNoticeAdd.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="IncentiveNoticeAdd.aspx.cs" Inherits="FineUIPro.Web.HSSE.Check.IncentiveNoticeAdd" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="IncentiveNoticeAdd.aspx.cs" Inherits="FineUIPro.Web.HSSE.Check.IncentiveNoticeAdd" ValidateRequest="false" %>
<!DOCTYPE html>
SGGL/FineUIPro.Web/HSSE/Check/PunishNotice.aspx
+1 -1
View File
@@ -113,7 +113,7 @@
</f:Panel>
<f:Window ID="Window1" Title="处罚通知单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
Height="600px" OnClose="Window1_Close">
Height="600px" OnClose="Window1_Close" Maximized="true">
</f:Window>
<f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="false" runat="server" IsModal="true" Width="700px" OnClose="WindowAtt_Close"
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx
+1 -1
View File
@@ -130,7 +130,7 @@
<f:RenderField Width="250px" ColumnID="OperateName" DataField="OperateName"
FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="UserName" DataField="UserName"
<f:RenderField Width="200px" ColumnID="PersonName" DataField="PersonName"
FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Opinion" DataField="Opinion"
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.cs
+1 -1
View File
@@ -132,7 +132,7 @@ namespace FineUIPro.Web.HSSE.Check
//办理记录
public void BindGrid1()
{
string strSql = @"select FlowOperateId, PunishNoticeId, OperateName, OperateManId, OperateTime, case when IsAgree='False' then '否' else '是' end As IsAgree, Opinion,S.UserName from Check_PunishNoticeFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
string strSql = @"select FlowOperateId, PunishNoticeId, OperateName, OperateManId, OperateTime, case when IsAgree='False' then '否' else '是' end As IsAgree, Opinion,S.PersonName from Check_PunishNoticeFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += "where PunishNoticeId= @PunishNoticeId";
listStr.Add(new SqlParameter("@PunishNoticeId", PunishNoticeId));
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx
+1 -1
View File
@@ -132,7 +132,7 @@
<f:RenderField Width="250px" ColumnID="OperateName" DataField="OperateName"
FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="UserName" DataField="UserName"
<f:RenderField Width="200px" ColumnID="PersonName" DataField="PersonName"
FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Opinion" DataField="Opinion"
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.cs
+1 -1
View File
@@ -174,7 +174,7 @@ namespace FineUIPro.Web.HSSE.Check
//办理记录
public void BindGrid1()
{
string strSql = @"select FlowOperateId, PunishNoticeId, OperateName, OperateManId, OperateTime, case when IsAgree='False' then '否' else '是' end As IsAgree, Opinion,S.UserName from Check_PunishNoticeFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
string strSql = @"select FlowOperateId, PunishNoticeId, OperateName, OperateManId, OperateTime, case when IsAgree='False' then '否' else '是' end As IsAgree, Opinion,S.PersonName from Check_PunishNoticeFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += "where PunishNoticeId= @PunishNoticeId";
listStr.Add(new SqlParameter("@PunishNoticeId", PunishNoticeId));
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx
+1 -1
View File
@@ -97,7 +97,7 @@
<f:RenderField Width="250px" ColumnID="OperateName" DataField="OperateName"
FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="UserName" DataField="UserName"
<f:RenderField Width="200px" ColumnID="PersonName" DataField="PersonName"
FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Opinion" DataField="Opinion"
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.cs
+1 -1
View File
@@ -105,7 +105,7 @@ namespace FineUIPro.Web.HSSE.Check
//办理记录
public void BindGrid()
{
string strSql = @"select FlowOperateId, PunishNoticeId, OperateName, OperateManId, OperateTime, case when IsAgree='False' then '否' else '是' end As IsAgree, Opinion,S.UserName from Check_PunishNoticeFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
string strSql = @"select FlowOperateId, PunishNoticeId, OperateName, OperateManId, OperateTime, case when IsAgree='False' then '否' else '是' end As IsAgree, Opinion,S.PersonName from Check_PunishNoticeFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += "where PunishNoticeId= @PunishNoticeId";
listStr.Add(new SqlParameter("@PunishNoticeId", PunishNoticeId));