From 6e6f78e900eba428ec79d261df47ee987d9377f0 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 10 Apr 2025 10:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=A5=A8=E7=AD=89=EF=BC=8C=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=BA=A7=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ZJ/HSSE/CostGoods/Expense.aspx            | 177 +++++++++--------
 .../ZJ/HSSE/CostGoods/Expense.aspx.cs         |  45 ++++-
 .../HSSE/CostGoods/Expense.aspx.designer.cs   |  36 ++++
 .../HSSE/License/BreakGround.aspx             | 178 +++++++++--------
 .../HSSE/License/BreakGround.aspx.cs          |  52 +++--
 .../HSSE/License/BreakGround.aspx.designer.cs |  82 +++++---
 .../FineUIPro.Web/HSSE/License/FireWork.aspx  | 166 ++++++++--------
 .../HSSE/License/FireWork.aspx.cs             |  63 ++++--
 .../HSSE/License/FireWork.aspx.designer.cs    |  36 ++++
 .../HSSE/License/HeightWork.aspx              | 181 +++++++++--------
 .../HSSE/License/HeightWork.aspx.cs           |  82 +++++---
 .../HSSE/License/HeightWork.aspx.designer.cs  |  82 +++++---
 .../FineUIPro.Web/HSSE/License/JiaBan.aspx    | 176 +++++++++--------
 .../FineUIPro.Web/HSSE/License/JiaBan.aspx.cs |  55 ++++--
 .../HSSE/License/JiaBan.aspx.designer.cs      |  36 ++++
 .../HSSE/License/LicenseManager.aspx.cs       |  23 ++-
 .../HSSE/License/LiftingWork.aspx             | 180 +++++++++--------
 .../HSSE/License/LiftingWork.aspx.cs          |  54 ++++--
 .../HSSE/License/LiftingWork.aspx.designer.cs |  82 +++++---
 .../HSSE/License/LimitedSpace.aspx            | 166 ++++++++--------
 .../HSSE/License/LimitedSpace.aspx.cs         |  56 ++++--
 .../License/LimitedSpace.aspx.designer.cs     |  82 +++++---
 .../FineUIPro.Web/HSSE/License/NightWork.aspx | 166 ++++++++--------
 .../HSSE/License/NightWork.aspx.cs            |  55 ++++--
 .../HSSE/License/NightWork.aspx.designer.cs   |  82 +++++---
 .../HSSE/License/OpenCircuit.aspx             | 182 ++++++++++--------
 .../HSSE/License/OpenCircuit.aspx.cs          |  63 ++++--
 .../HSSE/License/OpenCircuit.aspx.designer.cs |  82 +++++---
 .../HSSE/License/PressureTest.aspx            | 166 ++++++++--------
 .../HSSE/License/PressureTest.aspx.cs         |  54 ++++--
 .../License/PressureTest.aspx.designer.cs     |  36 ++++
 .../HSSE/License/RadialWork.aspx              | 172 +++++++++--------
 .../HSSE/License/RadialWork.aspx.cs           |  59 ++++--
 .../HSSE/License/RadialWork.aspx.designer.cs  |  82 +++++---
 .../HSSE/License/TempElectricity.aspx         |  28 ++-
 .../HSSE/License/TempElectricity.aspx.cs      |  53 +++--
 .../License/TempElectricity.aspx.designer.cs  |  36 ++++
 .../HSSE/Meeting/AttendMeeting.aspx.cs        |  26 ++-
 .../HSSE/Meeting/ClassMeeting.aspx.cs         |  30 +--
 .../HSSE/Meeting/MeetingManage.aspx.cs        |   2 +-
 .../HSSE/Meeting/MonthMeeting.aspx.cs         |  34 ++--
 .../Meeting/SafetyLeaderGroupMeeting.aspx.cs  |  34 ++--
 .../HSSE/Meeting/SpecialMeeting.aspx.cs       |  27 ++-
 .../HSSE/Meeting/WeekMeeting.aspx.cs          |  27 ++-
 44 files changed, 2305 insertions(+), 1281 deletions(-)
diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/CostGoods/Expense.aspx b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/CostGoods/Expense.aspx
index a3b90ec..0abb1ca 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/CostGoods/Expense.aspx
+++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/CostGoods/Expense.aspx
@@ -1,5 +1,6 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Expense.aspx.cs" Inherits="FineUIPro.Web.Customization.ZJ.HSSE.CostGoods.Expense" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,87 +10,101 @@
 </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">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全费用计划" EnableCollapse="true"
