项目现场人员界面调整

SGGL/FineUIPro.Web/DataShow/ProjectSitePerson.aspx

@@ -24,6 +24,9 @@
                                     AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
                                 </f:CheckBox>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
@@ -36,9 +39,18 @@
                                 <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="单位名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="TeamGroupName" DataField="TeamGroupName" FieldType="String" HeaderText="班组" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
                         <f:RenderField Width="150px" ColumnID="PersonName" DataField="PersonName" FieldType="String" HeaderText="人员名称" TextAlign="Left"
                             HeaderTextAlign="Center">
                         </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="IdentityCard" DataField="IdentityCard" FieldType="String" HeaderText="身份证" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="WorkPostName" DataField="WorkPostName" FieldType="String" HeaderText="岗位" TextAlign="Left"
                             HeaderTextAlign="Center">
                         </f:RenderField>

SGGL/FineUIPro.Web/DataShow/ProjectSitePerson.aspx.cs

@@ -73,12 +73,17 @@ namespace FineUIPro.Web.DataShow
                         equals new { detail.PersonId, detail.ProjectId, MaxChangeTime = detail.ChangeTime }
                     join y in db.SitePerson_Person on record.PersonId equals y.PersonId
                     join z in db.Base_WorkPost on y.WorkPostId equals z.WorkPostId
+                    join u in db.Base_Unit on detail.UnitId equals u.UnitId
+                    join tg in db.ProjectData_TeamGroup on y.TeamGroupId equals tg.TeamGroupId
                     where detail.IsIn == true
                     select new
                     {
                         PersonId = record.PersonId,
                         PersonName = y.PersonName,
                         WorkPostName = z.WorkPostName,
+                        IdentityCard = y.IdentityCard,
+                        UnitName = u.UnitName,
+                        TeamGroupName= tg.TeamGroupName,
                         ProjectId = record.ProjectId,
                         ChangeTime = record.MaxChangeTime,
                         PostType = z.PostType,
@@ -156,5 +161,26 @@ namespace FineUIPro.Web.DataShow
         }
         #endregion
 
+
+        #region  导出
+
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("项目当前现场" + filename+DateTime.Now.ToString("yyyyMMddHHmmss"), System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = this.Grid1.RecordCount;
+            BindGrid();
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        #endregion
     }
 }

SGGL/FineUIPro.Web/DataShow/ProjectSitePerson.aspx.designer.cs

@@ -68,6 +68,15 @@ namespace FineUIPro.Web.DataShow
         /// </remarks>
         protected global::FineUIPro.CheckBox chManager;
 
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>