diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/SpecialHazardsReportList.aspx b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/SpecialHazardsReportList.aspx
index ba055c3..2406931 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/SpecialHazardsReportList.aspx
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/SpecialHazardsReportList.aspx
@@ -1,158 +1,174 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SpecialHazardsReportList.aspx.cs" Inherits="FineUIPro.Web.Customization.CNCEC4.HSSE.Report.SpecialHazardsReportList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>企业重大事故隐患专项排查整治台账</title>
 </head>
 <body>
     <form id="form1" runat="server">
-          <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="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" EnableAjax="false" ShowHeader="false" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
+                            ClicksToEdit="2" DataIDField="Id" AllowSorting="true" EnableColumnLines="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True" OnRowDoubleClick="Grid1_RowDoubleClick" OnPageIndexChange="Grid1_PageIndexChange">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
 
-                <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false"  EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true"  EnableColumnLines="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10"
-                    EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True" OnRowDoubleClick="Grid1_RowDoubleClick" OnPageIndexChange="Grid1_PageIndexChange">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                              
-                                <%--<f:TextBox ID="txtDescribe" runat="server" Label="重大事故隐患描述" LabelWidth="140px"
-                                    LabelAlign="Right">
-                                </f:TextBox>--%>
+                                        <%--<f:TextBox ID="txtDescribe" runat="server" Label="重大事故隐患描述" LabelWidth="140px"
+                     LabelAlign="Right">
+                 </f:TextBox>--%>
 
-                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" 
-                                    ShowTodayButton="false" AutoPostBack="true"  OnTextChanged="btnSearch_Click"></f:DatePicker>
-                               
-                               
-                               
-                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" Hidden="true" Text="新增" OnClick="btnNew_Click"
-                                    runat="server">
-                                </f:Button>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month"
+                                            ShowTodayButton="false" AutoPostBack="true" OnTextChanged="btnSearch_Click">
+                                        </f:DatePicker>
 
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" MinWidth="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
 
-                         <f:RenderField MinWidth="80px" ColumnID="Months" DataField="Months" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM"
+
+                                        <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" Hidden="true" Text="新增" OnClick="btnNew_Click"
+                                            runat="server">
+                                        </f:Button>
+
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" MinWidth="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+
+                                <f:RenderField MinWidth="80px" ColumnID="Months" DataField="Months" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM"
                                     HeaderText="月份" HeaderTextAlign="Center" TextAlign="Left" SortField="Months">
-                          </f:RenderField>
+                                </f:RenderField>
 