-                runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ExpenseId" ForceFit="true"
-                DataIDField="ExpenseId" AllowSorting="true" SortField="ExpenseCode" SortDirection="DESC" OnSort="Grid1_Sort" 
-                AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                            <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" 
-                                OnSelectedIndexChanged="TextBox_TextChanged"  LabelWidth="70px" Width="250px">
-                            </f:DropDownList>  
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                    <f:RenderField Width="90px" ColumnID="ExpenseCode" DataField="ExpenseCode" SortField="ExpenseCode"
-                        FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" 
-                        SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="Months" DataField="Months" SortField="Months"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" HeaderText="月份"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="CompileMan" DataField="CompileMan"
-                        SortField="CompileMan" FieldType="String" HeaderText="编制人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                  <%--  <f:WindowField TextAlign="Left" Width="160px" WindowID="WindowAtt" HeaderText="附件" Text="附件" ToolTip="附件上传查看"
-                        DataIFrameUrlFields="ExpenseId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ExpenseAttachUrl&menuId=EEE7CBBE-2EFB-4D64-96A6-A932E20FF9DB"
-                        HeaderTextAlign="Center" />--%>
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </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="560px">
-    </f:Window>
-    <f:Window ID="WindowAtt" Title="附件页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
-        Height="500px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
-            Hidden="true" runat="server" Text="编辑">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
-            Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
-            Text="删除">
-        </f:MenuButton>
-    </f:Menu>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" 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="ExpenseId" ForceFit="true"
+                            DataIDField="ExpenseId" AllowSorting="true" SortField="ExpenseCode" SortDirection="DESC" OnSort="Grid1_Sort"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true"
+                                            OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px">
+                                        </f:DropDownList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="90px" ColumnID="ExpenseCode" DataField="ExpenseCode" SortField="ExpenseCode"
+                                    FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="Months" DataField="Months" SortField="Months"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" HeaderText="月份"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="CompileMan" DataField="CompileMan"
+                                    SortField="CompileMan" FieldType="String" HeaderText="编制人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%--  <f:WindowField TextAlign="Left" Width="160px" WindowID="WindowAtt" HeaderText="附件" Text="附件" ToolTip="附件上传查看"
+             DataIFrameUrlFields="ExpenseId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ExpenseAttachUrl&menuId=EEE7CBBE-2EFB-4D64-96A6-A932E20FF9DB"
+             HeaderTextAlign="Center" />--%>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </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="1100px"
+            Height="560px">
+        </f:Window>
+        <f:Window ID="WindowAtt" Title="附件页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
+                Hidden="true" runat="server" Text="编辑">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
+                Text="删除">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/CostGoods/Expense.aspx.cs b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/CostGoods/Expense.aspx.cs
index 0b3676f..b1d98c5 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/CostGoods/Expense.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/CostGoods/Expense.aspx.cs
@@ -40,18 +40,19 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.CostGoods
             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"];
                 }
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
                 {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
                 this.btnNew.OnClientClick = Window1.GetShowReference("ExpenseEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
@@ -63,11 +64,37 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.CostGoods
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @" SELECT Expense.ExpenseId, "
                           + @" Expense.ProjectId,"
                           + @" CodeRecords.Code AS ExpenseCode,"
@@ -93,9 +120,9 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.CostGoods
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+            if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != Const._Null)
             {
                 strSql += " AND Expense.UnitId = @UnitId";
                 listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
@@ -242,7 +269,7 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.CostGoods
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectExpenseMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectExpenseMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/CostGoods/Expense.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/CostGoods/Expense.aspx.designer.cs
index 3e9136d..8fc9614 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/CostGoods/Expense.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/CostGoods/Expense.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.CostGoods
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <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 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/BreakGround.aspx b/SUBQHSE/FineUIPro.Web/HSSE/License/BreakGround.aspx
index 6d8e126..bbbedab 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/BreakGround.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/BreakGround.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BreakGround.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.License.BreakGround" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -10,89 +12,103 @@
 <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:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="动土作业票" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="BreakGroundId" DataIDField="BreakGroundId" AllowSorting="true"
-                    SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
-                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <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" DataKeyNames="BreakGroundId" DataIDField="BreakGroundId" AllowSorting="true"
+                            SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
+                                            EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                        <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:RadioButtonList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
+                                    SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
+                                    FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
+                                    FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="WorkDepth" DataField="WorkDepth" SortField="WorkDepth"
+                                    FieldType="String" HeaderText="开挖深度" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="RealWorkDepth" DataField="RealWorkDepth" SortField="RealWorkDepth"
+                                    FieldType="String" HeaderText="实际开挖深度(米)" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="160px" ColumnID="WorkMeasures" DataField="WorkMeasures"
+                                    SortField="WorkMeasures" FieldType="String" HeaderText="作业内容、机具及安全措施" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
+                                    SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                                 </f:DropDownList>
-                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
-                                <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                </f:RadioButtonList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
-                            SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
-                            FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
-                            FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="WorkDepth" DataField="WorkDepth" SortField="WorkDepth"
-                            FieldType="String" HeaderText="开挖深度" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                         <f:RenderField Width="100px" ColumnID="RealWorkDepth" DataField="RealWorkDepth" SortField="RealWorkDepth"
-                            FieldType="String" HeaderText="实际开挖深度(米)" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>                        
-                        <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="160px" ColumnID="WorkMeasures" DataField="WorkMeasures"
-                            SortField="WorkMeasures" FieldType="String" HeaderText="作业内容、机具及安全措施" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                          <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
-                            SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="动土作业票" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/BreakGround.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/BreakGround.aspx.cs
index 014d208..6dbe499 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/BreakGround.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/BreakGround.aspx.cs
@@ -40,19 +40,19 @@ namespace FineUIPro.Web.HSSE.License
             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"];
-                //}
-
-                UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnit.Enabled = false;
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
 
                 this.drpStates.DataValueField = "Value";
@@ -69,11 +69,37 @@ namespace FineUIPro.Web.HSSE.License
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnit.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = "SELECT license.BreakGroundId,license.ProjectId,license.LicenseCode,license.ApplyUnitId,ApplyUnit.UnitName AS ApplyUnitName,license.ApplyManId,license.ApplyDate,license.WorkPalce,license.ValidityStartTime,license.ValidityEndTime,license.WorkMeasures,license.WorkDepth,license.RealWorkDepth,license.States"
                         + @" ,(CASE WHEN license.States=-2 THEN '作废' WHEN license.States=0 THEN '待提交' WHEN license.States=1 THEN '审核中'  WHEN license.States=2 THEN '作业中' WHEN license.States=3 THEN '已完成' WHEN license.States=-1 THEN '已取消' ELSE '未知' END) AS StatesName "
                         + @" FROM dbo.License_BreakGround AS license "
@@ -86,7 +112,7 @@ namespace FineUIPro.Web.HSSE.License
                 strSql += " AND license.ApplyUnitId = @UnitId";  ///状态为已完成
                 listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
             }
-            if (this.drpUnit.SelectedValue != Const._Null)
+            if (this.drpUnit.SelectedValue != null && this.drpUnit.SelectedValue != Const._Null)
             {
                 strSql += " AND license.ApplyUnitId = @UnitId2";
                 listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
@@ -236,7 +262,7 @@ namespace FineUIPro.Web.HSSE.License
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectBreakGroundMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectBreakGroundMenuId);
             if (buttonList.Count() > 0)
             {
                 //if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/BreakGround.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/BreakGround.aspx.designer.cs
index 2afbae8..cdf967f 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/BreakGround.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/BreakGround.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.License {
-    
-    
-    public partial class BreakGround {
-        
+namespace FineUIPro.Web.HSSE.License
+{
+
+
+    public partial class BreakGround
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <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 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpStates 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList drpStates;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnPrinter 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinter;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/FireWork.aspx b/SUBQHSE/FineUIPro.Web/HSSE/License/FireWork.aspx
index 35109db..60d6c34 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/FireWork.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/FireWork.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FireWork.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.License.FireWork" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -10,83 +12,97 @@
 <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:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="动火作业票" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="FireWorkId" DataIDField="FireWorkId" AllowSorting="true"
-                    SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
-                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <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" DataKeyNames="FireWorkId" DataIDField="FireWorkId" AllowSorting="true"
+                            SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
+                                            EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                        <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:RadioButtonList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="80px" ColumnID="LicenseCode" DataField="LicenseCode"
+                                    SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
+                                    FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
+                                    FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="WorkMeasures" DataField="WorkMeasures"
+                                    SortField="WorkMeasures" FieldType="String" HeaderText="作业内容、机具及安全措施" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
+                                    SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                                 </f:DropDownList>
-                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
-                                <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                </f:RadioButtonList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="80px" ColumnID="LicenseCode" DataField="LicenseCode"
-                            SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
-                            FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
-                            FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="WorkMeasures" DataField="WorkMeasures"
-                            SortField="WorkMeasures" FieldType="String" HeaderText="作业内容、机具及安全措施" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>                        
-                         <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
-                            SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="动火作业票" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/FireWork.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/FireWork.aspx.cs
index 9c772e6..daf86ad 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/FireWork.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/FireWork.aspx.cs
@@ -40,19 +40,20 @@ namespace FineUIPro.Web.HSSE.License
             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"];
-                //}
-
-                UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnit.Enabled = false;
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.InitDropDownList();
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
 
                 this.drpStates.DataValueField = "Value";
@@ -69,11 +70,41 @@ namespace FineUIPro.Web.HSSE.License
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnit.Enabled = false;
+            }
+        }
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+
+            //if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            //{
+            //    btnNew.Hidden = true;
+            //}
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = "SELECT license.FireWorkId,license.ProjectId,license.LicenseCode,license.ApplyUnitId,ApplyUnit.UnitName AS ApplyUnitName,license.ApplyManId,license.ApplyDate,license.WorkPalce,license.ValidityStartTime,license.ValidityEndTime,license.WorkMeasures,license.States"
                         + @" ,(CASE WHEN license.States=-2 THEN '作废' WHEN license.States=0 THEN '待提交' WHEN license.States=1 THEN '审核中'  WHEN license.States=2 THEN '作业中' WHEN license.States=3 THEN '已完成' WHEN license.States=-1 THEN '已取消' ELSE '未知' END) AS StatesName "
                         + @" FROM dbo.License_FireWork AS license "
@@ -86,7 +117,7 @@ namespace FineUIPro.Web.HSSE.License
                 strSql += " AND license.ApplyUnitId = @UnitId";  ///状态为已完成
                 listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
             }
-            if (this.drpUnit.SelectedValue != Const._Null)
+            if (this.drpUnit.SelectedValue != null && this.drpUnit.SelectedValue != Const._Null)
             {
                 strSql += " AND license.ApplyUnitId = @UnitId2";
                 listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
@@ -238,7 +269,7 @@ namespace FineUIPro.Web.HSSE.License
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectFireWorkMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectFireWorkMenuId);
             if (buttonList.Count() > 0)
             {
                 //if (buttonList.Contains(BLL.Const.BtnAdd))
@@ -293,7 +324,7 @@ namespace FineUIPro.Web.HSSE.License
             string filePath = string.Empty;
             initTemplatePath = "File\\Word\\HSSE\\动火作业票.doc";
             uploadfilepath = rootPath + initTemplatePath;
-            string docfilename = Funs.GetNewFileName() ;
+            string docfilename = Funs.GetNewFileName();
             newUrl = uploadfilepath.Replace(".doc", docfilename + ".doc");
             filePath = initTemplatePath.Replace(".doc", docfilename + ".pdf");
             File.Copy(uploadfilepath, newUrl);
@@ -829,7 +860,7 @@ namespace FineUIPro.Web.HSSE.License
                                 var file = rootPath + getUser.SignatureUrl;
                                 DocumentBuilder builders = new DocumentBuilder(doc);
                                 builders.MoveToBookmark("Cancel");
-                              //  builders.InsertImage(file, 80, 20);
+                                //  builders.InsertImage(file, 80, 20);
                                 builders.Write("取消原因：" + getFireWork.CancelReasons + "  取消时间：" + string.Format("{0:yyyy-MM-dd HH:mm}", getFireWork.CancelTime));
                             }
                             else
@@ -861,7 +892,7 @@ namespace FineUIPro.Web.HSSE.License
                                 var file = rootPath + getUser.SignatureUrl;
                                 DocumentBuilder builders = new DocumentBuilder(doc);
                                 builders.MoveToBookmark("Close");
-                               // builders.InsertImage(file, 80, 20);
+                                // builders.InsertImage(file, 80, 20);
                                 builders.Write("关闭时间：" + string.Format("{0:yyyy-MM-dd HH:mm}", getFireWork.CloseTime));
                             }
                             else
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/FireWork.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/FireWork.aspx.designer.cs
index 91ea493..ff96616 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/FireWork.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/FireWork.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.HSSE.License
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <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 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/HeightWork.aspx b/SUBQHSE/FineUIPro.Web/HSSE/License/HeightWork.aspx
index 7bd7ed0..6970345 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/HeightWork.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/HeightWork.aspx
@@ -1,6 +1,9 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HeightWork.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.License.HeightWork" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -10,90 +13,104 @@
 <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:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="高处作业票" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="HeightWorkId" DataIDField="HeightWorkId" AllowSorting="true"
-                    SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
-                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <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" DataKeyNames="HeightWorkId" DataIDField="HeightWorkId" AllowSorting="true"
+                            SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
+                                            EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                        <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:RadioButtonList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
+                                    SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
+                                    FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
+                                    FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="WorkType" DataField="WorkType" SortField="WorkType"
+                                    FieldType="String" HeaderText="作业类别" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="WorkMeasures" DataField="WorkMeasures"
+                                    SortField="WorkMeasures" FieldType="String" HeaderText="作业内容及安全措施" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
+                                    SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                                <%--         <f:RenderField Width="150px" ColumnID="EquipmentTools" DataField="EquipmentTools" 
+        SortField="EquipmentTools" FieldType="String" HeaderText="设备及工具" HeaderTextAlign="Center"
+        TextAlign="Left">
+    </f:RenderField>--%>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                                 </f:DropDownList>
-                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
-                                <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                </f:RadioButtonList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
-                            SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
-                            FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
-                            FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="WorkType" DataField="WorkType" SortField="WorkType"
-                            FieldType="String" HeaderText="作业类别" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="WorkMeasures" DataField="WorkMeasures"
-                            SortField="WorkMeasures" FieldType="String" HeaderText="作业内容及安全措施" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
-                            SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                        </f:RenderField>
-                        <%--         <f:RenderField Width="150px" ColumnID="EquipmentTools" DataField="EquipmentTools" 
-                        SortField="EquipmentTools" FieldType="String" HeaderText="设备及工具" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>--%>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="高处作业票" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/HeightWork.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/HeightWork.aspx.cs
index d4c5a7b..603d730 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/HeightWork.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/HeightWork.aspx.cs
@@ -40,20 +40,21 @@ namespace FineUIPro.Web.HSSE.License
             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"];
-                //}
-
-                UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnit.Enabled = false;
+                    this.ProjectId = Request.Params["projectId"];
                 }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+
 
                 this.drpStates.DataValueField = "Value";
                 this.drpStates.DataTextField = "Text";
