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

合并最新

Browse Source
This commit is contained in:
李超
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Law/HSSEStandardList.aspx
+4
View File
@@ -63,6 +63,9 @@
<asp:Label ID="lblTypeName" runat="server" Text='<%# Bind("TypeName") %>' ToolTip='<%#Bind("TypeName") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="70px" ColumnID="IsBuildName" DataField="IsBuildName" SortField="IsBuildName"
FieldType="String" HeaderText="来源" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField Width="100px" HeaderText="标准级别" HeaderTextAlign="Center" TextAlign="Left"
SortField="StandardGrade">
<ItemTemplate>
@@ -158,6 +161,7 @@
<f:RenderField Width="90px" ColumnID="IsSelected90" DataField="IsSelected90" FieldType="String"
RendererFunction="renderSelect" HeaderText="90(全部标准)" HeaderToolTip="全部标准" TextAlign="Center">
</f:RenderField>
</Columns>
</f:GroupField>
<f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" HeaderText="附件"
SGGL/FineUIPro.Web/HSSE/Law/HSSEStandardList.aspx.cs
+1 -1
View File
@@ -42,7 +42,7 @@ namespace FineUIPro.Web.HSSE.Law
string strSql = @"SELECT hsl.StandardId,hsl.StandardGrade,hsl.StandardNo,hsl.StandardName,hsl.TypeId,hslt.TypeCode,hslt.TypeName,hsl.AttachUrl,hsl.IsSelected1,hsl.IsSelected2,hsl.IsSelected3
,hsl.IsSelected4,hsl.IsSelected5,hsl.IsSelected6,hsl.IsSelected7,hsl.IsSelected8,hsl.IsSelected9,hsl.IsSelected10,hsl.IsSelected11,hsl.IsSelected12,hsl.IsSelected13
,hsl.IsSelected14,hsl.IsSelected15,hsl.IsSelected16,hsl.IsSelected17,hsl.IsSelected18,hsl.IsSelected19,hsl.IsSelected20,hsl.IsSelected21,hsl.IsSelected22,hsl.IsSelected23
,hsl.IsSelected24,hsl.IsSelected25,hsl.IsSelected90,hsl.CompileMan,hsl.CompileDate,hsl.IsPass,(CASE WHEN IsBuild = 1 THEN '集团' ELSE '' END ) AS IsBuildName
,hsl.IsSelected24,hsl.IsSelected25,hsl.IsSelected90,hsl.CompileMan,hsl.CompileDate,hsl.IsPass,(CASE WHEN IsBuild = 1 THEN '集团' ELSE '公司' END ) AS IsBuildName
,hsl.UnitId,hsl.UpState,hsl.IsBuild,Substring(hsl.AttachUrl,charindex('~',hsl.AttachUrl)+1,LEN(hsl.AttachUrl)) as AttachUrlName
FROM Law_HSSEStandardsList as hsl
LEFT JOIN Base_HSSEStandardListType AS hslt ON hslt.TypeId = hsl.TypeId WHERE 1=1";
SGGL/FineUIPro.Web/HSSE/Law/LawRegulationList.aspx
+3
View File
@@ -68,6 +68,9 @@
<asp:Label ID="lblDescription" runat="server" Text='<%# Bind("ShortDescription") %>' ToolTip='<%#Bind("Description") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="70px" ColumnID="IsBuildName" DataField="IsBuildName" SortField="IsBuildName"
FieldType="String" HeaderText="来源" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt"
Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="LawRegulationId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LawRegulation&menuId=F4B02718-0616-4623-ABCE-885698DDBEB1"/>
</Columns>
SGGL/FineUIPro.Web/HSSE/Law/LawRegulationList.aspx.cs
+1 -1
View File
@@ -51,7 +51,7 @@
,Law.AttachUrl,Law.LawsRegulationsTypeId,Law.CompileMan,CompileUser.UserName AS CompileManName,Law.CompileDate
,Law.IsBuild,LawsRegulationsType.Code AS LawsRegulationsTypeCode
,LawsRegulationsType.Name AS LawsRegulationsTypeName,(CASE WHEN IsPass=1 THEN '' ELSE '' END) AS IsPassName, Substring(Law.AttachUrl,charindex('~',Law.AttachUrl)+1,LEN(Law.AttachUrl)) as AttachUrlName
,Law.UnitId,(CASE WHEN IsBuild = 1 THEN '集团' ELSE '' END ) AS IsBuildName
,Law.UnitId,(CASE WHEN IsBuild = 1 THEN '集团' ELSE '公司' END ) AS IsBuildName
FROM dbo.Law_LawRegulationList AS Law
LEFT JOIN dbo.Base_LawsRegulationsType AS LawsRegulationsType ON LawsRegulationsType.Id=Law.LawsRegulationsTypeId
LEFT JOIN Sys_User AS CompileUser ON CompileUser.UserId=Law.CompileMan