-                        <f:RenderField MinWidth="100px" ColumnID="UnitName" DataField="UnitName" Hidden="true"
-                             FieldType="String" HeaderText="所属单位" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="100px" ColumnID="UnitName" DataField="UnitName" Hidden="true"
+                                    FieldType="String" HeaderText="所属单位" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                        <f:RenderField MinWidth="150px" ColumnID="ProjectName" DataField="ProjectName" Hidden="true"
-                            SortField="Title" FieldType="String" HeaderText="项目名称" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="150px" ColumnID="ProjectName" DataField="ProjectName" Hidden="true"
+                                    SortField="Title" FieldType="String" HeaderText="项目名称" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                          <f:RenderField MinWidth="200px" ColumnID="Describe" DataField="Describe"
-                            SortField="Title" FieldType="String" HeaderText="重大事故隐患描述" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="200px" ColumnID="Describe" DataField="Describe"
+                                    SortField="Title" FieldType="String" HeaderText="重大事故隐患描述" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                         <f:RenderField MinWidth="100px" ColumnID="Criteria" DataField="Criteria"
-                             FieldType="String" HeaderText="判定标准" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                     
-                         <f:RenderField MinWidth="140px" ColumnID="DisType" DataField="DisType"
-                             FieldType="String" HeaderText="排查发现形式" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="100px" ColumnID="Criteria" DataField="Criteria"
+                                    FieldType="String" HeaderText="判定标准" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                         <f:RenderField MinWidth="140px" ColumnID="RecurringN" DataField="RecurringN"
-                             FieldType="String" HeaderText="是否重复出现" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="140px" ColumnID="DisType" DataField="DisType"
+                                    FieldType="String" HeaderText="排查发现形式" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                         <f:RenderField MinWidth="120px" ColumnID="Measures" DataField="Measures"
-                             FieldType="String" HeaderText="主要整治措施" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="140px" ColumnID="RecurringN" DataField="RecurringN"
+                                    FieldType="String" HeaderText="是否重复出现" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                         <f:RenderField MinWidth="140px" ColumnID="CompleteTime" DataField="CompleteTime"
-                             FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="计划完成治理时限" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="120px" ColumnID="Measures" DataField="Measures"
+                                    FieldType="String" HeaderText="主要整治措施" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                        <f:RenderField MinWidth="120px" ColumnID="CompleteDate" DataField="CompleteDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"  HeaderText="完成治理关闭时间" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="140px" ColumnID="CompleteTime" DataField="CompleteTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="计划完成治理时限" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                           <f:RenderField MinWidth="120px" ColumnID="CloseSituation" DataField="CloseSituation"
-                             FieldType="String" HeaderText="治理关闭情况" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="120px" ColumnID="CompleteDate" DataField="CompleteDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="完成治理关闭时间" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                           <f:RenderField MinWidth="140px" ColumnID="ResUnit" DataField="ResUnit"
-                             FieldType="String" HeaderText="责任单位" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="120px" ColumnID="CloseSituation" DataField="CloseSituation"
+                                    FieldType="String" HeaderText="治理关闭情况" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                        <f:RenderField MinWidth="180px" ColumnID="ResPerson" DataField="ResPerson"
-                             FieldType="String" HeaderText="责任单位主要责任人" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="140px" ColumnID="ResUnit" DataField="ResUnit"
+                                    FieldType="String" HeaderText="责任单位" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                        <f:RenderField MinWidth="120px" ColumnID="ResHead" DataField="ResHead"
-                             FieldType="String" HeaderText="治理负责人" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="180px" ColumnID="ResPerson" DataField="ResPerson"
+                                    FieldType="String" HeaderText="责任单位主要责任人" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                        <f:RenderField MinWidth="140px" ColumnID="ResPhone" DataField="ResPhone"
-                             FieldType="String" HeaderText="治理负责人电话" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="120px" ColumnID="ResHead" DataField="ResHead"
+                                    FieldType="String" HeaderText="治理负责人" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                        <f:RenderField MinWidth="100px" ColumnID="StatesN" DataField="StatesN" FieldType="String"
-                            HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="140px" ColumnID="ResPhone" DataField="ResPhone"
+                                    FieldType="String" HeaderText="治理负责人电话" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                       
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                         <f:Listener Event="dataload" Handler="onGridDataLoad" />
-                    </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:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="100000" />
-                        </f:DropDownList>
-                        <f:ToolbarFill runat="server">
-                        </f:ToolbarFill>
+                                <f:RenderField MinWidth="100px" ColumnID="StatesN" DataField="StatesN" FieldType="String"
+                                    HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
 