@@ -70,23 +71,54 @@ namespace FineUIPro.Web.HSSE.License
             }
         }
         /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+
+            //if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            //{
+            //    btnNew.Hidden = true;
+            //}
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+        private void InitDropDownList()
+        {
+            UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnit.Enabled = false;
+            }
+        }
+        /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = "SELECT license.HeightWorkId,license.ProjectId,license.LicenseCode,license.ApplyUnitId,ApplyUnit.UnitName AS ApplyUnitName,license.ApplyManId,license.ApplyDate,license.WorkPalce,license.ValidityStartTime,license.ValidityEndTime,license.WorkMeasures,license.States"
                         + @" ,(CASE WHEN license.States=-2 THEN '作废' WHEN license.States=0 THEN '待提交' WHEN license.States=1 THEN '审核中'  WHEN license.States=2 THEN '作业中' WHEN license.States=3 THEN '已完成' WHEN license.States=-1 THEN '已取消' ELSE '未知' END) AS StatesName,WorkType,EquipmentTools "
                         + @" FROM dbo.License_HeightWork AS license "
                         + @" LEFT JOIN Base_Unit AS ApplyUnit ON license.ApplyUnitId =ApplyUnit.UnitId"
-                        + @" WHERE license.ProjectId= '" + this.ProjectId +"'";
+                        + @" WHERE license.ProjectId= '" + this.ProjectId + "'";
             List<SqlParameter> listStr = new List<SqlParameter>();
-           
+
             if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
             {
                 strSql += " AND license.ApplyUnitId = @UnitId";  ///状态为已完成
                 listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
-            }       
-            if (this.drpUnit.SelectedValue != Const._Null)
+            }
+            if (this.drpUnit.SelectedValue != null && this.drpUnit.SelectedValue != Const._Null)
             {
                 strSql += " AND license.ApplyUnitId = @UnitId2";
                 listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
@@ -100,7 +132,7 @@ namespace FineUIPro.Web.HSSE.License
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
             Grid1.RecordCount = tb.Rows.Count;
-            
+
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();
@@ -238,7 +270,7 @@ namespace FineUIPro.Web.HSSE.License
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectHeightWorkMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectHeightWorkMenuId);
             if (buttonList.Count() > 0)
             {
                 //if (buttonList.Contains(BLL.Const.BtnAdd))
@@ -316,7 +348,7 @@ namespace FineUIPro.Web.HSSE.License
                     var getUser = UserService.GetUserByUserId(getHeightWork.ApplyManId);
                     if (getUser != null)
                     {
-                            bookmarkApplyManName.Text = getUser.UserName;
+                        bookmarkApplyManName.Text = getUser.UserName;
                     }
 
 
@@ -678,7 +710,7 @@ namespace FineUIPro.Web.HSSE.License
 
 
             }
-            
+
             //审核记录
             var getFlows = LicensePublicService.GetFlowOperateListByDataId(Id);
             if (getFlows.Count() > 0)
@@ -703,7 +735,7 @@ namespace FineUIPro.Web.HSSE.License
                         DocumentBuilder builders = new DocumentBuilder(doc);
                         var file = rootPath + getF1.SignatureUrl;
                         builders.MoveToBookmark("OperaterMan1");
-                        builders.InsertImage(file, 80, 20); 
+                        builders.InsertImage(file, 80, 20);
                     }
                     else
                     {
@@ -750,7 +782,7 @@ namespace FineUIPro.Web.HSSE.License
                         var file = rootPath + getF2.SignatureUrl;
                         builders.MoveToBookmark("OperaterMan2");
                         builders.InsertImage(file, 80, 20);
-                       
+
                     }
                     else
                     {
@@ -801,7 +833,7 @@ namespace FineUIPro.Web.HSSE.License
                         var file = rootPath + getF3.SignatureUrl;
                         builders.MoveToBookmark("OperaterMan3");
                         builders.InsertImage(file, 80, 20);
-                         
+
                     }
                     else
                     {
@@ -838,7 +870,7 @@ namespace FineUIPro.Web.HSSE.License
                                 var file = rootPath + getUser.SignatureUrl;
                                 DocumentBuilder builders = new DocumentBuilder(doc);
                                 builders.MoveToBookmark("Cancel");
-                               // builders.InsertImage(file, 80, 20);
+                                // builders.InsertImage(file, 80, 20);
                                 builders.Write("取消原因：" + getHeightWork.CancelReasons + "  取消时间：" + string.Format("{0:yyyy-MM-dd HH:mm}", getHeightWork.CancelTime));
                             }
                             else
@@ -865,12 +897,12 @@ namespace FineUIPro.Web.HSSE.License
                                 bookmarkClose.Text = getHeightWork.CloseReasons + " 关闭时间："
                                  + string.Format("{0:yyyy-MM-dd HH:mm}", getHeightWork.CloseTime) + "。";
                             }
