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

20220906新增项目劳务人员查看页面、合同信息表、取用户接口修改

Browse Source
This commit is contained in:
杨红卫
2022-09-06 14:23:32 +08:00
parent c26e450d67
commit fc4f47dbab
39 changed files with 3809 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx
+1 -1
View File
@@ -147,7 +147,7 @@
<f:RenderField Width="200px" ColumnID="OperateName" DataField="OperateName"
FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
<f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="IsAgreeName" DataField="IsAgreeName" FieldType="String"
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.cs
+2 -2
View File
@@ -119,9 +119,9 @@ namespace FineUIPro.Web.HSSE.Check
{
if (!string.IsNullOrEmpty(this.RectifyNoticesId))
{
string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.UserName
string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.PersonName
,(case when IsAgree=0 then '不同意' else '同意' end) as IsAgreeName
from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += "where RectifyNoticesId= @RectifyNoticesId";
listStr.Add(new SqlParameter("@RectifyNoticesId", RectifyNoticesId));
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx
+1 -1
View File
@@ -143,7 +143,7 @@
<f:RenderField Width="200px" ColumnID="OperateName" DataField="OperateName"
FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
<f:RenderField Width="100px" ColumnID="PersonName" DataField="UserName"
FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="IsAgreeName" DataField="IsAgreeName" FieldType="String"
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs
+2 -2
View File
@@ -88,9 +88,9 @@ namespace FineUIPro.Web.HSSE.Check
{
if (!string.IsNullOrEmpty(this.RectifyNoticesId))
{
string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.UserName
string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.PersonName
,(case when IsAgree=0 then '不同意' else '同意' end) as IsAgreeName
from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += "where RectifyNoticesId= @RectifyNoticesId";
listStr.Add(new SqlParameter("@RectifyNoticesId", RectifyNoticesId));
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx
+1 -1
View File
@@ -321,7 +321,7 @@
<f:RenderField Width="120px" ColumnID="OperateName" DataField="OperateName"
FieldType="String" HeaderText="操作步骤" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
<f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="IsAgreeName" DataField="IsAgreeName" FieldType="String"
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs
+2 -2
View File
@@ -354,9 +354,9 @@ namespace FineUIPro.Web.HSSE.Check
}
public void BindGrid1()
{
string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.UserName
string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.PersonName
,(case when IsAgree=0 then '不同意' else '同意' end) as IsAgreeName
from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += "where RectifyNoticesId= @RectifyNoticesId";
listStr.Add(new SqlParameter("@RectifyNoticesId", RectifyNoticesId));
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx
+1 -1
View File
@@ -154,7 +154,7 @@
<f:RenderField Width="200px" ColumnID="OperateName" DataField="OperateName"
FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
<f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="IsAgreeName" DataField="IsAgreeName" FieldType="String"
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx.cs
+2 -2
View File
@@ -124,9 +124,9 @@ namespace FineUIPro.Web.HSSE.Check
{
if (!string.IsNullOrEmpty(this.RectifyNoticesId))
{
string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.UserName
string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.PersonName
,(case when IsAgree=0 then '不同意' else '同意' end) as IsAgreeName
from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += "where RectifyNoticesId= @RectifyNoticesId";
listStr.Add(new SqlParameter("@RectifyNoticesId", RectifyNoticesId));
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx
+1 -1
View File
@@ -123,7 +123,7 @@
<f:RenderField Width="200px" ColumnID="OperateName" DataField="OperateName"
FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
<f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="IsAgreeName" DataField="IsAgreeName" FieldType="String"
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx.cs
+2 -2
View File
@@ -108,9 +108,9 @@ namespace FineUIPro.Web.HSSE.Check
{
if (!string.IsNullOrEmpty(this.RectifyNoticesId))
{
string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.UserName
string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.PersonName
,(case when IsAgree=0 then '不同意' else '同意' end) as IsAgreeName
from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += "where RectifyNoticesId= @RectifyNoticesId";
listStr.Add(new SqlParameter("@RectifyNoticesId", RectifyNoticesId));
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx
+1 -1
View File
@@ -108,7 +108,7 @@
<f:RenderField Width="200px" ColumnID="OperateName" DataField="OperateName"
FieldType="String" HeaderText="操作步骤" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
<f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
FieldType="String" HeaderText="操作人员" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="IsAgreeName" DataField="IsAgreeName" FieldType="String"
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+1 -1
View File
@@ -722,7 +722,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
var getSitePerson = SitePerson_PersonService.GetSitePersonById(Grid1.SelectedRowID);
if (getSitePerson != null)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Person/PersonView.aspx?PersonId={0}", getSitePerson.PersonId, "查看 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Person/ProjectPersonView.aspx?SitePersonId={0}", this.SitePersonId, "查看 - ")));
}
}
}