-                    </PageItems>
-                </f:Grid>
+
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                            </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:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
+                                </f:DropDownList>
+                                <f:ToolbarFill runat="server">
+                                </f:ToolbarFill>
+
+                            </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/Customization/CNCEC4/HSSE/Report/SpecialHazardsReportList.aspx.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/SpecialHazardsReportList.aspx.cs
index dee9533..7a30e41 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/SpecialHazardsReportList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/SpecialHazardsReportList.aspx.cs
@@ -35,9 +35,22 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         {
             if (!IsPostBack)
             {
-                this.txtMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
+                Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
-                GetButtonPower();
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+                this.txtMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
 
                 // 绑定表格
@@ -46,6 +59,22 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         #region 获取按钮权限
         private string Btn_Menu = "D9B85395-CF56-442D-8BBB-1FFC35785BA8";
         /// <summary>
@@ -84,16 +113,17 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
 
         public void BindGrid()
         {
-            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            if (string.IsNullOrEmpty(this.ProjectId))
             {
-                DataTable tb = ChecklistData(this.CurrUser.LoginProjectId);
-                Grid1.RecordCount = tb.Rows.Count;
-                tb = GetFilteredTable(Grid1.FilteredData, tb);
-                var table = this.GetPagedDataTable(Grid1, tb);
-
-                Grid1.DataSource = table;
-                Grid1.DataBind();
+                return;
             }
+            DataTable tb = ChecklistData(this.ProjectId);
+            Grid1.RecordCount = tb.Rows.Count;
+            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
         }
 
         protected DataTable ChecklistData(string projectId)
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/SpecialHazardsReportList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/SpecialHazardsReportList.aspx.designer.cs
index c391c6c..fc776cd 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/SpecialHazardsReportList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/SpecialHazardsReportList.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         /// </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/ZHGL/FinalFileManage/SendAndAccep.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/FinalFileManage/SendAndAccep.aspx
index 7fb6e4d..028e36f 100644
--- a/SUBQHSE/FineUIPro.Web/ZHGL/FinalFileManage/SendAndAccep.aspx
+++ b/SUBQHSE/FineUIPro.Web/ZHGL/FinalFileManage/SendAndAccep.aspx
@@ -4,49 +4,50 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>接收文管理</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
-    <style type="text/css">       
+    <style type="text/css">
         .f-grid-row .f-grid-cell-inner {
             white-space: normal;
             word-break: break-all;
-        }        
+        }
     </style>
 </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="FileId"
-                AllowCellEditing="true" ClicksToEdit="2" DataIDField="FileId" AllowSorting="true"
-                 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:TextBox runat="server" Label="" ID="txtFileCode" EmptyText="输入文档编号"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:TextBox runat="server" Label="" ID="txtFileName" EmptyText="输入文档名称"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                             <f:TextBox runat="server" Label="" ID="txtKeyWords" EmptyText="输入关键字"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:DatePicker ID="txtMonth" runat="server" Width="100px" LabelAlign="Right" DateFormatString="yyyy" DisplayType="year"  
-                                    ShowTodayButton="false" AutoPostBack="true"  OnTextChanged="TextBox_TextChanged"></f:DatePicker>
+        <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="FileId"
+                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="FileId" AllowSorting="true"
+                    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:TextBox runat="server" Label="" ID="txtFileCode" EmptyText="输入文档编号"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
+                                    LabelAlign="right">
+                                </f:TextBox>
+                                <f:TextBox runat="server" Label="" ID="txtFileName" EmptyText="输入文档名称"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
+                                    LabelAlign="right">
+                                </f:TextBox>
+                                <f:TextBox runat="server" Label="" ID="txtKeyWords" EmptyText="输入关键字"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
+                                    LabelAlign="right">
+                                </f:TextBox>
+                                <f:DatePicker ID="txtMonth" runat="server" Width="100px" LabelAlign="Right" DateFormatString="yyyy" DisplayType="year"
+                                    ShowTodayButton="false" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
+                                </f:DatePicker>
 
-                            <f:DropDownList runat="server" ID="ddlFileType" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true" Label="">
-                                 <f:ListItem Text="请选择收发文类型" Value="" />
-                                  <%--  <f:ListItem Text="发文-集发" Value="0" />
+                                <f:DropDownList runat="server" ID="ddlFileType" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true" Label="">
+                                    <f:ListItem Text="请选择收发文类型" Value="" />
+                                    <%--  <f:ListItem Text="发文-集发" Value="0" />
                                     <f:ListItem Text="发文-集安发" Value="1" />
                                     <f:ListItem Text="发文-安便函" Value="2" />
                                     <f:ListItem Text="发文-通知" Value="3" />
@@ -54,50 +55,50 @@
                                     <f:ListItem Text="收文-集安发" Value="5" />
                                     <f:ListItem Text="收文-集办法" Value="6" />
                                     <f:ListItem Text="收文-通知" Value="7" />--%>
-                            </f:DropDownList>
-                             <f:RadioButtonList runat="server" ID="ckStates" AutoPostBack="true" Label="" LabelWidth="80px" LabelAlign="Right"
-                                            OnSelectedIndexChanged="TextBox_TextChanged" Width="220px">
-                                            <f:RadioItem Text="全部" Value="" Selected="true" />
-                                            <f:RadioItem Text="已回复" Value="2" />
-                                            <f:RadioItem Text="待回复" Value="1" />
-                                        </f:RadioButtonList>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Text="导出" Icon="FolderUp"  
-    EnableAjax="false" DisableControlBeforePostBack="false">
-</f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                    <f:RenderField Width="200px" ColumnID="FileCode" DataField="FileCode"
-                        SortField="FileCode" FieldType="String" HeaderText="文档编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="250px" ColumnID="FileName" DataField="FileName" 
-                        SortField="FileName" FieldType="String" HeaderText="文档名称" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>   
-                     <f:RenderField Width="200px" ColumnID="KeyWords" DataField="KeyWords"  
-                        SortField="KeyWords" FieldType="String" HeaderText="关键字" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                  <f:TemplateField ColumnID="UnitName" Width="200px" HeaderText="发文类型" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:DropDownList>
+                                <f:RadioButtonList runat="server" ID="ckStates" AutoPostBack="true" Label="" LabelWidth="80px" LabelAlign="Right"
+                                    OnSelectedIndexChanged="TextBox_TextChanged" Width="220px">
+                                    <f:RadioItem Text="全部" Value="" Selected="true" />
+                                    <f:RadioItem Text="已回复" Value="2" />
+                                    <f:RadioItem Text="待回复" Value="1" />
+                                </f:RadioButtonList>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                    runat="server">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Text="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                            TextAlign="Center" />
+                        <f:RenderField Width="200px" ColumnID="FileCode" DataField="FileCode"
+                            SortField="FileCode" FieldType="String" HeaderText="文档编号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="250px" ColumnID="FileName" DataField="FileName"
+                            SortField="FileName" FieldType="String" HeaderText="文档名称" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="KeyWords" DataField="KeyWords"
+                            SortField="KeyWords" FieldType="String" HeaderText="关键字" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="UnitName" Width="200px" HeaderText="发文类型" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="Label3" runat="server" Text='<%# ConvertType(Eval("FileType")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                 <%--  <f:TemplateField ColumnID="UnitName" Width="600px" HeaderText="接收单位" HeaderTextAlign="Center" TextAlign="Center">
+                        <%--  <f:TemplateField ColumnID="UnitName" Width="600px" HeaderText="接收单位" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("UnitId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>--%>
-                    <%-- <f:RenderField Width="150px" ColumnID="UnitName" DataField="UnitName" ExpandUnusedSpace="true"
+                        <%-- <f:RenderField Width="150px" ColumnID="UnitName" DataField="UnitName" ExpandUnusedSpace="true"
                         SortField="UnitName" FieldType="String" HeaderText="接收单位" HeaderTextAlign="Center"
                         TextAlign="Left">
                     </f:RenderField>  
@@ -105,66 +106,66 @@
                         SortField="ProjectName" 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:RenderField Width="100px" ColumnID="ReplyDatePlan" DataField="ReplyDatePlan"
-                        SortField="ReplyDatePlan" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="回复时间" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                      <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
-                        SortField="CompileManName" FieldType="String" HeaderText="编制人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                  <%--  <f:RenderField ColumnID="StatesNr" DataField="StatesNr"
+                        <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:RenderField Width="100px" ColumnID="ReplyDatePlan" DataField="ReplyDatePlan"
+                            SortField="ReplyDatePlan" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                            HeaderText="回复时间" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
+                            SortField="CompileManName" FieldType="String" HeaderText="编制人" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <%--  <f:RenderField ColumnID="StatesNr" DataField="StatesNr"
                         SortField="StatesNr" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
                         TextAlign="Left">
                     </f:RenderField>  --%>
-                   <%-- <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" Text="附件" ToolTip="附件上传查看" 
+                        <%-- <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" Text="附件" ToolTip="附件上传查看" 
                         DataIFrameUrlFields="FileId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/OwnerFinalFileAttachUrl&menuId=C5354813-7B1E-4155-8EE8-D349BF2F18F4"
                         HeaderTextAlign="Center" >
                      </f:WindowField>--%>
-                </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:ListItem Text="10" Value="10" />
-                        <f:ListItem Text="15" Value="15" />
-                        <f:ListItem Text="20" Value="20" />
-                        <f:ListItem Text="25" Value="25" />
-                        <f:ListItem Text="所有行" Value="100000" />
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px" Height="620px">
-    </f:Window>
-    <f:Window ID="WindowAtt" Title="附件页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px" Height="500px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="TableEdit" EnablePostBack="true"
-            Hidden="true" runat="server" Text="编辑">
-        </f:MenuButton>
+                    </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:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px" Height="620px">
+        </f:Window>
+        <f:Window ID="WindowAtt" Title="附件页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px" Height="500px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="TableEdit" EnablePostBack="true"
+                Hidden="true" runat="server" Text="编辑">
+            </f:MenuButton>
 
-         <f:MenuButton ID="btnMenuUpdateState" OnClick="btnMenuUpdate" EnablePostBack="true"
-            Hidden="true" Icon="TableEdit" ConfirmText="是否修改为已回复？" ConfirmTarget="Parent" runat="server" Text="归档《已回复》">
-        </f:MenuButton>
+            <f:MenuButton ID="btnMenuUpdateState" OnClick="btnMenuUpdate" EnablePostBack="true"
+                Hidden="true" Icon="TableEdit" ConfirmText="是否修改为已回复？" ConfirmTarget="Parent" 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: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/ZHGL/FinalFileManage/SendAndAccep.aspx.cs b/SUBQHSE/FineUIPro.Web/ZHGL/FinalFileManage/SendAndAccep.aspx.cs
index a551609..f2ecae0 100644
--- a/SUBQHSE/FineUIPro.Web/ZHGL/FinalFileManage/SendAndAccep.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/ZHGL/FinalFileManage/SendAndAccep.aspx.cs
@@ -131,11 +131,11 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
                     ddlFileType.DataSource = myList;
                     ddlFileType.DataBind();
 
-                   
+
                 }
                 else
                 {
-                    
+
                     GridColumn column = Grid1.FindColumn("UnitName");
                     column.HeaderText = "收文类型";
                     GridColumn column2 = Grid1.FindColumn("CompileDate");
@@ -269,7 +269,7 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
             //只有集团公司能看到
             if (BLL.CommonService.IsMainUnitOrAdmin(this.CurrUser.UserId))
             {
-                    string strSql = @"SELECT FileId,F.UnitId,F.ProjectId,FileCode,FileName,KeyWords,CompileMan,CompileDate,ReplyDatePlan,ReplyDateReal,
+                string strSql = @"SELECT FileId,F.UnitId,F.ProjectId,FileCode,FileName,KeyWords,CompileMan,CompileDate,ReplyDatePlan,ReplyDateReal,
             ReplyContent,CompileManUser.UserName AS CompileManName,U.UnitName,P.ProjectName,F.FileType,
             CASE WHEN States='0' then '待发送' when States='1' then '待回复' when States='2' then '已回复' END as StatesNr,F.States
 
@@ -284,7 +284,7 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
                 #region 条件语句
                 bool UnitBol = false;
                 //不是本公司
-                if (CurrUser.UnitId!= "A26E718E-C3B3-458E-A5A3-D2568A0F7D49")
+                if (CurrUser.UnitId != "A26E718E-C3B3-458E-A5A3-D2568A0F7D49")
                 {
                     UnitBol = true;
                 }
@@ -306,7 +306,7 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
                         strSql += " and (F.FileType='0' or F.FileType='1' or F.FileType='2' or F.FileType='3' or F.FileType='10' or F.FileType='11') ";
                         //不是管理员只能看到自己编制的 或者是自己的
                         //公司级
-                        if (TypesOf == "0"&& UnitBol)
+                        if (TypesOf == "0" && UnitBol)
                         {
                             //能看到接收人是自己的
                             strSql += " and (F.UnitId like '%" + CurrUser.UnitId + "%' or CompileMan = @CompileMan ) ";
@@ -337,7 +337,7 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
                     {
                         strSql += " and (F.FileType='4' or F.FileType='5' or F.FileType='6' or F.FileType='7'  or F.FileType='8' or F.FileType='9') ";
                         //不是管理员或者本公司只能看到自己编制的 或者是自己的
-                       
+
 
                         //公司级
                         if (TypesOf == "0" && UnitBol)
@@ -346,7 +346,7 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
                             strSql += " and (F.UnitId like '%" + CurrUser.UnitId + "%' or CompileMan = @CompileMan ) ";
                             listStr.Add(new SqlParameter("@CompileMan", CurrUser.UserId));
                         }
-                        else if(TypesOf=="1" && UnitBol)
+                        else if (TypesOf == "1" && UnitBol)
                         {
                             //项目级
                             //只能看到单位id或者项目id同时是自己的数据
@@ -384,8 +384,8 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
                 }
                 if (!string.IsNullOrEmpty(txtMonth.Text))
                 {
-                    strSql += " AND Year(F.CompileDate) = '"+ txtMonth.Text + "'";
-                    
+                    strSql += " AND Year(F.CompileDate) = '" + txtMonth.Text + "'";
+
                 }
                 #endregion
 
@@ -393,13 +393,13 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
-                 dataTable=tb;
-                    Grid1.RecordCount = tb.Rows.Count;
-                    //tb = GetFilteredTable(Grid1.FilteredData, tb);
-                    var table = this.GetPagedDataTable(Grid1, tb);
-                    Grid1.DataSource = table;
-                    Grid1.DataBind();
-                }
+                dataTable = tb;
+                Grid1.RecordCount = tb.Rows.Count;
+                //tb = GetFilteredTable(Grid1.FilteredData, tb);
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+            }
 
         }
 
@@ -538,16 +538,16 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
                             }
                             else if (FinalFileManage.States == "1" && (
                                 //接收文件页面,待接收，并且接收人是自己，接收项目是空的：回复页面。
-                                (FinalFileManage.UnitId.IndexOf(CurrUser.UnitId)!=-1 && string.IsNullOrEmpty(FinalFileManage.ProjectId)) || (userId == Const.sysglyId || userId == Const.hfnbdId)))
+                                (FinalFileManage.UnitId.IndexOf(CurrUser.UnitId) != -1 && string.IsNullOrEmpty(FinalFileManage.ProjectId)) || (userId == Const.sysglyId || userId == Const.hfnbdId)))
                             {
                                 this.Window1.Title = "回复";
-                                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SendAndAccepView.aspx?FileId={0}&Type=1&Fwtype=0", id, "回复 - "),"回复"));
+                                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SendAndAccepView.aspx?FileId={0}&Type=1&Fwtype=0", id, "回复 - "), "回复"));
                             }
                             else
                             {
                                 //否则是查看页面
                                 this.Window1.Title = "详情";
-                                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SendAndAccepView.aspx?FileId={0}&Fwtype=0", id, "查看 - "),"查看"));
+                                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SendAndAccepView.aspx?FileId={0}&Fwtype=0", id, "查看 - "), "查看"));
                             }
                         }
                         else