-                            else if(!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl))
+                            else if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl))
                             {
                                 var file = rootPath + getUser.SignatureUrl;
                                 DocumentBuilder builders = new DocumentBuilder(doc);
                                 builders.MoveToBookmark("Close");
-                               // builders.InsertImage(file, 80, 20);
+                                // builders.InsertImage(file, 80, 20);
                                 builders.Write("关闭时间：" + string.Format("{0:yyyy-MM-dd HH:mm}", getHeightWork.CloseTime));
                             }
                             else
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/HeightWork.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/HeightWork.aspx.designer.cs
index f5e4c1f..afb102e 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/HeightWork.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/HeightWork.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.License {
-    
-    
-    public partial class HeightWork {
-        
+namespace FineUIPro.Web.HSSE.License
+{
+
+
+    public partial class HeightWork
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <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 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpStates 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList drpStates;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnPrinter 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinter;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/JiaBan.aspx b/SUBQHSE/FineUIPro.Web/HSSE/License/JiaBan.aspx
index 0136870..4006794 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/JiaBan.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/JiaBan.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="JiaBan.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.License.JiaBan" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -10,88 +12,102 @@
 <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:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="加班作业票" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="JiaBanId" DataIDField="JiaBanId" AllowSorting="true"
-                    SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
-                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <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" DataKeyNames="JiaBanId" DataIDField="JiaBanId" AllowSorting="true"
+                            SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
+                                            EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                        <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:RadioButtonList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
+                                    SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
+                                    FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
+                                    FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+
+                                <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="WorkMeasures" DataField="WorkMeasures"
+                                    SortField="WorkMeasures" FieldType="String" HeaderText="作业内容及安全措施" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
+                                    SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                                <%--         <f:RenderField Width="150px" ColumnID="EquipmentTools" DataField="EquipmentTools" 
+         SortField="EquipmentTools" FieldType="String" HeaderText="设备及工具" HeaderTextAlign="Center"
+         TextAlign="Left">
+     </f:RenderField>--%>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                                 </f:DropDownList>
-                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
-                                <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                </f:RadioButtonList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
-                            SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
-                            FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
-                            FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                         
-                        <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="WorkMeasures" DataField="WorkMeasures"
-                            SortField="WorkMeasures" FieldType="String" HeaderText="作业内容及安全措施" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
-                            SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                        </f:RenderField>
-                        <%--         <f:RenderField Width="150px" ColumnID="EquipmentTools" DataField="EquipmentTools" 
-                        SortField="EquipmentTools" FieldType="String" HeaderText="设备及工具" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>--%>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="加班作业票" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/JiaBan.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/JiaBan.aspx.cs
index bea8c0a..b73a36a 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/JiaBan.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/JiaBan.aspx.cs
@@ -40,20 +40,21 @@ namespace FineUIPro.Web.HSSE.License
             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"];
-                //}
-
-                UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnit.Enabled = false;
+                    this.ProjectId = Request.Params["projectId"];
                 }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+
 
                 this.drpStates.DataValueField = "Value";
                 this.drpStates.DataTextField = "Text";
@@ -69,11 +70,37 @@ namespace FineUIPro.Web.HSSE.License
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnit.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = "SELECT license.JiaBanId,license.ProjectId,license.LicenseCode,license.ApplyUnitId,ApplyUnit.UnitName AS ApplyUnitName,license.ApplyManId,license.ApplyDate,license.WorkPalce,license.ValidityStartTime,license.ValidityEndTime,license.WorkMeasures,license.States"
                         + @" ,(CASE WHEN license.States=-2 THEN '作废' WHEN license.States=0 THEN '待提交' WHEN license.States=1 THEN '审核中'  WHEN license.States=2 THEN '作业中' WHEN license.States=3 THEN '已完成' WHEN license.States=-1 THEN '已取消' ELSE '未知' END) AS StatesName,WorkType,EquipmentTools "
                         + @" FROM dbo.License_JiaBan AS license "
@@ -85,8 +112,8 @@ namespace FineUIPro.Web.HSSE.License
             {
                 strSql += " AND license.ApplyUnitId = @UnitId";  ///状态为已完成
                 listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
-            }       
-            if (this.drpUnit.SelectedValue != Const._Null)
+            }
+            if (this.drpUnit.SelectedValue != null && this.drpUnit.SelectedValue != Const._Null)
             {
                 strSql += " AND license.ApplyUnitId = @UnitId2";
                 listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
@@ -238,7 +265,7 @@ namespace FineUIPro.Web.HSSE.License
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectJiaBanWorkMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectJiaBanWorkMenuId);
             if (buttonList.Count() > 0)
             {
                 //if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/JiaBan.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/JiaBan.aspx.designer.cs
index 7587574..80a93ef 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/JiaBan.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/JiaBan.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.HSSE.License
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <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 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/LicenseManager.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/LicenseManager.aspx.cs
index 4f9cedc..8282b13 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/LicenseManager.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/LicenseManager.aspx.cs
@@ -37,14 +37,12 @@ namespace FineUIPro.Web.HSSE.License
             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.InitDropDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
                 if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
@@ -62,25 +60,23 @@ namespace FineUIPro.Web.HSSE.License
                     Grid1.PageSize = this.CurrUser.PageSize.Value;
                 }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                GetList();
                 // 绑定表格
                 this.BindGrid();
             }
         }
         protected void changeTree(object sender, EventArgs e)
         {
-
             this.ProjectId = this.ucTree.ProjectId;
-            GetList();
-            this.BindGrid();
+            this.InitDropDownList();
 
-            this.GetButtonPower();
-            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            if (string.IsNullOrEmpty(this.ProjectId))
             {
                 btnNew.Hidden = true;
             }
+            this.GetButtonPower();
+            this.BindGrid();
         }
