xiaju
/
SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

补充公司级树

This commit is contained in:
夏菊 2025-04-09 14:29:40 +08:00
parent a37909b608
commit 8514fb0156
15 changed files with 643 additions and 647 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TaskNotice.aspx
View File

@ -26,9 +26,6 @@
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" MinHeight="700px"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="培训记录" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="TaskNoticeId" EnableColumnLines="true" DataIDField="TaskNoticeId" AllowSorting="true"
@ -68,7 +65,7 @@
</f:TemplateField>
<%--<f:RenderField Width="120px" ColumnID="TrainingCode" DataField="TrainingCode" SortField="TrainingCode"
FieldType="String" HeaderText="培训编号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>--%>
</f:RenderField>--%>
<f:RenderField Width="150px" ColumnID="TrainTitle" DataField="TrainTitle" SortField="TrainTitle"
FieldType="String" HeaderText="标题" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
@ -119,8 +116,6 @@
</f:Panel>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="编制培训记录" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1200px" Height="440px">

9
SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TaskNotice.aspx.designer.cs generated
View File

@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.EduTrain
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>

22
SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx
View File

@ -1,5 +1,7 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MaterialList.aspx.cs" Inherits="FineUIPro.Web.HSSE.Material.MaterialList" %>
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
@ -10,9 +12,21 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel2" runat="server" />
<f:Panel ID="Panel2" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
BodyPadding="0px">
<uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
</f:ContentPanel>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="资源维护" EnableCollapse="true"
runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="MaterialId"
@ -80,6 +94,8 @@
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="资源维护" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="800px" OnClose="Window1_Close"
Height="400px">

37
SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx.cs
View File

@ -37,13 +37,19 @@ namespace FineUIPro.Web.HSSE.Material
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
////权限按钮方法
this.GetButtonPower();
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
this.ucTree.UnitId = this.CurrUser.UnitId;
this.ucTree.ProjectId = this.ProjectId;
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
this.panelLeftRegion.Hidden = true;
////权限按钮方法
this.GetButtonPower();
}
this.btnNew.OnClientClick = Window1.GetShowReference("MaterialEdit.aspx") + "return false;";
if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
{
@ -54,11 +60,34 @@ namespace FineUIPro.Web.HSSE.Material
this.BindGrid();
}
}
/// <summary>
/// 公司级树加载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void changeTree(object sender, EventArgs e)
{
this.ProjectId = this.ucTree.ProjectId;
this.BindGrid();
this.GetButtonPower();
if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
btnNew.Hidden = true;
}
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
if (string.IsNullOrEmpty(this.ProjectId))
{
return;
}
string strSql = @" SELECT a.MaterialId
,a.Name
,a.PublishMan
@ -71,7 +100,7 @@ namespace FineUIPro.Web.HSSE.Material
FROM dbo.HSSE_Material a left join Sys_User b on a.PublishMan = b.UserId WHERE a.ProjectId = @ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
{
strSql += " AND a.Name LIKE @Name";
@ -209,7 +238,7 @@ namespace FineUIPro.Web.HSSE.Material
/// <returns></returns>
private void GetButtonPower()
{
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HSSEMaterialMenuId);
var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HSSEMaterialMenuId);
if (buttonList.Count() > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))

40
SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx.designer.cs generated
View File

@ -33,13 +33,49 @@ namespace FineUIPro.Web.HSSE.Material
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ucTree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。

9
SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx
View File

@ -25,9 +25,6 @@
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Panel ID="Panel1" runat="server" Margin="10px" BodyPadding="10px" ShowBorder="false" MinHeight="700px"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="特种作业人员资质" EnableCollapse="true"
runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="PersonId" DataIDField="PersonId" AllowSorting="true"
@ -49,7 +46,7 @@
OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right">
</f:TextBox>
<f:TextBox runat="server" Label="岗位" ID="txtWorkPostName" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right" >
OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right">
</f:TextBox>
<f:DropDownList ID="drpIsUsedName" runat="server" Label="是否在岗" EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged"
AutoPostBack="true" Width="200px" LabelWidth="100px" LabelAlign="right" ForceSelection="false">
@ -112,7 +109,7 @@
SortField="SendUnit" FieldType="String" HeaderText="发证单位" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="AuditorName" DataField="AuditorName"
<f:RenderField Width="100px" ColumnID="AuditorName" DataField="AuditorName"
SortField="AuditorName" FieldType="String" HeaderText="审核人" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
@ -141,8 +138,6 @@
</f:Panel>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="特种作业人员资质" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
Height="500px">

9
SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs generated
View File

@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.QualityAudit
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>

13
SUBQHSE/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx
View File

@ -25,9 +25,6 @@
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" MinHeight="700px"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="人工时日报" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="DayReportId" ForceFit="true"
@ -76,7 +73,7 @@
</f:TemplateField>
<%-- <f:RenderField Width="200px" ColumnID="DayReportCode" DataField="DayReportCode" SortField="DayReportCode"
FieldType="String" HeaderText="编号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>--%>
</f:RenderField>--%>
<f:RenderField Width="150px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
HeaderTextAlign="Center" TextAlign="Center">
@ -97,18 +94,18 @@
<asp:Label ID="lblWorkTimeYear" runat="server" Text='<%# ConvertYearPersonWorkTime(Eval("CompileDate")) %>'
ToolTip='<%# ConvertYearPersonWorkTime(Eval("CompileDate")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>--%>
</f:TemplateField>--%>
<%--<f:TemplateField ColumnID="tfTotal" Width="150px" HeaderText="累计人工时" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblTotal" runat="server" Text='<%# ConvertTotalPersonWorkTimeSum(Eval("CompileDate")) %>'
ToolTip='<%# ConvertTotalPersonWorkTimeSum(Eval("CompileDate")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>--%>
</f:TemplateField>--%>
<%--<f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
ExpandUnusedSpace="true" SortField="FlowOperateName" FieldType="String" HeaderText="状态"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>--%>
</f:RenderField>--%>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -127,8 +124,6 @@
</f:Panel>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="人工时日报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"

9
SUBQHSE/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx.designer.cs generated
View File

@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>

8
SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonStatistic.aspx
View File

@ -26,9 +26,6 @@
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" MinHeight="700px"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="现场人员统计" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Number" DataIDField="Number" AllowSorting="true" ForceFit="true"
@ -92,16 +89,13 @@
<ItemTemplate>
<asp:Label ID="Label6" runat="server" Text='<%# Bind("PersonCount") %>' ToolTip='<%#Bind("PersonCount") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>--%>
</f:TemplateField>--%>
</Columns>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
</Items>
</f:Panel>
</form>
</body>
</html>

9
SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonStatistic.aspx.designer.cs generated
View File

@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>

5
SUBQHSE/FineUIPro.Web/HSSE/SitePerson/ProjectWorkPersonStatistic.aspx
View File

@ -25,9 +25,6 @@
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" MinHeight="700px"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="基层人才队伍统计" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" ForceFit="true"
@ -91,8 +88,6 @@
</f:Panel>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="基层人才队伍统计" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"

9
SUBQHSE/FineUIPro.Web/HSSE/SitePerson/ProjectWorkPersonStatistic.aspx.designer.cs generated
View File

@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>

5
SUBQHSE/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx
View File

@ -25,9 +25,6 @@
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" MinHeight="700px"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="现场岗位人工时统计" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true" ForceFit="true"
@ -94,8 +91,6 @@
</f:Panel>
</Items>
</f:Panel>
</Items>
</f:Panel>
</form>
</body>
</html>

9
SUBQHSE/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx.designer.cs generated
View File

@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>