@@ -580,7 +580,7 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
                     //如果是发文件页面，状态是待发送的：编辑，
                     if (FinalFileManage.States == "0")
                     {
-                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SendAndAccepEdit.aspx?FileId={0}&Fwtype=1", id, "编辑 - "),"编辑"));
+                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SendAndAccepEdit.aspx?FileId={0}&Fwtype=1", id, "编辑 - "), "编辑"));
                     }
                     else
                     {
@@ -660,7 +660,8 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
         }
         #endregion
 
-        protected void btnMenuUpdate(object sender, EventArgs e) {
+        protected void btnMenuUpdate(object sender, EventArgs e)
+        {
             if (Grid1.SelectedRowIndexArray.Length == 0)
             {
                 Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
@@ -668,7 +669,7 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
             }
             string id = Grid1.SelectedRowID;
             var model = Funs.DB.FinalFileManage_SendAndAccep.FirstOrDefault(x => x.FileId == id);
-            if (model!=null)
+            if (model != null)
             {
                 if (model.States == "2")
                 {
@@ -678,7 +679,8 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
                 {
                     model.States = "2";
                 }
-                else {
+                else
+                {
                     Alert.ShowInTop("当前数据不允许修改状态！", MessageBoxIcon.Warning);
                     return;
                 }
@@ -697,13 +699,13 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
         {
             Print();
 
-        } 
+        }
 
         #endregion
 
         void Print()
         {
-            string path =  Funs.RootPath + @"File\Excel\Temp\SendAndAccep"+ string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx";
+            string path = Funs.RootPath + @"File\Excel\Temp\SendAndAccep" + string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx";
 
             var filetypelist = dataTable.AsEnumerable().Select(x => new
             {
@@ -714,22 +716,22 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
             string fileName = string.Empty;
             if (Type == "0")
             {
-                fileName= "发文台账.xlsx";
+                fileName = "发文台账.xlsx";
             }
             else
             {
                 fileName = "收文台账.xlsx";
             }
             var sheets = new DataSet();
-            string[] Send=new string [] {"0", "1" , "2" , "3" , "10" , "11" };
-            string[] Accep=new string [] {"4", "5" , "6" , "7" , "8" , "9" };
+            string[] Send = new string[] { "0", "1", "2", "3", "10", "11" };
+            string[] Accep = new string[] { "4", "5", "6", "7", "8", "9" };
             foreach (var item in filetypelist)
             {
                 if (Send.Contains(item.FileType))
                 {
                     var result = dataTable.AsEnumerable().Where(x => x.Field<string>("FileType") == item.FileType).Select(x => new
                     {
-                        
+
                         文档编号 = x.Field<string>("FileCode"),
                         文档名称 = x.Field<string>("FileName"),
                         发文时间 = x.Field<DateTime?>("CompileDate"),
@@ -753,7 +755,7 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
                         来文单位 = x.Field<string>("UnitName"),
                         来文时间 = x.Field<DateTime?>("CompileDate"),
                         主要内容摘要 = x.Field<string>("KeyWords"),
-                        是否反馈 = x.Field<string>("States")== "已回复"?"是":"否",
+                        是否反馈 = x.Field<string>("States") == "已回复" ? "是" : "否",
                         反馈日期 = x.Field<DateTime?>("ReplyDatePlan"),
                         是否落实 = "",
                         备注 = ""
@@ -763,8 +765,8 @@ namespace FineUIPro.Web.ZHGL.FinalFileManage
                     sheets.Tables.Add(tb);
                 }
             }
-           
-            MiniExcel.SaveAs(path,sheets);
+
+            MiniExcel.SaveAs(path, sheets);
 
             FileInfo info = new FileInfo(path);
             long fileSize = info.Length;