-        private void GetList()
+        private void InitDropDownList()
         {
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
@@ -98,8 +94,11 @@ namespace FineUIPro.Web.HSSE.License
         /// 绑定数据
         /// </summary>
         private void BindGrid()
-        { 
-
+        {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 string strSql = "SELECT LicenseManager.LicenseManagerId,LicenseManager.ProjectId,LicenseManager.WorkStatesStr,LicenseManager.LicenseTypeId,CodeRecords.Code AS  LicenseManagerCode,LicenseManager.IsHighRisk,LicenseManager.LicenseManageName,LicenseManager.UnitId,LicenseManager.LicenseManageContents,LicenseManager.CompileMan,LicenseManager.CompileDate,LicenseManager.States,LicenseManager.ProjectCode,LicenseManager.ProjectName,LicenseManager.LicenseTypeName,LicenseManager.UnitName,LicenseManager.UnitTypeName,LicenseManager.UserName,LicenseManager.WorkAreaName,LicenseManager.StartDate,LicenseManager.EndDate"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/LiftingWork.aspx b/SUBQHSE/FineUIPro.Web/HSSE/License/LiftingWork.aspx
index da68253..d4593df 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/LiftingWork.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/LiftingWork.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LiftingWork.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.License.LiftingWork" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -10,90 +12,104 @@
 <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:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="吊装作业票" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="LiftingWorkId" DataIDField="LiftingWorkId" AllowSorting="true"
-                    SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
-                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <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" DataKeyNames="LiftingWorkId" DataIDField="LiftingWorkId" AllowSorting="true"
+                            SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
+                                            EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                        <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:RadioButtonList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
+                                    SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
+                                    FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
+                                    FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="WorkLevel" DataField="WorkLevel" SortField="WorkLevel"
+                                    FieldType="String" HeaderText="级别" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="WorkMeasures" DataField="WorkMeasures"
+                                    SortField="WorkMeasures" FieldType="String" HeaderText="作业内容" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="CraneCapacity" DataField="CraneCapacity"
+                                    SortField="CraneCapacity" FieldType="String" HeaderText="起重机能力及索具规格" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
+                                    SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                                 </f:DropDownList>
-                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
-                                <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                </f:RadioButtonList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
-                            SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
-                            FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
-                            FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="WorkLevel" DataField="WorkLevel" SortField="WorkLevel"
-                            FieldType="String" HeaderText="级别" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="WorkMeasures" DataField="WorkMeasures"
-                            SortField="WorkMeasures" FieldType="String" HeaderText="作业内容" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="CraneCapacity" DataField="CraneCapacity"
-                            SortField="CraneCapacity" FieldType="String" HeaderText="起重机能力及索具规格" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
-                            SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="吊装作业票" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/LiftingWork.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/LiftingWork.aspx.cs
index eb3d285..2da71b2 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/LiftingWork.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/LiftingWork.aspx.cs
@@ -40,19 +40,19 @@ namespace FineUIPro.Web.HSSE.License
             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"];
-                //}
-
-                UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnit.Enabled = false;
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
 
                 this.drpStates.DataValueField = "Value";
@@ -69,11 +69,37 @@ namespace FineUIPro.Web.HSSE.License
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnit.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = "SELECT license.LiftingWorkId,license.ProjectId,license.LicenseCode,license.ApplyUnitId,ApplyUnit.UnitName AS ApplyUnitName,license.ApplyManId,license.ApplyDate,license.WorkPalce,license.ValidityStartTime,license.ValidityEndTime,license.WorkMeasures"
                         + @" ,license.WorkLevel,license.CraneCapacity,license.States "
                         + @" ,(CASE WHEN license.States=-2 THEN '作废' WHEN license.States=0 THEN '待提交' WHEN license.States=1 THEN '审核中'  WHEN license.States=2 THEN '作业中' WHEN license.States=3 THEN '已完成' WHEN license.States=-1 THEN '已取消' ELSE '未知' END) AS StatesName "
@@ -86,8 +112,8 @@ namespace FineUIPro.Web.HSSE.License
             {
                 strSql += " AND license.ApplyUnitId = @UnitId";  ///状态为已完成
                 listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
-            }       
-            if (this.drpUnit.SelectedValue != Const._Null)
+            }
+            if (this.drpUnit.SelectedValue != null && this.drpUnit.SelectedValue != Const._Null)
             {
                 strSql += " AND license.ApplyUnitId = @UnitId2";
                 listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
@@ -239,7 +265,7 @@ namespace FineUIPro.Web.HSSE.License
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectLiftingWorkMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectLiftingWorkMenuId);
             if (buttonList.Count() > 0)
             {
                 //if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/LiftingWork.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/LiftingWork.aspx.designer.cs
index 85c5d07..46715b4 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/LiftingWork.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/LiftingWork.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.License {
-    
-    
-    public partial class LiftingWork {
-        
+namespace FineUIPro.Web.HSSE.License
+{
+
+
+    public partial class LiftingWork
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <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 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpStates 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList drpStates;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnPrinter 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinter;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/LimitedSpace.aspx b/SUBQHSE/FineUIPro.Web/HSSE/License/LimitedSpace.aspx
index 74a668e..917e20a 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/LimitedSpace.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/LimitedSpace.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LimitedSpace.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.License.LimitedSpace" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -10,83 +12,97 @@
 <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:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="受限空间作业票" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="LimitedSpaceId" DataIDField="LimitedSpaceId" AllowSorting="true"
-                    SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
-                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <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" DataKeyNames="LimitedSpaceId" DataIDField="LimitedSpaceId" AllowSorting="true"
+                            SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
+                                            EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                        <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:RadioButtonList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
+                                    SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="240px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
+                                    FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
+                                    FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="作业开始时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="作业结束时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="WorkMeasures" DataField="WorkMeasures"
+                                    SortField="WorkMeasures" FieldType="String" HeaderText="作业内容" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
+                                    SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                                 </f:DropDownList>
-                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
-                                <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                </f:RadioButtonList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
-                            SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="240px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
-                            FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
-                            FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="作业开始时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="作业结束时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="WorkMeasures" DataField="WorkMeasures"
-                            SortField="WorkMeasures" FieldType="String" HeaderText="作业内容" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
-                            SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="受限空间作业票" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/LimitedSpace.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/LimitedSpace.aspx.cs
index f1b04ab..11bd52d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/LimitedSpace.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/LimitedSpace.aspx.cs
@@ -40,19 +40,19 @@ namespace FineUIPro.Web.HSSE.License
             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"];
-                //}
-
-                UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnit.Enabled = false;
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
 
                 this.drpStates.DataValueField = "Value";
@@ -69,11 +69,41 @@ namespace FineUIPro.Web.HSSE.License
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnit.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            //if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            //{
+            //    btnNew.Hidden = true;
+            //}
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = "SELECT license.LimitedSpaceId,license.ProjectId,license.LicenseCode,license.ApplyUnitId,ApplyUnit.UnitName AS ApplyUnitName,license.ApplyManId,license.ApplyDate,license.WorkPalce,license.ValidityStartTime,license.ValidityEndTime,license.WorkMeasures,license.States"
                         + @" ,(CASE WHEN license.States=-2 THEN '作废'  WHEN license.States=0 THEN '待提交' WHEN license.States=1 THEN '审核中'  WHEN license.States=2 THEN '作业中' WHEN license.States=3 THEN '已完成' WHEN license.States=-1 THEN '已取消' ELSE '未知' END) AS StatesName "
                         + @" FROM dbo.License_LimitedSpace AS license "
@@ -86,7 +116,7 @@ namespace FineUIPro.Web.HSSE.License
                 strSql += " AND license.ApplyUnitId = @UnitId";  ///状态为已完成
                 listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
             }
-            if (this.drpUnit.SelectedValue != Const._Null)
+            if (this.drpUnit.SelectedValue != null && this.drpUnit.SelectedValue != Const._Null)
             {
                 strSql += " AND license.ApplyUnitId = @UnitId2";
                 listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
@@ -238,7 +268,7 @@ namespace FineUIPro.Web.HSSE.License
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectLimitedSpaceMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectLimitedSpaceMenuId);
             if (buttonList.Count() > 0)
             {
                 //if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/LimitedSpace.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/LimitedSpace.aspx.designer.cs
index a02ce7f..7246187 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/LimitedSpace.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/LimitedSpace.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.License {
-    
-    
-    public partial class LimitedSpace {
-        
+namespace FineUIPro.Web.HSSE.License
+{
+
+
+    public partial class LimitedSpace
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <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 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpStates 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList drpStates;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnPrinter 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinter;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/NightWork.aspx b/SUBQHSE/FineUIPro.Web/HSSE/License/NightWork.aspx
index 38644cd..6a128c6 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/NightWork.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/NightWork.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NightWork.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.License.NightWork" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -10,83 +12,97 @@
 <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:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="夜间施工作业票" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="NightWorkId" DataIDField="NightWorkId" AllowSorting="true"
-                    SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
-                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <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" DataKeyNames="NightWorkId" DataIDField="NightWorkId" AllowSorting="true"
+                            SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
+                                            EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                        <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:RadioButtonList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
+                                    SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="210px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
+                                    FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="160px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
+                                    FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="WorkMeasures" DataField="WorkMeasures"
+                                    SortField="WorkMeasures" FieldType="String" HeaderText="作业内容" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
+                                    SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                                 </f:DropDownList>
-                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
-                                <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                </f:RadioButtonList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
-                            SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="210px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
-                            FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="160px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
-                            FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="WorkMeasures" DataField="WorkMeasures"
-                            SortField="WorkMeasures" FieldType="String" HeaderText="作业内容" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                         <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
-                            SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="夜间施工作业票" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/NightWork.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/NightWork.aspx.cs
index f98fa15..7ebecb4 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/NightWork.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/NightWork.aspx.cs
@@ -40,19 +40,19 @@ namespace FineUIPro.Web.HSSE.License
             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"];
-                //}
-
-                UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnit.Enabled = false;
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
 
                 this.drpStates.DataValueField = "Value";
@@ -69,11 +69,38 @@ namespace FineUIPro.Web.HSSE.License
                 this.BindGrid();
             }
         }
+
+        private void InitDropDownList()
+        {
+            UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnit.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = "SELECT license.NightWorkId,license.ProjectId,license.LicenseCode,license.ApplyUnitId,ApplyUnit.UnitName AS ApplyUnitName,license.ApplyManId,license.ApplyDate,license.WorkPalce,license.ValidityStartTime,license.ValidityEndTime,license.WorkMeasures,license.States"
                         + @" ,(CASE WHEN license.States=-2 THEN '作废' WHEN license.States=0 THEN '待提交' WHEN license.States=1 THEN '审核中'  WHEN license.States=2 THEN '作业中' WHEN license.States=3 THEN '已完成' WHEN license.States=-1 THEN '已取消' ELSE '未知' END) AS StatesName "
                         + @" FROM dbo.License_NightWork AS license "
@@ -85,8 +112,8 @@ namespace FineUIPro.Web.HSSE.License
             {
                 strSql += " AND license.ApplyUnitId = @UnitId";  ///状态为已完成
                 listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
-            }       
-            if (this.drpUnit.SelectedValue != Const._Null)
+            }
+            if (this.drpUnit.SelectedValue != null && this.drpUnit.SelectedValue != Const._Null)
             {
                 strSql += " AND license.ApplyUnitId = @UnitId2";
                 listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
@@ -238,7 +265,7 @@ namespace FineUIPro.Web.HSSE.License
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectNightWorkMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectNightWorkMenuId);
             if (buttonList.Count() > 0)
             {
                 //if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/NightWork.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/NightWork.aspx.designer.cs
index 0cf0d22..08de0aa 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/NightWork.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/NightWork.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.License {
-    
-    
-    public partial class NightWork {
-        
+namespace FineUIPro.Web.HSSE.License
+{
+
+
+    public partial class NightWork
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <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 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpStates 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList drpStates;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnPrinter 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinter;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/OpenCircuit.aspx b/SUBQHSE/FineUIPro.Web/HSSE/License/OpenCircuit.aspx
index 4986cb2..cadff73 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/OpenCircuit.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/OpenCircuit.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OpenCircuit.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.License.OpenCircuit" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -10,91 +12,105 @@
 <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:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="断路(占道)作业票" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="OpenCircuitId" DataIDField="OpenCircuitId" AllowSorting="true"
-                    SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
-                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <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" DataKeyNames="OpenCircuitId" DataIDField="OpenCircuitId" AllowSorting="true"
+                            SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
+                                            EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                        <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:RadioButtonList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
+                                    SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
+                                    FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
+                                    FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="WorkMeasures" DataField="WorkMeasures"
+                                    SortField="WorkMeasures" FieldType="String" HeaderText="作业内容" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="RoadName" DataField="RoadName"
+                                    SortField="RoadName" FieldType="String" HeaderText="占用道路名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
+                                    SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                                <%--   <f:RenderField Width="180px" ColumnID="SafeMeasures" DataField="SafeMeasures" 
+        SortField="SafeMeasures" FieldType="String" HeaderText="安全措施及使用的工机具说明" HeaderTextAlign="Center"
+        TextAlign="Left">
+    </f:RenderField>--%>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                                 </f:DropDownList>
-                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
-                                <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                </f:RadioButtonList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
-                            SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
-                            FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
-                            FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="WorkMeasures" DataField="WorkMeasures"
-                            SortField="WorkMeasures" FieldType="String" HeaderText="作业内容" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="RoadName" DataField="RoadName"
-                            SortField="RoadName" FieldType="String" HeaderText="占用道路名称" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                         <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
-                            SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                        </f:RenderField>
-                        <%--   <f:RenderField Width="180px" ColumnID="SafeMeasures" DataField="SafeMeasures" 
-                        SortField="SafeMeasures" FieldType="String" HeaderText="安全措施及使用的工机具说明" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>--%>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="断路(占道)作业票" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/OpenCircuit.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/OpenCircuit.aspx.cs
index 2ee83ed..320a88e 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/OpenCircuit.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/OpenCircuit.aspx.cs
@@ -40,19 +40,19 @@ namespace FineUIPro.Web.HSSE.License
             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"];
-                //}
-
-                UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnit.Enabled = false;
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
 
                 this.drpStates.DataValueField = "Value";
@@ -69,25 +69,52 @@ namespace FineUIPro.Web.HSSE.License
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnit.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = "SELECT license.OpenCircuitId,license.ProjectId,license.LicenseCode,license.ApplyUnitId,ApplyUnit.UnitName AS ApplyUnitName,license.ApplyManId,license.ApplyDate,license.WorkPalce,license.ValidityStartTime,license.ValidityEndTime,license.WorkMeasures"
                         + @" ,license.SafeMeasures,license.RoadName,license.States"
                         + @" ,(CASE WHEN license.States=-2 THEN '作废'  WHEN license.States=0 THEN '待提交' WHEN license.States=1 THEN '审核中'  WHEN license.States=2 THEN '作业中' WHEN license.States=3 THEN '已完成' WHEN license.States=-1 THEN '已取消' ELSE '未知' END) AS StatesName "
                         + @" FROM dbo.License_OpenCircuit AS license "
                         + @" LEFT JOIN Base_Unit AS ApplyUnit ON license.ApplyUnitId =ApplyUnit.UnitId"
-                        + @" WHERE license.ProjectId= '" + this.ProjectId +"'";
+                        + @" WHERE license.ProjectId= '" + this.ProjectId + "'";
             List<SqlParameter> listStr = new List<SqlParameter>();
-           
+
             if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
             {
                 strSql += " AND license.ApplyUnitId = @UnitId";  ///状态为已完成
                 listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
-            }       
-            if (this.drpUnit.SelectedValue != Const._Null)
+            }
+            if (this.drpUnit.SelectedValue != null && this.drpUnit.SelectedValue != Const._Null)
             {
                 strSql += " AND license.ApplyUnitId = @UnitId2";
                 listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
@@ -101,7 +128,7 @@ namespace FineUIPro.Web.HSSE.License
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
             Grid1.RecordCount = tb.Rows.Count;
-            
+
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();
@@ -239,7 +266,7 @@ namespace FineUIPro.Web.HSSE.License
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectOpenCircuitMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectOpenCircuitMenuId);
             if (buttonList.Count() > 0)
             {
                 //if (buttonList.Contains(BLL.Const.BtnAdd))
@@ -317,7 +344,7 @@ namespace FineUIPro.Web.HSSE.License
                     var getUser = UserService.GetUserByUserId(getOpenCircuit.ApplyManId);
                     if (getUser != null)
                     {
-                            bookmarkApplyManName.Text = getUser.UserName;
+                        bookmarkApplyManName.Text = getUser.UserName;
                     }
 
 
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/OpenCircuit.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/OpenCircuit.aspx.designer.cs
index fa063ad..c6ecc54 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/OpenCircuit.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/OpenCircuit.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.License {
-    
-    
-    public partial class OpenCircuit {
-        
+namespace FineUIPro.Web.HSSE.License
+{
+
+
+    public partial class OpenCircuit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <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 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpStates 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList drpStates;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnPrinter 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinter;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/PressureTest.aspx b/SUBQHSE/FineUIPro.Web/HSSE/License/PressureTest.aspx
index 1135269..2d6463d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/PressureTest.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/PressureTest.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PressureTest.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.License.PressureTest" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -10,83 +12,97 @@
 <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:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="试压作业票" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="PressureTestId" DataIDField="PressureTestId" AllowSorting="true"
-                    SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
-                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <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" DataKeyNames="PressureTestId" DataIDField="PressureTestId" AllowSorting="true"
+                            SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
+                                            EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                        <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:RadioButtonList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="80px" ColumnID="LicenseCode" DataField="LicenseCode"
+                                    SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
+                                    FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
+                                    FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="WorkContent" DataField="WorkContent"
+                                    SortField="WorkContent" FieldType="String" HeaderText="作业内容" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
+                                    SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                                 </f:DropDownList>
-                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
-                                <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                </f:RadioButtonList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="80px" ColumnID="LicenseCode" DataField="LicenseCode"
-                            SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                         <f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
-                            FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>                       
-                        <f:RenderField Width="150px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
-                            FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>                         
-                        <f:RenderField Width="140px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="WorkContent" DataField="WorkContent"
-                            SortField="WorkContent" FieldType="String" HeaderText="作业内容" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>                        
-                         <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
-                            SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="临电作业票" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/PressureTest.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/PressureTest.aspx.cs
index 64ba97b..c775360 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/PressureTest.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/PressureTest.aspx.cs
@@ -40,19 +40,19 @@ namespace FineUIPro.Web.HSSE.License
             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"];
-                //}
-
-                UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnit.Enabled = false;
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
 
                 this.drpStates.DataValueField = "Value";
@@ -69,11 +69,39 @@ namespace FineUIPro.Web.HSSE.License
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnit.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = "SELECT license.PressureTestId,license.ProjectId,license.LicenseCode,license.ApplyUnitId,ApplyUnit.UnitName AS ApplyUnitName,license.ApplyManId,license.ApplyDate,license.WorkPalce,license.ValidityStartTime,license.ValidityEndTime,license.WorkContent,license.States"
                         + @" ,(CASE WHEN license.States=-2 THEN '作废' WHEN license.States=0 THEN '待提交' WHEN license.States=1 THEN '审核中'  WHEN license.States=2 THEN '作业中' WHEN license.States=3 THEN '已完成' WHEN license.States=-1 THEN '已取消' ELSE '未知' END) AS StatesName "
                         + @" FROM dbo.License_PressureTest AS license "
@@ -86,7 +114,7 @@ namespace FineUIPro.Web.HSSE.License
                 strSql += " AND license.ApplyUnitId = @UnitId";  ///状态为已完成
                 listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
             }
-            if (this.drpUnit.SelectedValue != Const._Null)
+            if (this.drpUnit.SelectedValue != null && this.drpUnit.SelectedValue != Const._Null)
             {
                 strSql += " AND license.ApplyUnitId = @UnitId2";
                 listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
@@ -238,7 +266,7 @@ namespace FineUIPro.Web.HSSE.License
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectPressureTestMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectPressureTestMenuId);
             if (buttonList.Count() > 0)
             {
                 //if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/PressureTest.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/PressureTest.aspx.designer.cs
index 2f635a8..0ab4519 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/PressureTest.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/PressureTest.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.HSSE.License
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <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 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/RadialWork.aspx b/SUBQHSE/FineUIPro.Web/HSSE/License/RadialWork.aspx
index 80cce58..568f893 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/RadialWork.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/RadialWork.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RadialWork.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.License.RadialWork" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -10,86 +12,100 @@
 <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:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="射线作业票" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="RadialWorkId" DataIDField="RadialWorkId" AllowSorting="true"
-                    SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
-                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <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" DataKeyNames="RadialWorkId" DataIDField="RadialWorkId" AllowSorting="true"
+                            SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
+                                            EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                        <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:RadioButtonList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
+                                    SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="210px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
+                                    FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="RadialType" DataField="RadialType" SortField="RadialType"
+                                    FieldType="String" HeaderText="射线类型" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
+                                    FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="WorkMeasures" DataField="WorkMeasures"
+                                    SortField="WorkMeasures" FieldType="String" HeaderText="安全距离及受影响区域/单位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
+                                    SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                                 </f:DropDownList>
-                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
-                                <f:RadioButtonList ID="drpStates" runat="server" Width="550px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                </f:RadioButtonList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
-                            SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="210px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
-                            FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="RadialType" DataField="RadialType" SortField="RadialType"
-                            FieldType="String" HeaderText="射线类型" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
-                            FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="WorkMeasures" DataField="WorkMeasures"
-                            SortField="WorkMeasures" FieldType="String" HeaderText="安全距离及受影响区域/单位" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                          <f:RenderField Width="80px" ColumnID="StatesName" DataField="StatesName"
-                            SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="射线作业票" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/RadialWork.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/RadialWork.aspx.cs
index 75e9e6c..52dcdb4 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/RadialWork.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/RadialWork.aspx.cs
@@ -40,19 +40,19 @@ namespace FineUIPro.Web.HSSE.License
             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"];
-                //}
-
-                UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnit.Enabled = false;
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
 
                 this.drpStates.DataValueField = "Value";
@@ -69,11 +69,42 @@ namespace FineUIPro.Web.HSSE.License
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnit.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            //if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            //{
+            //    btnNew.Hidden = true;
+            //}
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = "SELECT license.RadialWorkId,license.ProjectId,license.LicenseCode,license.ApplyUnitId,ApplyUnit.UnitName AS ApplyUnitName,license.ApplyManId,license.ApplyDate,license.RadialType,license.WorkPalce,license.ValidityStartTime,license.ValidityEndTime,license.WorkMeasures,license.States"
                         + @" ,(CASE WHEN license.States=-2 THEN '作废' WHEN license.States=0 THEN '待提交' WHEN license.States=1 THEN '审核中'  WHEN license.States=2 THEN '作业中' WHEN license.States=3 THEN '已完成' WHEN license.States=-1 THEN '已取消' ELSE '未知' END) AS StatesName "
                         + @" FROM dbo.License_RadialWork AS license "
@@ -85,8 +116,8 @@ namespace FineUIPro.Web.HSSE.License
             {
                 strSql += " AND license.ApplyUnitId = @UnitId";  ///状态为已完成
                 listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
-            }       
-            if (this.drpUnit.SelectedValue != Const._Null)
+            }
+            if (this.drpUnit.SelectedValue != null && this.drpUnit.SelectedValue != Const._Null)
             {
                 strSql += " AND license.ApplyUnitId = @UnitId2";
                 listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
@@ -237,7 +268,7 @@ namespace FineUIPro.Web.HSSE.License
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectRadialWorkMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectRadialWorkMenuId);
             if (buttonList.Count() > 0)
             {
                 //if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/RadialWork.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/RadialWork.aspx.designer.cs
index 1ef192e..775e540 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/RadialWork.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/RadialWork.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.License {
-    
-    
-    public partial class RadialWork {
-        
+namespace FineUIPro.Web.HSSE.License
+{
+
+
+    public partial class RadialWork
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <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 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpStates 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList drpStates;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnPrinter 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.License {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinter;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/TempElectricity.aspx b/SUBQHSE/FineUIPro.Web/HSSE/License/TempElectricity.aspx
index 5304ea7..60972d2 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/TempElectricity.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/TempElectricity.aspx
@@ -1,6 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TempElectricity.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.License.TempElectricity" %>
-
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %> 
+ 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -8,11 +9,22 @@
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
 </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">
-            <Items>
+    <form id="form1" runat="server"> <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+ <f:Panel ID="Panel1" 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" DataKeyNames="TempElectricityId" DataIDField="TempElectricityId" AllowSorting="true"
                     SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
@@ -87,8 +99,10 @@
                         </f:DropDownList>
                     </PageItems>
                 </f:Grid>
-            </Items>
+			 </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"
             Width="1000px" Height="640px">
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/TempElectricity.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/TempElectricity.aspx.cs
index 48a7886..fd01450 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/TempElectricity.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/TempElectricity.aspx.cs
@@ -40,19 +40,19 @@ namespace FineUIPro.Web.HSSE.License
             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"];
-                //}
-
-                UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnit.Enabled = false;
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
 
                 this.drpStates.DataValueField = "Value";
@@ -69,11 +69,38 @@ namespace FineUIPro.Web.HSSE.License
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnit.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = "SELECT license.TempElectricityId,license.ProjectId,license.LicenseCode,license.ApplyUnitId,ApplyUnit.UnitName AS ApplyUnitName,license.ApplyManId,license.ApplyDate,license.WorkPalce,license.ValidityStartTime,license.ValidityEndTime,license.WorkMeasures,license.States"
                         + @" ,(CASE WHEN license.States=-2 THEN '作废' WHEN license.States=0 THEN '待提交' WHEN license.States=1 THEN '审核中'  WHEN license.States=2 THEN '作业中' WHEN license.States=3 THEN '已完成' WHEN license.States=-1 THEN '已取消' ELSE '未知' END) AS StatesName "
                         + @" FROM dbo.License_TempElectricity AS license "
@@ -86,7 +113,7 @@ namespace FineUIPro.Web.HSSE.License
                 strSql += " AND license.ApplyUnitId = @UnitId";  ///状态为已完成
                 listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
             }
-            if (this.drpUnit.SelectedValue != Const._Null)
+            if (this.drpUnit.SelectedValue != null && this.drpUnit.SelectedValue != Const._Null)
             {
                 strSql += " AND license.ApplyUnitId = @UnitId2";
                 listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
@@ -238,7 +265,7 @@ namespace FineUIPro.Web.HSSE.License
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectTempElectricityMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectTempElectricityMenuId);
             if (buttonList.Count() > 0)
             {
                 //if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/TempElectricity.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/TempElectricity.aspx.designer.cs
index 20e5493..b974f3e 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/TempElectricity.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/TempElectricity.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.HSSE.License
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <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 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/AttendMeeting.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/AttendMeeting.aspx.cs
index f2bfe65..1afd00e 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/AttendMeeting.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/AttendMeeting.aspx.cs
@@ -41,17 +41,10 @@ namespace FineUIPro.Web.HSSE.Meeting
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-
+                this.InitDropDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
 
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
-                Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
-                {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
-                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("AttendMeetingEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -74,14 +67,29 @@ namespace FineUIPro.Web.HSSE.Meeting
         protected void changeTree(object sender, EventArgs e)
         {
             this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
             this.BindGrid();
         }
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
+            Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
 
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 string strSql = "SELECT AttendMeeting.AttendMeetingId,AttendMeeting.ProjectId,CodeRecords.Code AS AttendMeetingCode,Unit.UnitId,Unit.UnitName,AttendMeeting.AttendMeetingName,AttendMeeting.AttendMeetingDate,AttendMeeting.CompileMan,AttendMeeting.AttendMeetingContents,AttendMeeting.CompileDate,AttendMeeting.States "
@@ -97,7 +105,7 @@ namespace FineUIPro.Web.HSSE.Meeting
                 strSql += " AND AttendMeeting.ProjectId = @ProjectId";
                 listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
 
-                if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+                if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != BLL.Const._Null)
                 {
                     strSql += " AND Unit.UnitId = @UnitId";
                     listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs
index 2252b70..d6efbec 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs
@@ -35,21 +35,15 @@ namespace FineUIPro.Web.HSSE.Meeting
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                this.ProjectId = this.CurrUser.LoginProjectId;
+                this.ProjectId = this.ProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+                this.InitDropDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
 
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
-                Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
-                {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
-                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("ClassMeetingEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -67,10 +61,20 @@ namespace FineUIPro.Web.HSSE.Meeting
                 }
             }
         }
-
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
+            Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
         protected void changeTree(object sender, EventArgs e)
         {
             this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
             this.BindGrid();
         }
 
@@ -79,6 +83,10 @@ namespace FineUIPro.Web.HSSE.Meeting
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 string strSql = "SELECT ClassMeeting.ClassMeetingId,ClassMeeting.ProjectId,CodeRecords.Code AS   ClassMeetingCode,Unit.UnitId,Unit.UnitName,TeamGroup.TeamGroupName,ClassMeeting.ClassMeetingName,ClassMeeting.ClassMeetingDate,ClassMeeting.CompileMan,ClassMeeting.ClassMeetingContents,ClassMeeting.CompileDate,ClassMeeting.States "
@@ -96,7 +104,7 @@ namespace FineUIPro.Web.HSSE.Meeting
                 strSql += " AND ClassMeeting.ProjectId = @ProjectId";
                 listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
 
-                if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+                if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != BLL.Const._Null)
                 {
                     strSql += " AND Unit.UnitId = @UnitId";
                     listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
@@ -287,7 +295,7 @@ namespace FineUIPro.Web.HSSE.Meeting
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectClassMeetingMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectClassMeetingMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/MeetingManage.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/MeetingManage.aspx.cs
index 14d5cdb..0aae4fb 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/MeetingManage.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/MeetingManage.aspx.cs
@@ -39,7 +39,7 @@ namespace FineUIPro.Web.HSSE.Meeting
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                //BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 this.Panel1.Title = "安全会议（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/MonthMeeting.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/MonthMeeting.aspx.cs
index ac1b36e..96fa087 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/MonthMeeting.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/MonthMeeting.aspx.cs
@@ -42,15 +42,9 @@ namespace FineUIPro.Web.HSSE.Meeting
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+                this.InitDropDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
-                Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
-                {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
-                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("MonthMeetingEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -72,14 +66,30 @@ namespace FineUIPro.Web.HSSE.Meeting
         protected void changeTree(object sender, EventArgs e)
         {
             this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
             this.BindGrid();
         }
 
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
+            Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 string strSql = @"SELECT MonthMeeting.MonthMeetingId,MonthMeeting.ProjectId,CodeRecords.Code AS MonthMeetingCode,Unit.UnitId,Unit.UnitName,MonthMeeting.MonthMeetingName,MonthMeeting.MonthMeetingDate,MonthMeeting.CompileMan,MonthMeeting.MonthMeetingContents,MonthMeeting.CompileDate,MonthMeeting.States,MonthMeeting.MeetingHours,MonthMeeting.MeetingHostMan,MonthMeeting.AttentPersonNum,MonthMeeting.AttentPerson "
@@ -95,7 +105,7 @@ namespace FineUIPro.Web.HSSE.Meeting
                 strSql += " AND MonthMeeting.ProjectId = @ProjectId";
                 listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
 
-                if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+                if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != BLL.Const._Null)
                 {
                     strSql += " AND Unit.UnitId = @UnitId";
                     listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
@@ -218,7 +228,7 @@ namespace FineUIPro.Web.HSSE.Meeting
                 {
                     PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthMeetingEdit.aspx?MonthMeetingId={0}", id, "编辑 - ")));
                 }
-            } 
+            }
         }
         #endregion
 
@@ -241,7 +251,7 @@ namespace FineUIPro.Web.HSSE.Meeting
                         BLL.LogService.AddSys_Log(this.CurrUser, meet.MonthMeetingCode, meet.MonthMeetingId, BLL.Const.ProjectMonthMeetingMenuId, BLL.Const.BtnDelete);
 
                         BLL.MonthMeetingService.DeleteMonthMeetingById(rowID);
-                      
+
                     }
                 }
                 // Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SafetyMeeting);
@@ -315,11 +325,11 @@ namespace FineUIPro.Web.HSSE.Meeting
             Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("安全月例会" + filename, System.Text.Encoding.UTF8) + ".xls");
             Response.ContentType = "application/excel";
             Response.ContentEncoding = System.Text.Encoding.UTF8;
-           this.Grid1.PageSize = this.Grid1.RecordCount;
+            this.Grid1.PageSize = this.Grid1.RecordCount;
             this.BindGrid();
             Response.Write(GetGridTableHtml(Grid1));
             Response.End();
-       }
+        }
         #endregion
 
         protected void btnView_Click(object sender, EventArgs e)
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeeting.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeeting.aspx.cs
index eddca3f..6cc88e4 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeeting.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeeting.aspx.cs
@@ -42,37 +42,41 @@ namespace FineUIPro.Web.HSSE.Meeting
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+                this.InitDropDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
 
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
-                Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
-                {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
-                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("SafetyLeaderGroupMeetingEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
                     Grid1.PageSize = this.CurrUser.PageSize.Value;
                 }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                // 绑定表格
-                this.BindGrid();
-                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                if (!string.IsNullOrEmpty(this.ProjectId))
                 {
                     this.panelLeftRegion.Hidden = true;
                     //   this.Grid1.Columns[0].Hidden = true;
                     ////权限按钮方法
                     this.GetButtonPower();
                 }
+                // 绑定表格
+                this.BindGrid();
+            }
+        }
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
+            Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
             }
         }
-
         protected void changeTree(object sender, EventArgs e)
         {
             this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
             this.BindGrid();
         }
 
@@ -81,6 +85,10 @@ namespace FineUIPro.Web.HSSE.Meeting
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 string strSql = @"SELECT SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingId,SafetyLeaderGroupMeeting.ProjectId,CodeRecords.Code AS SafetyLeaderGroupMeetingCode,Unit.UnitId,Unit.UnitName,SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingName,SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingDate,SafetyLeaderGroupMeeting.CompileMan,SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingContents,SafetyLeaderGroupMeeting.CompileDate,SafetyLeaderGroupMeeting.States,SafetyLeaderGroupMeeting.MeetingHours,SafetyLeaderGroupMeeting.MeetingHostMan,SafetyLeaderGroupMeeting.AttentPersonNum,SafetyLeaderGroupMeeting.AttentPerson "
@@ -96,7 +104,7 @@ namespace FineUIPro.Web.HSSE.Meeting
                 strSql += " AND SafetyLeaderGroupMeeting.ProjectId = @ProjectId";
                 listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
 
-                if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+                if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != BLL.Const._Null)
                 {
                     strSql += " AND Unit.UnitId = @UnitId";
                     listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
@@ -242,7 +250,7 @@ namespace FineUIPro.Web.HSSE.Meeting
                         BLL.LogService.AddSys_Log(this.CurrUser, meet.SafetyLeaderGroupMeetingCode, meet.SafetyLeaderGroupMeetingId, BLL.Const.ProjectSafetyLeaderGroupMeetingMenuId, BLL.Const.BtnDelete);
 
                         BLL.SafetyLeaderGroupMeetingService.DeleteSafetyLeaderGroupMeetingById(rowID);
-         
+
                     }
                 }
                 //Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SafetyMeeting);
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/SpecialMeeting.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/SpecialMeeting.aspx.cs
index 1ff373a..ad94c57 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/SpecialMeeting.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/SpecialMeeting.aspx.cs
@@ -42,16 +42,10 @@ namespace FineUIPro.Web.HSSE.Meeting
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+                this.InitDropDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
 
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
-                Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
-                {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
-                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("SpecialMeetingEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -73,14 +67,29 @@ namespace FineUIPro.Web.HSSE.Meeting
         protected void changeTree(object sender, EventArgs e)
         {
             this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
             this.BindGrid();
         }
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
+            Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
 
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 string strSql = "SELECT SpecialMeeting.SpecialMeetingId,SpecialMeeting.ProjectId,CodeRecords.Code AS SpecialMeetingCode,Unit.UnitId,Unit.UnitName,SpecialMeeting.SpecialMeetingName,SpecialMeeting.SpecialMeetingDate,SpecialMeeting.CompileMan,SpecialMeeting.SpecialMeetingContents,SpecialMeeting.CompileDate,SpecialMeeting.States,SpecialMeeting.MeetingHours,SpecialMeeting.MeetingHostMan,SpecialMeeting.AttentPersonNum,SpecialMeeting.AttentPerson"
@@ -96,7 +105,7 @@ namespace FineUIPro.Web.HSSE.Meeting
                 strSql += " AND SpecialMeeting.ProjectId = @ProjectId";
                 listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
 
-                if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+                if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != BLL.Const._Null)
                 {
                     strSql += " AND Unit.UnitId = @UnitId";
                     listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
@@ -219,7 +228,7 @@ namespace FineUIPro.Web.HSSE.Meeting
                 {
                     PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SpecialMeetingEdit.aspx?SpecialMeetingId={0}", id, "编辑 - ")));
                 }
-            } 
+            }
         }
         #endregion
 
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/WeekMeeting.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/WeekMeeting.aspx.cs
index af3df8c..8a70bd5 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Meeting/WeekMeeting.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Meeting/WeekMeeting.aspx.cs
@@ -44,17 +44,10 @@ namespace FineUIPro.Web.HSSE.Meeting
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-
+                this.InitDropDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
               
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
-                Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
-                {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
-                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("WeekMeetingEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -75,14 +68,28 @@ namespace FineUIPro.Web.HSSE.Meeting
         protected void changeTree(object sender, EventArgs e)
         {
             this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
             this.BindGrid();
         }
-
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
+            Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         protected void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 string strSql = @"SELECT WeekMeeting.WeekMeetingId,WeekMeeting.ProjectId,CodeRecords.Code AS WeekMeetingCode,Unit.UnitId,Unit.UnitName,WeekMeeting.WeekMeetingName,WeekMeeting.WeekMeetingDate,WeekMeeting.CompileMan,Users.UserName AS CompileManName
@@ -98,7 +105,7 @@ namespace FineUIPro.Web.HSSE.Meeting
                 strSql += " AND WeekMeeting.ProjectId = @ProjectId";
                 listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
 
-                if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+                if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != BLL.Const._Null)
                 {
                     strSql += " AND Unit.UnitId = @UnitId";
                     listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
