diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs
index 95122751..7fb52841 100644
--- a/SGGL/BLL/API/APIPersonService.cs
+++ b/SGGL/BLL/API/APIPersonService.cs
@@ -1,7 +1,9 @@
-using System;
+using Microsoft.SqlServer.Dts.Runtime;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Linq;
+using System.Web.Security;
 
 namespace BLL
 {
@@ -105,7 +107,25 @@ namespace BLL
                     person.OutTime = string.Format("{0:yyyy-MM-dd}", getProjectPerson.OutTime);
                     person.OutResult = getProjectPerson.OutResult;
                     person.AuditorId = getProjectPerson.AuditorId;
-                    person.AuditorName = db.Person_Persons.First(z => z.PersonId == getProjectPerson.AuditorId).PersonName;
+                    var getAuPerson = db.Person_Persons.FirstOrDefault(z => z.PersonId == getProjectPerson.AuditorId);
+                    if (getAuPerson != null)
+                    {
+                        person.AuditorName = getAuPerson.PersonName;
+                    }
+                    else
+                    {
+                        var getAs = Person_PersonsService.GetUserListByProjectIdUnitIdRoleId(getProjectPerson.ProjectId, Const.UnitId_SEDIN, BLL.Const.HSSEManager + "," + BLL.Const.HSSEAssistantManager);
+                        if (getAs.Count() > 0)
+                        {
+                            var getA = getAs.FirstOrDefault();
+                            if (getA != null)
+                            {
+                                person.AuditorId = getA.PersonId;
+                                person.AuditorName = getA.PersonName;
+                            }                      
+                        }
+                    }
+                 
                     person.AuditorDate = string.Format("{0:yyyy-MM-dd}", getProjectPerson.AuditorDate);
                     person.AttachUrl2 = APIUpLoadFileService.getFileUrl(getProjectPerson.PersonId + "#2", null);
                     person.AttachUrl3 = APIUpLoadFileService.getFileUrl(getProjectPerson.PersonId + "#3", null);
diff --git a/SGGL/BLL/API/APIUserService.cs b/SGGL/BLL/API/APIUserService.cs
index fe3567f1..f34ca2e9 100644
--- a/SGGL/BLL/API/APIUserService.cs
+++ b/SGGL/BLL/API/APIUserService.cs
@@ -113,7 +113,7 @@ namespace BLL
             {
                 var getUser = (from x in db.Person_Persons
                                join y in db.Sys_Role on x.RoleIds equals y.RoleId
-                               where x.UnitId == unitId && x.IsPost == true && (strParam == null || x.PersonName.Contains(strParam))
+                               where x.UnitId == unitId && x.IsPost == true && (strParam == null || x.PersonName.Contains(strParam)) && x.RoleIds != null
                                orderby x.PersonName
                                select new Model.BaseInfoItem { BaseInfoId = x.PersonId, BaseInfoName = x.PersonName, BaseInfoCode = x.Telephone }).ToList();
 
@@ -136,11 +136,10 @@ namespace BLL
                 List<string> roleList = Funs.GetStrListByStr(roleIds, ',');
                 if (!string.IsNullOrEmpty(projectId))
                 {
-                    getDataList = (from x in db.Person_Persons
+                  var  getDatas = from x in db.Person_Persons
                                    join y in db.SitePerson_Person on x.PersonId equals y.PersonId
-                                   where y.ProjectId == projectId && (x.UnitId == unitId || unitId == null) && y.States == Const.State_1
-                                      && (roleIds == null || roleList.Contains(y.RoleIds)) && (strParam == null || x.PersonName.Contains(strParam))
-                                   select new Model.UserItem
+                                   where y.ProjectId == projectId && y.States == Const.State_1 && x.RoleIds != null
+                                  select new Model.UserItem
                                    {
                                        PersonId = x.PersonId,
                                        Account = x.Account,
@@ -158,14 +157,29 @@ namespace BLL
                                        Telephone = x.Telephone,
                                        IsOffice = x.IsOffice,
                                        SignatureUrl = x.SignatureUrl.Replace('\\', '/'),
+                                   };
+                    if (!string.IsNullOrEmpty(unitId))
+                    {
+                        getDatas = getDatas.Where(x => x.UnitId == unitId);
+                    }
+                    if (!string.IsNullOrEmpty(roleIds))
+                    {
+                        getDatas = getDatas.Where(x => roleList.Contains(x.RoleId));
+                    }
+                    if (!string.IsNullOrEmpty(strParam))
+                    {
+                        getDatas = getDatas.Where(x => x.PersonName.Contains(strParam));
+                    }
 
-                                   }).ToList();
+                    if (getDatas.Count() > 0)
+                    {
+                        getDataList = getDatas.OrderBy(x => x.UnitName).ThenBy(x => x.PersonName).ToList();
+                    }
                 }
                 else
                 {
-                    getDataList = (from x in db.Person_Persons
-                                   where x.IsPost == true && (x.UnitId == unitId || unitId == null)
-                                  && (roleIds == null || roleList.Contains(x.RoleIds)) && (strParam == null || x.PersonName.Contains(strParam))
+                    var getPersons =from x in db.Person_Persons
+                                   where x.IsPost == true && x.RoleIds != null
                                    select new Model.UserItem
                                    {
                                        PersonId = x.PersonId,
@@ -184,10 +198,28 @@ namespace BLL
                                        Telephone = x.Telephone,
                                        IsOffice = x.IsOffice,
                                        SignatureUrl = x.SignatureUrl.Replace('\\', '/'),
-                                   }).ToList();
+                                   };
+
+                    if (!string.IsNullOrEmpty(unitId))
+                    {
+                        getPersons = getPersons.Where(x => x.UnitId == unitId);
+                    }
+                    if (!string.IsNullOrEmpty(roleIds))
+                    {
+                        getPersons = getPersons.Where(x => roleList.Contains(x.RoleId));
+                    }
+                    if (!string.IsNullOrEmpty(strParam))
+                    {
+                        getPersons = getPersons.Where(x => x.PersonName.Contains(strParam));
+                    }
+
+                    if (getPersons.Count() > 0)
+                    {
+                        getDataList = getPersons.OrderBy(x => x.UnitName).ThenBy(x => x.PersonName).ToList();
+                    }
                 }
 
-                return getDataList.OrderBy(x => x.UnitName).ThenBy(x => x.PersonName).ToList();
+                return getDataList;
             }
         }
 
@@ -209,7 +241,7 @@ namespace BLL
                                     join y in db.SitePerson_Person on x.PersonId equals y.PersonId
                                     join z in db.Project_ProjectUnit on x.UnitId equals z.UnitId
                                     where y.ProjectId == projectId && z.ProjectId == projectId && z.UnitType == unitType && y.States == Const.State_1
-                                     && (strParam == null || x.PersonName.Contains(strParam))
+                                     && (strParam == null || x.PersonName.Contains(strParam)) && x.RoleIds != null
                                     select new Model.UserItem
                                     {
                                         PersonId = x.PersonId,
@@ -241,7 +273,7 @@ namespace BLL
                                            join y in db.SitePerson_Person on x.PersonId equals y.PersonId
                                            join z in db.Project_ProjectUnit on x.UnitId equals z.UnitId
                                            where y.ProjectId == projectId && z.ProjectId == projectId && z.UnitType == unitType && y.States == Const.State_1
-                                            && (strParam == null || x.PersonName.Contains(strParam)) && y.RoleIds.Contains(item)
+                                            && (strParam == null || x.PersonName.Contains(strParam)) && y.RoleIds.Contains(item) && x.RoleIds != null
                                            select new Model.UserItem
                                            {
                                                PersonId = x.PersonId,
@@ -287,7 +319,7 @@ namespace BLL
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
                 var user = from x in db.Person_Persons
-                           where x.IsPost == true
+                           where x.IsPost == true && x.RoleIds != null
                            select x;
                 return ObjectMapperManager.DefaultInstance.GetMapper<List<Model.Person_Persons>, List<Model.UserItem>>().Map(user.ToList());
             }
@@ -416,31 +448,31 @@ namespace BLL
                 List<string> userList = Funs.GetStrListByStr(userIds, ',');
                 if (userList.Count() > 0)
                 {
-                    var getDataLists = (from x in db.Person_Persons
-                                        join y in db.SitePerson_Person on x.PersonId equals y.PersonId
-                                        where y.ProjectId == projectId && y.States == Const.State_1
-                                        select new Model.UserItem
-                                        {
-                                            PersonId = x.PersonId,
-                                            Account = x.Account,
-                                            UserCode = x.JobNum,
-                                            Password = x.Password,
-                                            PersonName = x.PersonName,
-                                            RoleId = y.RoleIds,
-                                            RoleName = RoleService.getRoleNamesRoleIds(y.RoleIds),
-                                            UnitId = y.UnitId,
-                                            UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
-                                            LoginProjectId = y.ProjectId,
-                                            LoginProjectName = db.Base_Project.First(z => z.ProjectId == y.ProjectId).ProjectName,
-                                            IdentityCard = x.IdentityCard,
-                                            Email = x.Email,
-                                            Telephone = x.Telephone,
-                                            IsOffice = x.IsOffice,
-                                            SignatureUrl = x.SignatureUrl.Replace('\\', '/'),
-                                        });
+                    var getDatas = (from x in db.Person_Persons
+                                    join y in db.SitePerson_Person on x.PersonId equals y.PersonId
+                                    where y.ProjectId == projectId && y.States == Const.State_1 && x.RoleIds != null
+                                    select new Model.UserItem
+                                    {
+                                        PersonId = x.PersonId,
+                                        Account = x.Account,
+                                        UserCode = x.JobNum,
+                                        Password = x.Password,
+                                        PersonName = x.PersonName,
+                                        RoleId = y.RoleIds,
+                                        RoleName = RoleService.getRoleNamesRoleIds(y.RoleIds),
+                                        UnitId = y.UnitId,
+                                        UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
+                                        LoginProjectId = y.ProjectId,
+                                        LoginProjectName = db.Base_Project.First(z => z.ProjectId == y.ProjectId).ProjectName,
+                                        IdentityCard = x.IdentityCard,
+                                        Email = x.Email,
+                                        Telephone = x.Telephone,
+                                        IsOffice = x.IsOffice,
+                                        SignatureUrl = x.SignatureUrl.Replace('\\', '/'),
+                                    });
                     if (!string.IsNullOrEmpty(strParam))
                     {
-                        getDataLists = getDataLists.Where(x => x.PersonName.Contains(strParam));
+                        getDatas = getDatas.Where(x => x.PersonName.Contains(strParam));
                     }
 
                     string unitId = Const.UnitId_SEDIN;
@@ -448,19 +480,21 @@ namespace BLL
                     if (unitList.Count() == 1)
                     {
                         unitId = unitList.FirstOrDefault();
-                        getDataList = getDataLists.Where(x => x.UnitId == unitId).ToList();
+                        getDatas = getDatas.Where(x => x.UnitId == unitId);
 
                     }
                     else if (!unitList.Contains(unitId))
                     {
-                        getDataList = getDataLists.Where(x => unitList.Contains(x.UnitId)).ToList();
+                        getDatas = getDatas.Where(x => unitList.Contains(x.UnitId));
                     }
                     else
                     {
-                        getDataList = getDataLists.Where(x => x.UnitId == unitId).ToList();
+                        getDatas = getDatas.Where(x => x.UnitId == unitId);
                     }
+                    getDataList = getDatas.OrderBy(x => x.UnitName).ThenBy(x => x.PersonName).ToList();
                 }
-                return getDataList.OrderBy(x => x.UnitName).ThenBy(x => x.PersonName).ToList();
+
+                return getDataList;
             }
         }
     }
diff --git a/SGGL/BLL/Person/Person_PersonContractService.cs b/SGGL/BLL/Person/Person_PersonContractService.cs
index d64ca03a..1719d293 100644
--- a/SGGL/BLL/Person/Person_PersonContractService.cs
+++ b/SGGL/BLL/Person/Person_PersonContractService.cs
@@ -53,8 +53,7 @@ namespace BLL
                        db.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName,
                        x.LeadManId,
                        x.Telephone,
-                       x.ContractType,
-                       ContractTypeName=DropListService.getContractTypeNameByValue(x.ContractType),
+                       x.ContractType,                      
                        x.StartDate,
                        x.EndDate,
                    };
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/CheckMonth.aspx b/SGGL/FineUIPro.Web/CQMS/Check/CheckMonth.aspx
index 2d5e1824..97e8edc4 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/CheckMonth.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Check/CheckMonth.aspx
@@ -44,7 +44,7 @@
                         </f:RenderField>
                         <f:RenderField Width="180px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate" FieldType="Date" HeaderText="编制日期" TextAlign="Center" HeaderTextAlign="Center" RendererArgument="yyyy-MM-dd">
                         </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="UserName" DataField="UserName"
+                        <f:RenderField Width="180px" ColumnID="PersonName" DataField="PersonName"
                             FieldType="String" HeaderText="编制人" TextAlign="Center" HeaderTextAlign="Center" >
                         </f:RenderField>
                     </Columns>
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/CheckMonthFile.aspx b/SGGL/FineUIPro.Web/CQMS/Check/CheckMonthFile.aspx
index 5c2ba999..34e5e491 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/CheckMonthFile.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Check/CheckMonthFile.aspx
@@ -32,7 +32,7 @@
                         </f:RenderField>
                         <f:RenderField Width="180px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate" FieldType="Date" HeaderText="编制日期" TextAlign="Center" HeaderTextAlign="Center" RendererArgument="yyyy-MM-dd">
                         </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="UserName" DataField="UserName"
+                        <f:RenderField Width="180px" ColumnID="PersonName" DataField="PersonName"
                             FieldType="String" HeaderText="编制人" TextAlign="Center" HeaderTextAlign="Center" >
                         </f:RenderField>
 
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/DesignView.aspx b/SGGL/FineUIPro.Web/CQMS/Check/DesignView.aspx
index caa9ad90..96d1a64e 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/DesignView.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Check/DesignView.aspx
@@ -179,7 +179,7 @@
                                             <asp:Label ID="lbtype" runat="server" Text='<%# ConvertState(Eval("ApproveType")) %>'></asp:Label>
                                         </ItemTemplate>
                                     </f:TemplateField>
-                                    <f:BoundField Width="180px" DataField="UserName" HeaderTextAlign="Center" HeaderText="办理人员" TextAlign="Center" />
+                                    <f:BoundField Width="180px" DataField="PersonName" HeaderTextAlign="Center" HeaderText="办理人员" TextAlign="Center" />
                                     <f:BoundField Width="200px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="办理时间" />
                                     <f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="办理意见" />
                                 </Columns>
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditCheckEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Check/EditCheckEquipment.aspx
index f2b3d54c..31e10efd 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/EditCheckEquipment.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Check/EditCheckEquipment.aspx
@@ -196,7 +196,7 @@
                                             <asp:Label ID="lbtype" runat="server" Text='<%# ConvertState(Eval("ApproveType")) %>'></asp:Label>
                                         </ItemTemplate>
                                     </f:TemplateField>
-                                    <f:BoundField Width="180px" DataField="UserName" HeaderTextAlign="Center" HeaderText="办理人员" TextAlign="Center" />
+                                    <f:BoundField Width="180px" DataField="PersonName" HeaderTextAlign="Center" HeaderText="办理人员" TextAlign="Center" />
                                     <f:BoundField Width="200px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="办理时间" />
                                     <f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center"  HeaderText="办理意见" />
                                 </Columns>
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditCheckEquipmentTwo.aspx b/SGGL/FineUIPro.Web/CQMS/Check/EditCheckEquipmentTwo.aspx
index 12d5dd37..79aaca54 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/EditCheckEquipmentTwo.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Check/EditCheckEquipmentTwo.aspx
@@ -149,7 +149,7 @@
                                             <asp:Label ID="lbtype" runat="server" Text='<%# ConvertState(Eval("ApproveType")) %>'></asp:Label>
                                         </ItemTemplate>
                                     </f:TemplateField>
-                                    <f:BoundField Width="180px" DataField="UserName" HeaderTextAlign="Center" HeaderText="办理人员" TextAlign="Center" />
+                                    <f:BoundField Width="180px" DataField="PersonName" HeaderTextAlign="Center" HeaderText="办理人员" TextAlign="Center" />
                                     <f:BoundField Width="200px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="办理时间" />
                                     <f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center"  HeaderText="办理意见" />
                                 </Columns>
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditDesign.aspx b/SGGL/FineUIPro.Web/CQMS/Check/EditDesign.aspx
index 97a3cef0..d9dc6043 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/EditDesign.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Check/EditDesign.aspx
@@ -248,7 +248,7 @@
                                             <asp:Label ID="lbtype" runat="server" Text='<%# ConvertState(Eval("ApproveType")) %>'></asp:Label>
                                         </ItemTemplate>
                                     </f:TemplateField>
-                                    <f:BoundField Width="180px" DataField="UserName" HeaderTextAlign="Center" HeaderText="办理人员" TextAlign="Center" />
+                                    <f:BoundField Width="180px" DataField="PersonName" HeaderTextAlign="Center" HeaderText="办理人员" TextAlign="Center" />
                                     <f:BoundField Width="200px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="办理时间" />
                                     <f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center"  HeaderText="办理意见" />
                                 </Columns>
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 098cad8c..db0cf18e 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1049,6 +1049,7 @@
     <Content Include="Person\DepartPersonShuntList.aspx" />
     <Content Include="Person\DepartPersonShuntView.aspx" />
     <Content Include="Person\PersonEdit.aspx" />
+    <Content Include="Person\PersonContractEdit.aspx" />
     <Content Include="Person\PersonTrainEdit.aspx" />
     <Content Include="Person\PersonLib.aspx" />
     <Content Include="Personal\PersonTotal.aspx" />
@@ -1065,6 +1066,7 @@
     <Content Include="Person\PersonTrainingView.aspx" />
     <Content Include="Person\PersonView.aspx" />
     <Content Include="Person\ProjectPerson.aspx" />
+    <Content Include="Person\ProjectPersonView.aspx" />
     <Content Include="Person\ProjectPersonEdit.aspx" />
     <Content Include="PHTGL\BiddingManagement\ActionPlanFormation.aspx" />
     <Content Include="PHTGL\BiddingManagement\ActionPlanFormationEdit.aspx" />
@@ -10857,6 +10859,13 @@
     <Compile Include="Person\PersonEdit.aspx.designer.cs">
       <DependentUpon>PersonEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Person\PersonContractEdit.aspx.cs">
+      <DependentUpon>PersonContractEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Person\PersonContractEdit.aspx.designer.cs">
+      <DependentUpon>PersonContractEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Person\PersonTrainEdit.aspx.cs">
       <DependentUpon>PersonTrainEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -10969,6 +10978,13 @@
     <Compile Include="Person\ProjectPerson.aspx.designer.cs">
       <DependentUpon>ProjectPerson.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Person\ProjectPersonView.aspx.cs">
+      <DependentUpon>ProjectPersonView.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Person\ProjectPersonView.aspx.designer.cs">
+      <DependentUpon>ProjectPersonView.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Person\ProjectPersonEdit.aspx.cs">
       <DependentUpon>ProjectPersonEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
index 108337e3..f699cdb3 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
@@ -87,7 +87,7 @@
                                             HeaderText="文件大小" HeaderTextAlign="Center" Renderer="FileSize"
                                             TextAlign="Right">
                                         </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName" SortField="UserName"
+                                        <f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName" SortField="PersonName"
                                             FieldType="String" HeaderText="更新人" HeaderTextAlign="Center"
                                             TextAlign="Left">
                                         </f:RenderField>
@@ -135,7 +135,7 @@
                                             TextAlign="Left" Width="100px">
                                         </f:RenderField>
 
-                                        <f:RenderField Width="200px" ColumnID="UserName" DataField="UserName" SortField="UserName"
+                                        <f:RenderField Width="200px" ColumnID="PersonName" DataField="PersonName" SortField="PersonName"
                                             FieldType="String" HeaderText="更新人" HeaderTextAlign="Center"
                                             TextAlign="Left">
                                         </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx
index c7f94094..821d2581 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx
@@ -87,7 +87,7 @@
                                             HeaderText="文件大小" HeaderTextAlign="Center" Renderer="FileSize"
                                             TextAlign="Right">
                                         </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName" SortField="UserName"
+                                        <f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName" SortField="PersonName"
                                             FieldType="String" HeaderText="更新人" HeaderTextAlign="Center"
                                             TextAlign="Left">
                                         </f:RenderField>
@@ -135,7 +135,7 @@
                                             TextAlign="Left" Width="100px">
                                         </f:RenderField>
 
-                                        <f:RenderField Width="200px" ColumnID="UserName" DataField="UserName" SortField="UserName"
+                                        <f:RenderField Width="200px" ColumnID="PersonName" DataField="PersonName" SortField="PersonName"
                                             FieldType="String" HeaderText="更新人" HeaderTextAlign="Center"
                                             TextAlign="Left">
                                         </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx
index e5279a21..efd7060e 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx
@@ -147,7 +147,7 @@
                                         <f:RenderField Width="200px" ColumnID="OperateName" DataField="OperateName"
                                             FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
                                         </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
+                                        <f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
                                             FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
                                         <f:RenderField Width="80px" ColumnID="IsAgreeName" DataField="IsAgreeName" FieldType="String"
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.cs
index e6bd9afd..84d58ea7 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.cs
@@ -119,9 +119,9 @@ namespace FineUIPro.Web.HSSE.Check
         {
             if (!string.IsNullOrEmpty(this.RectifyNoticesId))
             {
-                string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.UserName
+                string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.PersonName
                 ,(case when IsAgree=0 then '不同意' else '同意' end) as IsAgreeName
-                from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
+                from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 strSql += "where RectifyNoticesId= @RectifyNoticesId";
                 listStr.Add(new SqlParameter("@RectifyNoticesId", RectifyNoticesId));
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx
index a6b4b36e..e6e0d0d1 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx
@@ -143,7 +143,7 @@
                                 <f:RenderField Width="200px" ColumnID="OperateName" DataField="OperateName"
                                     FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
                                 </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
+                                <f:RenderField Width="100px" ColumnID="PersonName" DataField="UserName"
                                     FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
                                 </f:RenderField>
                                 <f:RenderField Width="80px" ColumnID="IsAgreeName" DataField="IsAgreeName" FieldType="String"
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs
index eeec8bf0..f47505e7 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs
@@ -88,9 +88,9 @@ namespace FineUIPro.Web.HSSE.Check
         {
             if (!string.IsNullOrEmpty(this.RectifyNoticesId))
             {
-                string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.UserName
+                string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.PersonName
                 ,(case when IsAgree=0 then '不同意' else '同意' end) as IsAgreeName
-                from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
+                from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 strSql += "where RectifyNoticesId= @RectifyNoticesId";
                 listStr.Add(new SqlParameter("@RectifyNoticesId", RectifyNoticesId));
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx
index 319c82dc..12b708bd 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx
@@ -321,7 +321,7 @@
                                         <f:RenderField Width="120px" ColumnID="OperateName" DataField="OperateName"
                                             FieldType="String" HeaderText="操作步骤" HeaderTextAlign="Center" TextAlign="Left">
                                         </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
+                                        <f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
                                             FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
                                         <f:RenderField Width="80px" ColumnID="IsAgreeName" DataField="IsAgreeName" FieldType="String"
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs
index fd34410e..6353ac1e 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs
@@ -354,9 +354,9 @@ namespace FineUIPro.Web.HSSE.Check
         }
         public void BindGrid1()
         {
-            string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.UserName
+            string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.PersonName
                 ,(case when IsAgree=0 then '不同意' else '同意' end) as IsAgreeName
-                from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
+                from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             strSql += "where RectifyNoticesId= @RectifyNoticesId";
             listStr.Add(new SqlParameter("@RectifyNoticesId", RectifyNoticesId));
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx
index eb2a133b..14e8b838 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx
@@ -154,7 +154,7 @@
                                         <f:RenderField Width="200px" ColumnID="OperateName" DataField="OperateName"
                                             FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
                                         </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
+                                        <f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
                                             FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
                                         <f:RenderField Width="80px" ColumnID="IsAgreeName" DataField="IsAgreeName" FieldType="String"
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx.cs
index 9675a036..ba171362 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx.cs
@@ -124,9 +124,9 @@ namespace FineUIPro.Web.HSSE.Check
         {
             if (!string.IsNullOrEmpty(this.RectifyNoticesId))
             {
-                string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.UserName
+                string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.PersonName
                 ,(case when IsAgree=0 then '不同意' else '同意' end) as IsAgreeName
-                from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
+                from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 strSql += "where RectifyNoticesId= @RectifyNoticesId";
                 listStr.Add(new SqlParameter("@RectifyNoticesId", RectifyNoticesId));
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx
index 3e2eea7e..b4e4e947 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx
@@ -123,7 +123,7 @@
                                         <f:RenderField Width="200px" ColumnID="OperateName" DataField="OperateName"
                                             FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
                                         </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
+                                        <f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
                                             FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
                                         <f:RenderField Width="80px" ColumnID="IsAgreeName" DataField="IsAgreeName" FieldType="String"
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx.cs
index bf81479d..174ba90c 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx.cs
@@ -108,9 +108,9 @@ namespace FineUIPro.Web.HSSE.Check
         {
             if (!string.IsNullOrEmpty(this.RectifyNoticesId))
             {
-                string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.UserName
+                string strSql = @"select FlowOperateId, RectifyNoticesId, OperateName, OperateManId, OperateTime, IsAgree, Opinion,S.PersonName
                 ,(case when IsAgree=0 then '不同意' else '同意' end) as IsAgreeName
-                from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
+                from Check_RectifyNoticesFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 strSql += "where RectifyNoticesId= @RectifyNoticesId";
                 listStr.Add(new SqlParameter("@RectifyNoticesId", RectifyNoticesId));
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx
index b7cac957..b3c4226d 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx
@@ -108,7 +108,7 @@
                                         <f:RenderField Width="200px" ColumnID="OperateName" DataField="OperateName"
                                             FieldType="String" HeaderText="操作步骤" HeaderTextAlign="Center" TextAlign="Left">
                                         </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
+                                        <f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
                                             FieldType="String" HeaderText="操作人员" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
                                         <f:RenderField Width="80px" ColumnID="IsAgreeName" DataField="IsAgreeName" FieldType="String"
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
index 679c1b14..8e6f0a6b 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
@@ -722,7 +722,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
             var getSitePerson = SitePerson_PersonService.GetSitePersonById(Grid1.SelectedRowID);
             if (getSitePerson != null)
             {
-                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Person/PersonView.aspx?PersonId={0}", getSitePerson.PersonId, "查看 - ")));
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Person/ProjectPersonView.aspx?SitePersonId={0}", this.SitePersonId, "查看 - ")));
             }
         }
     }
diff --git a/SGGL/FineUIPro.Web/Person/PersonContractEdit.aspx b/SGGL/FineUIPro.Web/Person/PersonContractEdit.aspx
new file mode 100644
index 00000000..ac680a99
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Person/PersonContractEdit.aspx
@@ -0,0 +1,76 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PersonContractEdit.aspx.cs"
+    Inherits="FineUIPro.Web.Person.PersonContractEdit" ValidateRequest="false" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>合同信息</title>
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="合同信息" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="150px">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtPersonName" runat="server" Label="乙方（劳动者姓名）" Readonly="true">
+                        </f:TextBox>
+                        <f:TextBox ID="txtIdentityCard" runat="server" Label="身份证" Readonly="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpProject" runat="server" Label="项目" EnableEdit="true">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpUnit" runat="server" Label="甲方（单位名称）" EnableEdit="true"
+                            AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
+                        </f:DropDownList>
+
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpLeadMan" runat="server" Label="负责人姓名" EnableEdit="true"
+                            AutoPostBack="true" OnSelectedIndexChanged="drpLeadMan_SelectedIndexChanged">
+                        </f:DropDownList>
+                        <f:TextBox ID="txtTelephone" runat="server" Label="联系电话" MaxLength="500">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpContractType" runat="server" Label="合同有效期" EnableEdit="true"
+                            AutoPostBack="true" OnSelectedIndexChanged="drpContractType_SelectedIndexChanged">
+                        </f:DropDownList>
+                        <f:DatePicker ID="txtStartDate" Label="开始日期" runat="server">
+                        </f:DatePicker>
+                        <f:DatePicker ID="txtEndDate" Label="结束日期" runat="server">
+                        </f:DatePicker>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1"
+                            OnClick="btnSave_Click">
+                        </f:Button>
+                        <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Person/PersonContractEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonContractEdit.aspx.cs
new file mode 100644
index 00000000..cf5b1b8a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Person/PersonContractEdit.aspx.cs
@@ -0,0 +1,204 @@
+using BLL;
+using System;
+
+namespace FineUIPro.Web.Person
+{
+    public partial class PersonContractEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 人员主键
+        /// </summary>
+        private string PersonId
+        {
+            get
+            {
+                return (string)ViewState["PersonId"];
+            }
+            set
+            {
+                ViewState["PersonId"] = value;
+            }
+        }
+
+        /// <summary>
+        ///  主键
+        /// </summary>
+        private string PersonContractId
+        {
+            get
+            {
+                return (string)ViewState["PersonContractId"];
+            }
+            set
+            {
+                ViewState["PersonContractId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                this.PersonId = Request.Params["PersonId"];
+                this.PersonContractId = Request.Params["PersonContractId"];
+                ProjectService.InitAllProjectDropDownList(this.drpProject, true);
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
+                }
+                UnitService.InitUnitDropDownList(this.drpUnit, null, true);
+                if (!string.IsNullOrEmpty(this.CurrUser.UnitId))
+                {
+                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                }
+                Funs.FineUIPleaseSelect(this.drpLeadMan);
+                DropListService.InitConstDropDownList(this.drpContractType, DropListService.Group_ContractType, false);
+
+                if (!string.IsNullOrEmpty(this.PersonContractId))
+                {
+                    var getData = BLL.Person_PersonContractService.getDataById(this.PersonContractId);
+                    if (getData != null)
+                    {
+                        this.PersonId = getData.PersonId;
+                        this.drpUnit.SelectedValue = getData.UnitId;
+                        this.drpProject.SelectedValue = getData.ProjectId;                     
+                        this.txtTelephone.Text = getData.Telephone;
+                        this.drpContractType.SelectedValue = getData.ContractType;
+                        this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", getData.StartDate);
+                        this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", getData.EndDate);
+
+                        Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpLeadMan, null, this.drpUnit.SelectedValue, true);
+                        this.drpLeadMan.SelectedValue = getData.LeadManId;
+                    }
+                }
+
+                var person = BLL.Person_PersonsService.GetPerson_PersonsById(this.PersonId);
+                if (person != null)
+                {
+                    this.txtPersonName.Text = person.PersonName;
+                    this.txtIdentityCard.Text = person.IdentityCard;
+                }
+               
+                if (Request.Params["value"] == "0")
+                {
+                    this.btnSave.Hidden = true;
+                }
+            }
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            SaveData();
+        }
+
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        private void SaveData()
+        {
+            if (!String.IsNullOrEmpty(this.PersonId))
+            {
+                Model.Person_PersonContract newData = new Model.Person_PersonContract
+                {
+                    PersonId = this.PersonId,
+                    PersonContractId = this.PersonContractId,
+                    StartDate = Funs.GetNewDateTime(this.txtStartDate.Text.Trim()),
+                    EndDate = Funs.GetNewDateTime(this.txtEndDate.Text.Trim()),
+                    Telephone=this.txtTelephone.Text.Trim(),
+                };
+                if (!string.IsNullOrEmpty(this.drpProject.SelectedValue) && this.drpProject.SelectedValue != Const._Null)
+                {
+                    newData.ProjectId = this.drpProject.SelectedValue;
+                }
+                if (!string.IsNullOrEmpty(this.drpUnit.SelectedValue) && this.drpUnit.SelectedValue != Const._Null)
+                {
+                    newData.UnitId = this.drpUnit.SelectedValue;
+                }
+                if (!string.IsNullOrEmpty(this.drpLeadMan.SelectedValue) && this.drpLeadMan.SelectedValue != Const._Null)
+                {
+                    newData.LeadManId = this.drpLeadMan.SelectedValue;
+                }
+                if (!string.IsNullOrEmpty(this.drpContractType.SelectedValue) && this.drpContractType.SelectedValue != Const._Null)
+                {
+                    newData.ContractType = this.drpContractType.SelectedValue;
+                }
+                if (!string.IsNullOrEmpty(this.PersonContractId))
+                {
+                    BLL.Person_PersonContractService.UpdateData(newData);
+                    BLL.LogService.AddSys_Log(this.CurrUser, this.txtIdentityCard.Text, newData.PersonContractId, BLL.Const.ProjectPersonMenuId, BLL.Const.BtnModify);
+                }
+                else
+                {
+                    this.PersonContractId = SQLHelper.GetNewID();
+                    newData.PersonContractId = this.PersonContractId;
+                    BLL.Person_PersonContractService.AddData(newData);
+                    BLL.LogService.AddSys_Log(this.CurrUser, this.txtIdentityCard.Text, newData.PersonContractId, BLL.Const.ProjectPersonMenuId, BLL.Const.BtnAdd);
+                }
+
+                PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+            }
+        }
+        #endregion
+
+        #region 下拉框事件
+        /// <summary>
+        ///  单位下拉框事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpLeadMan, null, this.drpUnit.SelectedValue, true);
+        }
+
+        /// <summary>
+        ///  合同下拉框事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpContractType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.drpContractType.SelectedValue == "1")
+            {
+                this.txtStartDate.Hidden = false;
+                this.txtEndDate.Hidden = false;
+            }
+            else
+            {
+                this.txtStartDate.Hidden = true;
+                this.txtEndDate.Hidden = true;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpLeadMan_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            var getPerson = Person_PersonsService.GetPerson_PersonsById(this.drpLeadMan.SelectedValue);
+            if (getPerson != null)
+            {
+                this.txtTelephone.Text = getPerson.Telephone;
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Person/PersonContractEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Person/PersonContractEdit.aspx.designer.cs
new file mode 100644
index 00000000..beab032d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Person/PersonContractEdit.aspx.designer.cs
@@ -0,0 +1,161 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Person
+{
+
+
+    public partial class PersonContractEdit
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// txtPersonName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPersonName;
+
+        /// <summary>
+        /// txtIdentityCard 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIdentityCard;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// drpUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnit;
+
+        /// <summary>
+        /// drpLeadMan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpLeadMan;
+
+        /// <summary>
+        /// txtTelephone 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTelephone;
+
+        /// <summary>
+        /// drpContractType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpContractType;
+
+        /// <summary>
+        /// txtStartDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartDate;
+
+        /// <summary>
+        /// txtEndDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndDate;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Person/PersonView.aspx b/SGGL/FineUIPro.Web/Person/PersonView.aspx
index 4100be90..aba63dcb 100644
--- a/SGGL/FineUIPro.Web/Person/PersonView.aspx
+++ b/SGGL/FineUIPro.Web/Person/PersonView.aspx
@@ -72,11 +72,11 @@
                                                 </f:DropDownList>
                                             </Items>
                                         </f:FormRow>
-                                        <f:FormRow >
+                                        <f:FormRow>
                                             <Items>
                                                 <f:DropDownList ID="drpWorkPost" runat="server" Readonly="true" Label="岗位" EnableEdit="true">
                                                 </f:DropDownList>
-                                                <f:TextBox runat="server" Readonly="true" ID="txtPersonType" Label="类型"></f:TextBox>                                                
+                                                <f:TextBox runat="server" Readonly="true" ID="txtPersonType" Label="类型"></f:TextBox>
                                             </Items>
                                         </f:FormRow>
                                         <f:FormRow>
@@ -178,169 +178,309 @@
                 <f:Panel CssClass="blockpanel" Block="12" EnableCollapse="true"
                     runat="server" ShowBorder="true" ShowHeader="true" Title="详细信息">
                     <Items>
-                        <f:Form ID="SimpleForm2" ShowBorder="true" ShowHeader="false" AutoScroll="true" LabelWidth="110px"
-                            BodyPadding="10px" runat="server" LabelAlign="Right">
-                            <Rows>
-                                <f:FormRow>
+                        <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="500px" ShowBorder="true"
+                            TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
+                            <Tabs>
+                                <f:Tab ID="Tab1" Title="详细信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
                                     <Items>
-                                        <f:DatePicker ID="txtIntoDate" runat="server" Readonly="true" Label="入院时间">
-                                        </f:DatePicker>
-                                        <f:DatePicker ID="txtWorkDate" runat="server" Readonly="true" Label="参加工作时间">
-                                        </f:DatePicker>
-                                        <f:DatePicker ID="txtRetirementDate" runat="server" Readonly="true" Label="退休日期">
-                                        </f:DatePicker>
-                                        <f:DatePicker ID="txtValidityDate" runat="server" Readonly="true" Label="合同至">
-                                        </f:DatePicker>
+                                        <f:Form ID="SimpleForm2" ShowBorder="true" ShowHeader="false" AutoScroll="true" LabelWidth="110px"
+                                            BodyPadding="10px" runat="server" LabelAlign="Right">
+                                            <Rows>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:DatePicker ID="txtIntoDate" runat="server" Readonly="true" Label="入院时间">
+                                                        </f:DatePicker>
+                                                        <f:DatePicker ID="txtWorkDate" runat="server" Readonly="true" Label="参加工作时间">
+                                                        </f:DatePicker>
+                                                        <f:DatePicker ID="txtRetirementDate" runat="server" Readonly="true" Label="退休日期">
+                                                        </f:DatePicker>
+                                                        <f:DatePicker ID="txtValidityDate" runat="server" Readonly="true" Label="合同至">
+                                                        </f:DatePicker>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:DropDownList ID="drpPosition" runat="server" Readonly="true" Label="职务" EnableEdit="true">
+                                                        </f:DropDownList>
+                                                        <f:DropDownList ID="drpPostTitle" runat="server" Readonly="true" Label="职称" LabelAlign="Right" EnableEdit="true">
+                                                        </f:DropDownList>
+                                                        <f:DatePicker ID="txtPostTitleDate" runat="server" Readonly="true" Label="职称取得时间">
+                                                        </f:DatePicker>
+                                                        <f:TextBox ID="txtGraduate" runat="server" Readonly="true" Label="毕业院校" MaxLength="50">
+                                                        </f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:TextBox ID="txtMajor" runat="server" Readonly="true" Label="所学专业" MaxLength="50">
+                                                        </f:TextBox>
+                                                        <f:TextBox ID="txtForeignLanguage" runat="server" Readonly="true" Label="外语能力" MaxLength="50">
+                                                        </f:TextBox>
+                                                        <f:DropDownList ID="drpCountryCode" runat="server" Readonly="true" Label="籍贯"
+                                                            ShowEmptyLabel="true" EmptyText="国家"
+                                                            EnableEdit="true" AutoPostBack="true">
+                                                        </f:DropDownList>
+                                                        <f:DropDownList ID="drpProvinceCode" runat="server" Readonly="true" EnableEdit="true"
+                                                            ShowEmptyLabel="true" EmptyText="省/地区">
+                                                        </f:DropDownList>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:DropDownList ID="drpNation" runat="server" Readonly="true" Label="民族" EnableEdit="true">
+                                                        </f:DropDownList>
+                                                        <f:DropDownList ID="drpPoliticsStatus" runat="server" Readonly="true" Label="政治面貌" EnableEdit="true">
+                                                        </f:DropDownList>
+                                                        <f:DropDownList ID="drpEduLevel" runat="server" Readonly="true" Label="文化程度" EnableEdit="true">
+                                                        </f:DropDownList>
+                                                        <f:DropDownList ID="drpMaritalStatus" runat="server" Readonly="true" Label="婚姻状况" EnableEdit="true">
+                                                        </f:DropDownList>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow ColumnWidths="25% 25% 50%">
+                                                    <Items>
+                                                        <f:TextBox ID="txtRelativeName" runat="server" Readonly="true" Label="亲属姓名" MaxLength="50">
+                                                        </f:TextBox>
+                                                        <f:TextBox ID="txtRelativeTel" runat="server" Readonly="true" Label="亲属电话" MaxLength="50">
+                                                        </f:TextBox>
+                                                        <f:TextBox ID="txtAddress" runat="server" Readonly="true" Label="家庭地址" MaxLength="50">
+                                                        </f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                            </Rows>
+                                        </f:Form>
                                     </Items>
-                                </f:FormRow>
-                                <f:FormRow>
+                                </f:Tab>
+                                <f:Tab ID="TabCertificate" Title="证书信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
                                     <Items>
-                                        <f:DropDownList ID="drpPosition" runat="server" Readonly="true" Label="职务" EnableEdit="true">
-                                        </f:DropDownList>
-                                        <f:DropDownList ID="drpPostTitle" runat="server" Readonly="true" Label="职称" LabelAlign="Right" EnableEdit="true">
-                                        </f:DropDownList>
-                                        <f:DatePicker ID="txtPostTitleDate" runat="server" Readonly="true" Label="职称取得时间">
-                                        </f:DatePicker>
-                                        <f:TextBox ID="txtGraduate" runat="server" Readonly="true" Label="毕业院校" MaxLength="50">
-                                        </f:TextBox>
+                                        <f:Grid ID="GridCertificate" ShowBorder="true" ShowHeader="false" Title="证书信息"
+                                            runat="server" DataKeyNames="PersonQualityId" DataIDField="PersonQualityId" AllowSorting="true"
+                                            SortField="SendDate" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
+                                            SortDirection="DESC" OnSort="GridCertificate_Sort" AllowPaging="true" IsDatabasePaging="true"
+                                            OnPageIndexChange="GridCertificate_PageIndexChange" EnableTextSelection="True"
+                                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="GridCertificate_RowDoubleClick">                                        
+                                            <Columns>
+                                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                    TextAlign="Center" />
+                                                <f:RenderField Width="150px" ColumnID="CertificateName" DataField="CertificateName"
+                                                    FieldType="String" HeaderText="证书名称" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="120px" ColumnID="CertificateNo" DataField="CertificateNo"
+                                                    FieldType="String" HeaderText="证书编号" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="200px" ColumnID="SendUnit" DataField="SendUnit"
+                                                    FieldType="String" HeaderText="发证单位" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="SendDate" DataField="SendDate"
+                                                    FieldType="Date" RendererArgument="yyyy-MM-dd" HeaderText="发证时间" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="RegisterDate" DataField="RegisterDate"
+                                                    FieldType="Date" RendererArgument="yyyy-MM-dd" HeaderText="注册时间" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="Major" DataField="Major"
+                                                    FieldType="String" HeaderText="专业" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="LimitDate" DataField="LimitDate"
+                                                    FieldType="Date" RendererArgument="yyyy-MM-dd" HeaderText="有效期至" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                            <Listeners>
+                                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenuCertificate" />
+                                            </Listeners>
+                                            <PageItems>
+                                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                                </f:ToolbarSeparator>
+                                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                                </f:ToolbarText>
+                                                <f:DropDownList runat="server" ID="ddlPageSizeGridCertificate" Width="80px" AutoPostBack="true"
+                                                    OnSelectedIndexChanged="ddlPageSizeGridCertificate_SelectedIndexChanged">
+                                                </f:DropDownList>
+                                            </PageItems>
+                                        </f:Grid>
                                     </Items>
-                                </f:FormRow>
-                                <f:FormRow>
+                                </f:Tab>
+                                <f:Tab ID="Train" Title="培训信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
                                     <Items>
-                                        <f:TextBox ID="txtMajor" runat="server" Readonly="true" Label="所学专业" MaxLength="50">
-                                        </f:TextBox>
-                                        <f:TextBox ID="txtForeignLanguage" runat="server" Readonly="true" Label="外语能力" MaxLength="50">
-                                        </f:TextBox>
-                                        <f:DropDownList ID="drpCountryCode" runat="server" Readonly="true" Label="籍贯"
-                                            ShowEmptyLabel="true" EmptyText="国家"
-                                            EnableEdit="true" AutoPostBack="true">
-                                        </f:DropDownList>
-                                        <f:DropDownList ID="drpProvinceCode" runat="server" Readonly="true" EnableEdit="true"
-                                            ShowEmptyLabel="true" EmptyText="省/地区">
-                                        </f:DropDownList>
+                                        <f:Grid ID="GridTrain" ShowBorder="true" ShowHeader="false" Title="证书信息"
+                                            runat="server" DataKeyNames="PersonTrainId" DataIDField="PersonTrainId" AllowSorting="true"
+                                            SortField="TrainDate" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
+                                            SortDirection="DESC" OnSort="GridTrain_Sort" AllowPaging="true" IsDatabasePaging="true"
+                                            OnPageIndexChange="GridTrain_PageIndexChange" EnableTextSelection="True"
+                                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="GridTrain_RowDoubleClick">                                           
+                                            <Columns>
+                                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                    TextAlign="Center" />
+                                                <f:RenderField Width="150px" ColumnID="TrainTypeName" DataField="TrainTypeName"
+                                                    FieldType="String" HeaderText="培训类别" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="TrainDate" DataField="TrainDate"
+                                                    FieldType="Date" RendererArgument="yyyy-MM-dd" HeaderText="培训日期" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="200px" ColumnID="TrainPlace" DataField="TrainPlace"
+                                                    FieldType="String" HeaderText="培训地点" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="200px" ColumnID="TrainResult" DataField="TrainResult"
+                                                    FieldType="String" HeaderText="培训效果" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                            </Columns>
+                                            <Listeners>
+                                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenuTrain" />
+                                            </Listeners>
+                                            <PageItems>
+                                                <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
+                                                </f:ToolbarSeparator>
+                                                <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
+                                                </f:ToolbarText>
+                                                <f:DropDownList runat="server" ID="ddlPageSizeGridTrain" Width="80px" AutoPostBack="true"
+                                                    OnSelectedIndexChanged="ddlPageSizeGridTrain_SelectedIndexChanged">
+                                                </f:DropDownList>
+                                            </PageItems>
+                                        </f:Grid>
                                     </Items>
-                                </f:FormRow>
-                                <f:FormRow>
+                                </f:Tab>
+                                <f:Tab ID="Duty" Title="责任书" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
                                     <Items>
-                                        <f:DropDownList ID="drpNation" runat="server" Readonly="true" Label="民族" EnableEdit="true">
-                                        </f:DropDownList>
-                                        <f:DropDownList ID="drpPoliticsStatus" runat="server" Readonly="true" Label="政治面貌" EnableEdit="true">
-                                        </f:DropDownList>
-                                        <f:DropDownList ID="drpEduLevel" runat="server" Readonly="true" Label="文化程度" EnableEdit="true">
-                                        </f:DropDownList>
-                                        <f:DropDownList ID="drpMaritalStatus" runat="server" Readonly="true" Label="婚姻状况" EnableEdit="true">
-                                        </f:DropDownList>
+                                        <f:Grid ID="GridDuty" ShowBorder="true" ShowHeader="false" Title="责任书"
+                                            runat="server" DataKeyNames="DutyId" DataIDField="DutyId" AllowSorting="true"
+                                            SortField="DutyTime" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
+                                            SortDirection="DESC" OnSort="GridDuty_Sort" AllowPaging="true" IsDatabasePaging="true"
+                                            OnPageIndexChange="GridDuty_PageIndexChange" EnableTextSelection="True"
+                                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="GridDuty_RowDoubleClick">
+                                            <Columns>
+                                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                    TextAlign="Center" />
+                                                <f:TemplateField ColumnID="WorkPostName" Width="150px" HeaderText="岗位" HeaderTextAlign="Center" TextAlign="Center"
+                                                    EnableLock="true">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertDutyWorkPostName(Eval("WorkPostId")) %>'></asp:Label>
+                                                    </ItemTemplate>
+                                                </f:TemplateField>
+                                                <f:RenderField Width="120px" ColumnID="CompileTime" DataField="CompileTime" SortField="CompileTime"
+                                                    FieldType="Date" Renderer="Date" HeaderText="日期" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                            </Columns>
+                                            <Listeners>
+                                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenuDuty" />
+                                            </Listeners>
+                                            <PageItems>
+                                                <f:ToolbarSeparator ID="ToolbarSeparator3" runat="server">
+                                                </f:ToolbarSeparator>
+                                                <f:ToolbarText ID="ToolbarText3" runat="server" Text="每页记录数：">
+                                                </f:ToolbarText>
+                                                <f:DropDownList runat="server" ID="ddlPageSizeGridDuty" Width="80px" AutoPostBack="true"
+                                                    OnSelectedIndexChanged="ddlPageSizeGridDuty_SelectedIndexChanged">
+                                                </f:DropDownList>
+                                            </PageItems>
+                                        </f:Grid>
                                     </Items>
-                                </f:FormRow>
-                                <f:FormRow ColumnWidths="25% 25% 50%">
+                                </f:Tab>
+                                <f:Tab ID="InOut" Title="工作经历" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
                                     <Items>
-                                        <f:TextBox ID="txtRelativeName" runat="server" Readonly="true" Label="亲属姓名" MaxLength="50">
-                                        </f:TextBox>
-                                        <f:TextBox ID="txtRelativeTel" runat="server" Readonly="true" Label="亲属电话" MaxLength="50">
-                                        </f:TextBox>
-                                        <f:TextBox ID="txtAddress" runat="server" Readonly="true" Label="家庭地址" MaxLength="50">
-                                        </f:TextBox>
+                                        <f:Grid ID="GridInOut" ShowBorder="true" ShowHeader="false" Title="工作经历"
+                                            runat="server" DataKeyNames="PersonItemId" DataIDField="PersonItemId" AllowSorting="true"
+                                            SortField="InTime" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
+                                            SortDirection="DESC" OnSort="GridInOut_Sort" AllowPaging="true" IsDatabasePaging="true"
+                                            OnPageIndexChange="GridInOut_PageIndexChange" EnableTextSelection="True"
+                                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="GridInOut_RowDoubleClick">                                          
+                                            <Columns>
+                                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                    TextAlign="Center" />
+                                                <f:RenderField Width="230px" ColumnID="UnitName" DataField="UnitName"
+                                                    FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="250px" ColumnID="ProjectName" DataField="ProjectName"
+                                                    FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="WorkPostName" DataField="WorkPostName"
+                                                    FieldType="String" HeaderText="岗位/工种" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="150px" ColumnID="TeamGroupName" DataField="TeamGroupName"
+                                                    FieldType="String" HeaderText="班组名称" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="120px" ColumnID="InTime" DataField="InTime"
+                                                    FieldType="Date" Renderer="Date" HeaderText="进场时间" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="120px" ColumnID="OutTime" DataField="OutTime"
+                                                    FieldType="Date" Renderer="Date" HeaderText="退场时间" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="150px" ColumnID="OutResult" DataField="OutResult"
+                                                    FieldType="String" HeaderText="退场原因" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                            </Columns>
+                                            <Listeners>
+                                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenuInOut" />
+                                            </Listeners>
+                                            <PageItems>
+                                                <f:ToolbarSeparator ID="ToolbarSeparator4" runat="server">
+                                                </f:ToolbarSeparator>
+                                                <f:ToolbarText ID="ToolbarText4" runat="server" Text="每页记录数：">
+                                                </f:ToolbarText>
+                                                <f:DropDownList runat="server" ID="ddlPageSizeGridInOut" Width="80px" AutoPostBack="true"
+                                                    OnSelectedIndexChanged="ddlPageSizeGridInOut_SelectedIndexChanged">
+                                                </f:DropDownList>
+                                            </PageItems>
+                                        </f:Grid>
                                     </Items>
-                                </f:FormRow>
-                            </Rows>
-                        </f:Form>
-                    </Items>
-                </f:Panel>
-                <f:Panel CssClass="blockpanel" Block="12" EnableCollapse="true"
-                    runat="server" ShowBorder="true" ShowHeader="true" Title="证书信息">
-                </f:Panel>
-                <f:Panel CssClass="blockpanel" Block="12" EnableCollapse="true"
-                    runat="server" ShowBorder="true" ShowHeader="true" Title="培训考试记录">
-                    <Items>
-                        <f:Grid ID="GridTestRecord" ShowBorder="true" ShowHeader="false" Title="项目进出场"
-                            runat="server" DataKeyNames="TestRecordId" DataIDField="TestRecordId" AllowSorting="true"
-                            SortField="TestStartTime" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
-                            SortDirection="DESC" OnSort="GridTestRecord_Sort" AllowPaging="true" IsDatabasePaging="true"
-                            OnPageIndexChange="GridTestRecord_PageIndexChange" EnableTextSelection="True">
-                            <Columns>
-                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                                    TextAlign="Center" />
-                                <f:RenderField Width="250px" ColumnID="ProjectName" DataField="ProjectName"
-                                    FieldType="String" HeaderText="项目" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="90px" ColumnID="PlanCode" DataField="PlanCode"
-                                    FieldType="String" HeaderText="考试编号" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="150px" ColumnID="PlanName" DataField="PlanName"
-                                    FieldType="String" HeaderText="考试名称" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                  <f:RenderField Width="180px" ColumnID="TestPalce" DataField="TestPalce"
-                                    FieldType="String" HeaderText="考试地点" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="160px" ColumnID="TestStartTime" DataField="TestStartTime"
-                                    FieldType="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" HeaderText="扫描考试时间" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="160px" ColumnID="TestEndTime" DataField="TestEndTime"
-                                    FieldType="Date" RendererArgument="yyyy-MM-dd HH:mm:ss"  HeaderText="交卷时间" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                     <f:RenderField Width="80px" ColumnID="TestScores" DataField="TestScores"
-                                    FieldType="Double" HeaderText="成绩" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                            </Columns>
-                            <PageItems>
-                                <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
-                                </f:ToolbarSeparator>
-                                <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
-                                </f:ToolbarText>
-                                <f:DropDownList runat="server" ID="ddlPageSizeGridTestRecord" Width="80px" AutoPostBack="true"
-                                    OnSelectedIndexChanged="ddlPageSizeGridTestRecord_SelectedIndexChanged">
-                                </f:DropDownList>
-                            </PageItems>
-                        </f:Grid>
-                    </Items>
-                </f:Panel>
-                <f:Panel CssClass="blockpanel" Block="12" EnableCollapse="true"
-                    runat="server" ShowBorder="true" ShowHeader="true" Title="图片">
-                </f:Panel>
-                <f:Panel CssClass="blockpanel" Block="12" EnableCollapse="true"
-                    runat="server" ShowBorder="true" ShowHeader="true" Title="项目进出场记录">
-                    <Items>
-                        <f:Grid ID="GridProjectInOut" ShowBorder="true" ShowHeader="false" Title="项目进出场"
-                            runat="server" DataKeyNames="PersonItemId" DataIDField="PersonItemId" AllowSorting="true"
-                            SortField="InTime" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
-                            SortDirection="DESC" OnSort="GridProjectInOut_Sort" AllowPaging="true" IsDatabasePaging="true"
-                            OnPageIndexChange="GridProjectInOut_PageIndexChange" EnableTextSelection="True">
-                            <Columns>
-                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                                    TextAlign="Center" />
-                                <f:RenderField Width="250px" ColumnID="ProjectName" DataField="ProjectName"
-                                    FieldType="String" HeaderText="项目" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
-                                    FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="WorkPostName" DataField="WorkPostName"
-                                    FieldType="String" HeaderText="项目岗位" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="200px" ColumnID="RoleName" DataField="RoleName"
-                                    FieldType="String" HeaderText="项目角色" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="120px" ColumnID="InTime" DataField="InTime"
-                                    FieldType="Date" Renderer="Date" HeaderText="进场时间" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="120px" ColumnID="OutTime" DataField="OutTime"
-                                    FieldType="Date" Renderer="Date" HeaderText="出场时间" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                            </Columns>
-                            <PageItems>
-                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                                </f:ToolbarSeparator>
-                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                                </f:ToolbarText>
-                                <f:DropDownList runat="server" ID="ddlPageSizeGridProjectInOut" Width="80px" AutoPostBack="true"
-                                    OnSelectedIndexChanged="ddlPageSizeGridProjectInOut_SelectedIndexChanged">
-                                </f:DropDownList>
-                            </PageItems>
-                        </f:Grid>
+                                </f:Tab>
+                            </Tabs>
+                        </f:TabStrip>
                     </Items>
                 </f:Panel>
             </Items>
         </f:Panel>
+        <f:Window ID="Window1" Title="查看信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
+            Height="600px">
+        </f:Window>
+        <f:Menu ID="MenuCertificate" runat="server">
+            <f:MenuButton ID="btnCertificateEdit" OnClick="btnCertificateEdit_Click" EnablePostBack="true"
+                runat="server" Text="查看" Icon="Find">
+            </f:MenuButton>
+        </f:Menu>
+        <f:Menu ID="MenuTrain" runat="server">
+            <f:MenuButton ID="btnTrainEdit" OnClick="btnTrainEdit_Click" EnablePostBack="true"
+                runat="server" Text="查看" Icon="Find">
+            </f:MenuButton>
+        </f:Menu>
+        <f:Menu ID="MenuDuty" runat="server">
+            <f:MenuButton ID="btnDutyEdit" OnClick="btnDutyEdit_Click" EnablePostBack="true"
+                runat="server" Text="查看" Icon="Find">
+            </f:MenuButton>
+        </f:Menu>
+        <f:Menu ID="MenuInOut" runat="server">
+            <f:MenuButton ID="btnInOutEdit" OnClick="btnInOutEdit_Click" EnablePostBack="true"
+                runat="server" Text="查看" Icon="Find">
+            </f:MenuButton>
+        </f:Menu>
     </form>
+    <script type="text/jscript">
+        var menuIDCertificate = '<%= MenuCertificate.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenuCertificate(event, rowId) {
+            F(menuIDCertificate).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        var menuIDTrain = '<%= MenuTrain.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenuTrain(event, rowId) {
+            F(menuIDTrain).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        var menuIDDuty = '<%= MenuDuty.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenuDuty(event, rowId) {
+            F(menuIDDuty).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        var menuIDInOut = '<%= MenuInOut.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenuInOut(event, rowId) {
+            F(menuIDInOut).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/Person/PersonView.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonView.aspx.cs
index d8ca81f7..c03e9c5f 100644
--- a/SGGL/FineUIPro.Web/Person/PersonView.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/PersonView.aspx.cs
@@ -154,8 +154,11 @@ namespace FineUIPro.Web.Person
                         #endregion
                     }
                 }
-                getInitGridTestRecord();
-                getInitGridProjectInOut();
+
+                getInitGridCertificate();
+                getInitGridTrain();
+                getInitGridDuty();
+                getInitGridInOut();
             }
         }
         #endregion
@@ -189,26 +192,26 @@ namespace FineUIPro.Web.Person
 
         #endregion
 
-        #region 人员培训考试记录
+        #region 证书信息
         /// <summary>
         /// 
         /// </summary>
-        private void getInitGridTestRecord()
+        private void getInitGridCertificate()
         {
-            Funs.DropDownPageSize(this.ddlPageSizeGridTestRecord);
-            BindGridTestRecord();
+            Funs.DropDownPageSize(this.ddlPageSizeGridCertificate);
+            BindGridCertificate();
         }
 
         #region 绑定数据
         /// <summary>
         /// 绑定数据
         /// </summary>
-        private void BindGridTestRecord()
+        private void BindGridCertificate()
         {
-            var getData = TestRecordService.getListData(this.PersonId, GridTestRecord);
-            GridTestRecord.RecordCount = TestRecordService.count;
-            GridTestRecord.DataSource = getData;
-            GridTestRecord.DataBind();
+            var getData = PersonQualityService.getListData(this.PersonId, GridCertificate);
+            GridCertificate.RecordCount = PersonQualityService.count;
+            GridCertificate.DataSource = getData;
+            GridCertificate.DataBind();
         }
         #endregion
 
@@ -218,9 +221,9 @@ namespace FineUIPro.Web.Person
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void GridTestRecord_PageIndexChange(object sender, GridPageEventArgs e)
+        protected void GridCertificate_PageIndexChange(object sender, GridPageEventArgs e)
         {
-            BindGridTestRecord();
+            BindGridCertificate();
         }
 
         /// <summary>
@@ -228,10 +231,10 @@ namespace FineUIPro.Web.Person
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void ddlPageSizeGridTestRecord_SelectedIndexChanged(object sender, EventArgs e)
+        protected void ddlPageSizeGridCertificate_SelectedIndexChanged(object sender, EventArgs e)
         {
-            GridTestRecord.PageSize = Convert.ToInt32(ddlPageSizeGridTestRecord.SelectedValue);
-            BindGridTestRecord();
+            GridCertificate.PageSize = Convert.ToInt32(ddlPageSizeGridCertificate.SelectedValue);
+            BindGridCertificate();
         }
 
         /// <summary>
@@ -239,33 +242,61 @@ namespace FineUIPro.Web.Person
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void GridTestRecord_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        protected void GridCertificate_Sort(object sender, FineUIPro.GridSortEventArgs e)
         {
-            BindGridTestRecord();
+            BindGridCertificate();
         }
         #endregion
+
+        /// <summary>
+        /// 双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridCertificate_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditDataCertificate();
+        }
+        protected void btnCertificateEdit_Click(object sender, EventArgs e)
+        {
+            this.EditDataCertificate();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditDataCertificate()
+        {
+            if (GridCertificate.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/QualityAudit/PersonQualityEdit.aspx?PersonQualityId={0}&value=0", GridCertificate.SelectedRowID, "编辑 - ")));
+        }
         #endregion
 
-        #region 人员项目出入场信息
+        #region 培训信息
         /// <summary>
         /// 
         /// </summary>
-        private void getInitGridProjectInOut()
+        private void getInitGridTrain()
         {
-            Funs.DropDownPageSize(this.ddlPageSizeGridProjectInOut);
-            BindGridProjectInOut();
+            Funs.DropDownPageSize(this.ddlPageSizeGridTrain);
+            BindGridTrain();
         }
 
         #region 绑定数据
         /// <summary>
         /// 绑定数据
         /// </summary>
-        private void BindGridProjectInOut()
+        private void BindGridTrain()
         {
-            var getData = SitePerson_PersonItemService.getListData(null, null, this.PersonId, null, null, null, null, GridProjectInOut);
-            GridProjectInOut.RecordCount = Person_PersonsService.count;
-            GridProjectInOut.DataSource = getData;
-            GridProjectInOut.DataBind();
+            var getData = Person_PersonTrainService.getListData(this.PersonId, GridTrain);
+            GridTrain.RecordCount = Person_PersonTrainService.count;
+            GridTrain.DataSource = getData;
+            GridTrain.DataBind();
         }
         #endregion
 
@@ -275,9 +306,9 @@ namespace FineUIPro.Web.Person
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void GridProjectInOut_PageIndexChange(object sender, GridPageEventArgs e)
+        protected void GridTrain_PageIndexChange(object sender, GridPageEventArgs e)
         {
-            BindGridProjectInOut();
+            BindGridTrain();
         }
 
         /// <summary>
@@ -285,10 +316,10 @@ namespace FineUIPro.Web.Person
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void ddlPageSizeGridProjectInOut_SelectedIndexChanged(object sender, EventArgs e)
+        protected void ddlPageSizeGridTrain_SelectedIndexChanged(object sender, EventArgs e)
         {
-            GridProjectInOut.PageSize = Convert.ToInt32(ddlPageSizeGridProjectInOut.SelectedValue);
-            BindGridProjectInOut();
+            GridTrain.PageSize = Convert.ToInt32(ddlPageSizeGridTrain.SelectedValue);
+            BindGridTrain();
         }
 
         /// <summary>
@@ -296,12 +327,212 @@ namespace FineUIPro.Web.Person
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void GridProjectInOut_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        protected void GridTrain_Sort(object sender, FineUIPro.GridSortEventArgs e)
         {
-            BindGridProjectInOut();
+            BindGridTrain();
+        }
+        #endregion
+
+        /// <summary>
+        /// 双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridTrain_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditDataTrain();
+        }
+        protected void btnTrainEdit_Click(object sender, EventArgs e)
+        {
+            this.EditDataTrain();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditDataTrain()
+        {
+            if (GridTrain.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PersonTrainEdit.aspx?PersonTrainId={0}&value=0", GridTrain.SelectedRowID, "编辑 - ")));
+        }
+        #endregion
+
+        #region 员工责任书
+        /// <summary>
+        /// 
+        /// </summary>
+        private void getInitGridDuty()
+        {
+            Funs.DropDownPageSize(this.ddlPageSizeGridDuty);
+            BindGridDuty();
+        }
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGridDuty()
+        {
+            var getData = Person_DutyService.getListData(this.PersonId, GridDuty);
+            GridDuty.RecordCount = Person_DutyService.count;
+            GridDuty.DataSource = getData;
+            GridDuty.DataBind();
+        }
+        #endregion
+
+        #region 分页
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridDuty_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGridDuty();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSizeGridDuty_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridDuty.PageSize = Convert.ToInt32(ddlPageSizeGridDuty.SelectedValue);
+            BindGridDuty();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridDuty_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            BindGridDuty();
+        }
+        #endregion
+
+        /// <summary>
+        /// 双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridDuty_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditDataDuty();
+        }
+        protected void btnDutyEdit_Click(object sender, EventArgs e)
+        {
+            this.EditDataDuty();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditDataDuty()
+        {
+            if (GridDuty.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DepartPersonDutyView.aspx?DutyId={0}", GridDuty.SelectedRowID, "编辑 - ")));
+        }
+
+        #endregion
+
+        #region 人员工作经历
+        /// <summary>
+        /// 
+        /// </summary>
+        private void getInitGridInOut()
+        {
+            Funs.DropDownPageSize(this.ddlPageSizeGridInOut);
+            BindGridInOut();
+        }
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGridInOut()
+        {
+            var getData = SitePerson_PersonItemService.getListData(null, null, this.PersonId, null, null, null, null, GridInOut);
+            GridInOut.RecordCount = Person_PersonsService.count;
+            GridInOut.DataSource = getData;
+            GridInOut.DataBind();
+        }
+        #endregion
+
+        #region 分页
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridInOut_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGridInOut();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSizeGridInOut_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridInOut.PageSize = Convert.ToInt32(ddlPageSizeGridInOut.SelectedValue);
+            BindGridInOut();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridInOut_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            BindGridInOut();
+        }
+        #endregion
+
+        #region 数据操作事件
+        /// <summary>
+        /// 双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridInOut_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditDataInOut();
+        }
+        protected void btnInOutEdit_Click(object sender, EventArgs e)
+        {
+            this.EditDataInOut();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditDataInOut()
+        {
+            if (GridInOut.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PersonItemEdit.aspx?PersonItemId={0}&value=0", GridInOut.SelectedRowID, "编辑 - ")));
         }
         #endregion
         #endregion
-
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Person/PersonView.aspx.designer.cs b/SGGL/FineUIPro.Web/Person/PersonView.aspx.designer.cs
index 10700493..fd9f553d 100644
--- a/SGGL/FineUIPro.Web/Person/PersonView.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Person/PersonView.aspx.designer.cs
@@ -266,6 +266,24 @@ namespace FineUIPro.Web.Person
         /// </remarks>
         protected global::FineUIPro.Image imgIDCardBack;
 
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
+        /// <summary>
+        /// Tab1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab1;
+
         /// <summary>
         /// SimpleForm2 控件。
         /// </summary>
@@ -447,49 +465,22 @@ namespace FineUIPro.Web.Person
         protected global::FineUIPro.TextBox txtAddress;
 
         /// <summary>
-        /// GridTestRecord 控件。
+        /// TabCertificate 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Grid GridTestRecord;
+        protected global::FineUIPro.Tab TabCertificate;
 
         /// <summary>
-        /// ToolbarSeparator2 控件。
+        /// GridCertificate 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
-
-        /// <summary>
-        /// ToolbarText2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ToolbarText ToolbarText2;
-
-        /// <summary>
-        /// ddlPageSizeGridTestRecord 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlPageSizeGridTestRecord;
-
-        /// <summary>
-        /// GridProjectInOut 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Grid GridProjectInOut;
+        protected global::FineUIPro.Grid GridCertificate;
 
         /// <summary>
         /// ToolbarSeparator1 控件。
@@ -510,12 +501,237 @@ namespace FineUIPro.Web.Person
         protected global::FineUIPro.ToolbarText ToolbarText1;
 
         /// <summary>
-        /// ddlPageSizeGridProjectInOut 控件。
+        /// ddlPageSizeGridCertificate 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList ddlPageSizeGridProjectInOut;
+        protected global::FineUIPro.DropDownList ddlPageSizeGridCertificate;
+
+        /// <summary>
+        /// Train 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Train;
+
+        /// <summary>
+        /// GridTrain 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GridTrain;
+
+        /// <summary>
+        /// ToolbarSeparator2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
+
+        /// <summary>
+        /// ToolbarText2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText2;
+
+        /// <summary>
+        /// ddlPageSizeGridTrain 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSizeGridTrain;
+
+        /// <summary>
+        /// Duty 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Duty;
+
+        /// <summary>
+        /// GridDuty 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GridDuty;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// ToolbarSeparator3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator3;
+
+        /// <summary>
+        /// ToolbarText3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText3;
+
+        /// <summary>
+        /// ddlPageSizeGridDuty 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSizeGridDuty;
+
+        /// <summary>
+        /// InOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab InOut;
+
+        /// <summary>
+        /// GridInOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GridInOut;
+
+        /// <summary>
+        /// ToolbarSeparator4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator4;
+
+        /// <summary>
+        /// ToolbarText4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText4;
+
+        /// <summary>
+        /// ddlPageSizeGridInOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSizeGridInOut;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// MenuCertificate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu MenuCertificate;
+
+        /// <summary>
+        /// btnCertificateEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnCertificateEdit;
+
+        /// <summary>
+        /// MenuTrain 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu MenuTrain;
+
+        /// <summary>
+        /// btnTrainEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnTrainEdit;
+
+        /// <summary>
+        /// MenuDuty 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu MenuDuty;
+
+        /// <summary>
+        /// btnDutyEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnDutyEdit;
+
+        /// <summary>
+        /// MenuInOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu MenuInOut;
+
+        /// <summary>
+        /// btnInOutEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnInOutEdit;
     }
 }
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs b/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs
index 4a913294..b9d84e76 100644
--- a/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs
@@ -64,7 +64,7 @@ namespace FineUIPro.Web.Person
                     }
                     else if (commandName == "details")
                     {
-                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PersonView.aspx?PersonId={0}", personId, "查看 - ")));
+                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectPersonView.aspx?SitePersonId={0}", sitepersonId, "查看 - ")));
                     }
                     else if (commandName == "reset")
                     {
@@ -80,7 +80,7 @@ namespace FineUIPro.Web.Person
                     }
                     else if (commandName == "salary")
                     {
-                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PersonView.aspx?PersonId={0}", personId, "查看 - ")));
+                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectPersonView.aspx?SitePersonId={0}", sitepersonId, "查看 - ")));
                     }
                 }
             }
@@ -287,8 +287,8 @@ namespace FineUIPro.Web.Person
         /// <param name="projectPersonId"></param>
         private void SeePersonInfo(string projectPersonId)
         {
-            string personId = Funs.GetStrListByStr(Grid1.SelectedRowID, '#')[1];
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PersonView.aspx?PersonId={0}", personId, "查看 - ")));
+            string sitepersonId = Funs.GetStrListByStr(Grid1.SelectedRowID, '#')[0];
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectPersonView.aspx?SitePersonId={0}", sitepersonId, "查看 - ")));
         }
         #endregion
 
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx
index 87cfd371..51f4ff63 100644
--- a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx
+++ b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx
@@ -401,8 +401,63 @@
                                         </f:Grid>
                                     </Items>
                                 </f:Tab>
-                                <f:Tab ID="Tab3" Title="合同信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
+                                <f:Tab ID="TabContract" Title="合同信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
                                     <Items>
+                                        <f:Grid ID="GridContract" ShowBorder="true" ShowHeader="false" Title="合同信息"
+                                            runat="server" DataKeyNames="PersonContractId" DataIDField="PersonContractId" AllowSorting="true"
+                                            SortField="StartDate" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
+                                            SortDirection="DESC" OnSort="GridContract_Sort" AllowPaging="true" IsDatabasePaging="true"
+                                            OnPageIndexChange="GridContract_PageIndexChange" EnableTextSelection="True"
+                                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="GridContract_RowDoubleClick">
+                                            <Toolbars>
+                                                <f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Right">
+                                                    <Items>
+                                                        <f:Button ID="btnContractNew" Text="新增" Icon="Add" EnablePostBack="false" runat="server">
+                                                        </f:Button>
+                                                    </Items>
+                                                </f:Toolbar>
+                                            </Toolbars>
+                                            <Columns>
+                                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                    TextAlign="Center" />
+                                                 <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName"
+                                                    FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="150px" ColumnID="UnitName" DataField="UnitName"
+                                                    FieldType="String" HeaderText="甲方(单位名称)" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:TemplateField Width="100px" HeaderText="负责人姓名" HeaderTextAlign="Center" TextAlign="Center">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="Label1" runat="server" Text='<%# GetPersonNameByPersonId(Eval("LeadManId")) %>'></asp:Label>
+                                                    </ItemTemplate>
+                                                </f:TemplateField>
+                                                <f:RenderField Width="100px" ColumnID="Telephone" DataField="Telephone"
+                                                    FieldType="String" HeaderText="联系电话" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:TemplateField Width="110px" HeaderText="乙方（劳动者姓名）" HeaderTextAlign="Center" TextAlign="Center">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="Label2" runat="server" Text='<%# GetPersonNameByPersonId(Eval("PersonId")) %>'></asp:Label>
+                                                    </ItemTemplate>
+                                                </f:TemplateField>
+                                                <f:TemplateField Width="230px" HeaderText="合同有效期" HeaderTextAlign="Center" TextAlign="Center">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="Label3" runat="server" Text='<%# GetContractType(Eval("PersonContractId")) %>'></asp:Label>
+                                                    </ItemTemplate>
+                                                </f:TemplateField>
+                                            </Columns>
+                                            <Listeners>
+                                                <f:Listener Event="beforerowcontextmenuContract" Handler="onRowContextMenuContract" />
+                                            </Listeners>
+                                            <PageItems>
+                                                <f:ToolbarSeparator ID="ToolbarSeparator4" runat="server">
+                                                </f:ToolbarSeparator>
+                                                <f:ToolbarText ID="ToolbarText4" runat="server" Text="每页记录数：">
+                                                </f:ToolbarText>
+                                                <f:DropDownList runat="server" ID="ddlPageSizeGridContract" Width="80px" AutoPostBack="true"
+                                                    OnSelectedIndexChanged="ddlPageSizeGridContract_SelectedIndexChanged">
+                                                </f:DropDownList>
+                                            </PageItems>
+                                        </f:Grid>
                                     </Items>
                                 </f:Tab>
                                 <f:Tab ID="Tab4" Title="考勤信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
@@ -536,7 +591,6 @@
                 Icon="Delete" Text="删除">
             </f:MenuButton>
         </f:Menu>
-
         <f:Menu ID="MenuInOut" runat="server">
             <f:MenuButton ID="btnInOutEdit" OnClick="btnInOutEdit_Click" EnablePostBack="true"
                 runat="server" Text="编辑" Icon="Pencil">
@@ -546,6 +600,15 @@
                 Icon="Delete" Text="删除">
             </f:MenuButton>
         </f:Menu>
+        <f:Menu ID="MenuContract" runat="server">
+            <f:MenuButton ID="btnContractEdit" OnClick="btnContractEdit_Click" EnablePostBack="true"
+                runat="server" Text="编辑" Icon="Pencil">
+            </f:MenuButton>
+            <f:MenuButton ID="btnContractDelete" OnClick="btnContractDelete_Click" EnablePostBack="true"
+                ConfirmText="确定删除选中行？" ConfirmTarget="Parent" runat="server"
+                Icon="Delete" Text="删除">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/jscript">
         var menuIDCertificate = '<%= MenuCertificate.ClientID %>';
@@ -561,6 +624,13 @@
             F(menuIDInOut).show();  //showAt(event.pageX, event.pageY);
             return false;
         }
+
+        var menuIDContract = '<%= MenuContract.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenuContract(event, rowId) {
+            F(menuIDContract).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
         function reloadGrid() {
             __doPostBack(null, 'reloadGrid');
         }
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
index e6f2bc48..01c2bffc 100644
--- a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
@@ -89,6 +89,7 @@ namespace FineUIPro.Web.Person
                 getInitGridCertificate();
                 getInitGridTestRecord();
                 getInitGridInOut();
+                getInitGridContract();
             }
         }
 
@@ -1109,5 +1110,137 @@ namespace FineUIPro.Web.Person
         }
         #endregion
         #endregion
+
+        #region 合同信息
+        /// <summary>
+        /// 
+        /// </summary>
+        private void getInitGridContract()
+        {
+            Funs.DropDownPageSize(this.ddlPageSizeGridContract);
+            this.btnContractNew.OnClientClick = Window1.GetShowReference("PersonContractEdit.aspx?PersonId=" + this.PersonId) + "return false;";
+            BindGridContract();
+        }
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGridContract()
+        {
+            var getData = Person_PersonContractService.getListData(this.PersonId, GridContract);
+            GridContract.RecordCount = Person_PersonContractService.count;
+            GridContract.DataSource = getData;
+            GridContract.DataBind();
+        }
+        #endregion
+
+        #region 分页
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridContract_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGridContract();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSizeGridContract_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridContract.PageSize = Convert.ToInt32(ddlPageSizeGridContract.SelectedValue);
+            BindGridContract();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridContract_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            BindGridContract();
+        }
+        #endregion
+
+        #region 数据操作事件
+        /// <summary>
+        /// 双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridContract_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditDataContract();
+        }
+        protected void btnContractEdit_Click(object sender, EventArgs e)
+        {
+            this.EditDataContract();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditDataContract()
+        {
+            if (GridContract.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PersonContractEdit.aspx?PersonContractId={0}", GridContract.SelectedRowID, "编辑 - ")));
+        }
+
+        /// <summary>
+        /// 删除合同信息
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnContractDelete_Click(object sender, EventArgs e)
+        {
+            if (GridContract.SelectedRowIndexArray.Length > 0)
+            {
+                Person_PersonContractService.DeleteData(GridContract.SelectedRowID);
+                BindGridContract();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+        #endregion
+
+        #region 获取合同有效期
+        /// <summary>
+        /// 获取合同有效期
+        /// </summary>
+        /// <param name="personContractId"></param>
+        /// <returns></returns>
+        protected string GetContractType(object personContractId)
+        {
+            string returnValue = string.Empty;
+            if (personContractId != null)
+            {
+                var getC = Funs.DB.Person_PersonContract.FirstOrDefault(x => x.PersonContractId == personContractId.ToString());
+                if (getC != null)
+                {
+                    returnValue = DropListService.getContractTypeNameByValue(getC.ContractType);
+                    if (getC.ContractType == "1")
+                    {
+                        string startDateStr = string.Format("{0:yyyy-MM-dd}", getC.StartDate);
+                        string endDateStr = string.Format("{0:yyyy-MM-dd}", getC.EndDate);
+                        returnValue += "(自" + startDateStr + "起至" + endDateStr + "止）";
+                    }
+                }
+            }
+            return returnValue;
+        }
+        #endregion
+        #endregion
+
+
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.designer.cs
index 08c2ef85..bef77a06 100644
--- a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.designer.cs
@@ -699,13 +699,94 @@ namespace FineUIPro.Web.Person
         protected global::FineUIPro.DropDownList ddlPageSizeGridCertificate;
 
         /// <summary>
-        /// Tab3 控件。
+        /// TabContract 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Tab Tab3;
+        protected global::FineUIPro.Tab TabContract;
+
+        /// <summary>
+        /// GridContract 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GridContract;
+
+        /// <summary>
+        /// Toolbar5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar5;
+
+        /// <summary>
+        /// btnContractNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnContractNew;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label3;
+
+        /// <summary>
+        /// ToolbarSeparator4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator4;
+
+        /// <summary>
+        /// ToolbarText4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText4;
+
+        /// <summary>
+        /// ddlPageSizeGridContract 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSizeGridContract;
 
         /// <summary>
         /// Tab4 控件。
@@ -904,5 +985,32 @@ namespace FineUIPro.Web.Person
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnInOutDelete;
+
+        /// <summary>
+        /// MenuContract 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu MenuContract;
+
+        /// <summary>
+        /// btnContractEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnContractEdit;
+
+        /// <summary>
+        /// btnContractDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnContractDelete;
     }
 }
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonView.aspx b/SGGL/FineUIPro.Web/Person/ProjectPersonView.aspx
new file mode 100644
index 00000000..3bd78dc7
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Person/ProjectPersonView.aspx
@@ -0,0 +1,553 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectPersonView.aspx.cs" Inherits="FineUIPro.Web.Person.ProjectPersonView" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>项目人员</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        body.f-body {
+            overflow-x: hidden;
+        }
+
+        .myblockform .f-panel-body .f-field {
+            margin: 0;
+        }
+
+        .userphoto .f-field-label {
+            margin-top: 0;
+        }
+
+        .userphoto img {
+            width: auto;
+            height: 115px;
+        }
+
+        .uploadbutton .f-btn {
+            width: 100%;
+        }
+
+        .lable-red {
+            font-weight: bold;
+            color: red;
+        }
+    </style>
+</head>
+<body class="f-body-bgcolor">
+    <form id="_form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" />
+        <f:Panel IsFluid="true" runat="server" ID="panel1" AutoScroll="true"
+            Layout="Block" BlockConfigSpace="5px" ShowBorder="false" ShowHeader="false">          
+            <Items>
+                <f:Panel runat="server" BlockMD="12"
+                    Layout="Block" BlockConfigSpace="20px" ShowBorder="false" ShowHeader="false">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Center" runat="server">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" EnableEdit="true" ForceSelection="false"
+                                    Required="true" ShowRedStar="true" Readonly="true" LabelWidth="60px" Width="650px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="drpProject_SelectedIndexChanged">
+                                </f:DropDownList>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Label runat="server" ID="lbStates" Label="人员状态" CssClass="lable-red"></f:Label>
+                                <f:HiddenField runat="server" ID="hdStates"></f:HiddenField>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Items>
+                        <f:Panel CssClass="blockpanel" BlockMD="8"
+                            runat="server" ShowBorder="true" ShowHeader="false" Title="基本信息">
+                            <Items>
+                                <f:Form ID="SimpleForm1" ShowBorder="true" ShowHeader="false" AutoScroll="true" LabelWidth="90px"
+                                    BodyPadding="10px" runat="server" LabelAlign="Right">
+                                    <Rows>
+                                        <f:FormRow>
+                                            <Items>
+                                                <f:TextBox ID="txtPersonName" runat="server" Label=" 姓名" MaxLength="200"
+                                                    Required="True" ShowRedStar="True">
+                                                </f:TextBox>
+                                                <f:DropDownList ID="drpUnit" runat="server" Label="单位" EnableEdit="true" ForceSelection="false"
+                                                    AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged"
+                                                    Required="true" ShowRedStar="true">
+                                                </f:DropDownList>
+                                            </Items>
+                                        </f:FormRow>
+                                        <f:FormRow>
+                                            <Items>
+                                                <f:DropDownList ID="drpIdcardType" runat="server" Label="证件类型"
+                                                    Required="True" ShowRedStar="True" EnableEdit="true">
+                                                </f:DropDownList>
+                                                <f:TextBox ID="txtIdentityCard" runat="server" Label="证件号码"
+                                                    Required="true" ShowRedStar="true">
+                                                </f:TextBox>
+                                            </Items>
+                                        </f:FormRow>
+                                        <f:FormRow ColumnWidths="50% 25% 25%">
+                                            <Items>
+                                                <f:TextBox ID="txtIdcardAddress" runat="server" Label="发证机关" MaxLength="50">
+                                                </f:TextBox>
+                                                <f:RadioButtonList ID="rblIdcardForever" runat="server" Label="永久证件"
+                                                    AutoPostBack="true">
+                                                    <f:RadioItem Value="Y" Text="是" />
+                                                    <f:RadioItem Value="N" Text="否" Selected="true" />
+                                                </f:RadioButtonList>
+                                                <f:CheckBox runat="server" ID="ckIsForeign" Label="外籍"></f:CheckBox>
+                                            </Items>
+                                        </f:FormRow>
+                                        <f:FormRow ColumnWidths="30% 20% 50%">
+                                            <Items>
+                                                <f:DatePicker ID="txtIdcardStartDate" runat="server" Label="证件有效期">
+                                                </f:DatePicker>
+                                                <f:DatePicker ID="txtIdcardEndDate" runat="server" ShowEmptyLabel="false">
+                                                </f:DatePicker>
+                                                <f:TextBox ID="txtTelephone" runat="server" Label="联系电话" MaxLength="50">
+                                                </f:TextBox>
+                                            </Items>
+                                        </f:FormRow>
+                                        <f:FormRow>
+                                            <Items>
+                                                <f:TextBox ID="txtCardNo" runat="server" Label="卡号" MaxLength="50">
+                                                </f:TextBox>
+                                                <f:TextBox ID="txtAccount" runat="server" Label="账号">
+                                                </f:TextBox>
+                                            </Items>
+                                        </f:FormRow>
+                                        <f:FormRow runat="server" ID="trRole">
+                                            <Items>
+                                                <f:DropDownList ID="drpProjectWorkPost" runat="server" Label="项目岗位" EnableEdit="true" Required="true" ShowRedStar="true">
+                                                </f:DropDownList>
+                                                <f:DropDownList ID="drpProjectRole" runat="server" Label="项目角色" EnableEdit="true"
+                                                    EnableMultiSelect="true" EnableCheckBoxSelect="true" ForceSelection="false" MaxLength="200">
+                                                </f:DropDownList>
+                                            </Items>
+                                        </f:FormRow>
+
+                                        <f:FormRow>
+                                            <Items>
+                                                <f:DropDownList ID="drpTeamGroup" runat="server" Label="班组" EnableEdit="true"
+                                                    Required="true" ShowRedStar="true">
+                                                </f:DropDownList>
+                                                <f:DropDownBox runat="server" Label="单位工程" ID="txtWorkArea" EnableMultiSelect="true" MatchFieldWidth="true">
+                                                    <PopPanel>
+                                                        <f:Grid ID="gvWorkArea" DataIDField="UnitWorkId"
+                                                            EnableMultiSelect="true" KeepCurrentSelection="true" Height="300px" Hidden="true"
+                                                            SortField="UnitWorkId" DataTextField="UnitWorkName"
+                                                            ShowBorder="true" ShowHeader="false" ForceFit="true"
+                                                            runat="server" EnableCheckBoxSelect="true">
+                                                            <Columns>
+                                                                <f:BoundField DataField="UnitWorkId" SortField="UnitWorkId" DataFormatString="{0}" Hidden="true" />
+                                                                <f:BoundField DataField="UnitWorkName" SortField="UnitWorkName" DataFormatString="{0}" HeaderText="单位工程名称" />
+                                                            </Columns>
+                                                        </f:Grid>
+                                                    </PopPanel>
+                                                </f:DropDownBox>
+                                            </Items>
+                                        </f:FormRow>
+                                        <f:FormRow>
+                                            <Items>
+                                                <f:DatePicker ID="txtInTime" runat="server" Label="入场时间" ShowRedStar="true" Required="true">
+                                                </f:DatePicker>
+                                                <f:RadioButtonList ID="rbPersonType" runat="server" Label="人员类型">
+                                                </f:RadioButtonList>
+                                            </Items>
+                                        </f:FormRow>
+                                        <f:FormRow>
+                                            <Items>
+                                                <f:DropDownList ID="drpAuditor" runat="server" Label="审核人" EnableEdit="true"
+                                                    ShowRedStar="true">
+                                                </f:DropDownList>
+                                                <f:DatePicker ID="txtAuditorDate" runat="server" Label="审核时间" Readonly="true">
+                                                </f:DatePicker>
+                                            </Items>
+                                        </f:FormRow>
+                                        <f:FormRow>
+                                            <Items>
+                                                <f:DatePicker ID="txtOutTime" runat="server" Label="出场时间">
+                                                </f:DatePicker>
+                                                <f:TextBox ID="txtOutResult" runat="server" Label="出场原因">
+                                                </f:TextBox>
+                                            </Items>
+                                        </f:FormRow>
+                                    </Rows>
+                                </f:Form>
+                            </Items>
+                        </f:Panel>
+                        <f:Panel CssClass="blockpanel" BlockMD="2" TitleAlign="Center"
+                            runat="server" ShowBorder="true" ShowHeader="true" Title="照片">
+                            <Items>
+                                <f:Panel CssClass="blockpanel" BlockMD="6" Height="190px"
+                                    runat="server" ShowBorder="true" ShowHeader="false">
+                                    <Items>
+                                        <f:Image ID="imgPhoto" CssClass="userphoto" ImageUrl="~/res/images/blank.png"
+                                            runat="server" ToolTip="要求：小于300K且清晰大头照！且必传！">
+                                        </f:Image>
+                                    </Items>
+                                </f:Panel>
+                                <f:Panel CssClass="blockpanel" BlockMD="6" Height="190px"
+                                    runat="server" ShowBorder="true" ShowHeader="false">
+                                    <Items>
+                                        <f:Image ID="imgQR" CssClass="userphoto" ImageUrl="~/images/QRimage.png"
+                                            runat="server">
+                                        </f:Image>
+                                    </Items>
+                                </f:Panel>
+                            </Items>
+                        </f:Panel>
+                        <f:Panel CssClass="blockpanel" BlockMD="2" Title="身份证" TitleAlign="Center"
+                            runat="server" ShowBorder="true" ShowHeader="true">
+                            <Items>
+                                <f:Panel CssClass="blockpanel" BlockMD="6" Height="190px"
+                                    runat="server" ShowBorder="true" ShowHeader="false">
+                                    <Items>
+                                        <f:Image ID="imgIDCard" CssClass="userphoto" ImageUrl="~/res/images/idcard.png"
+                                            runat="server">
+                                        </f:Image>
+                                    </Items>
+                                </f:Panel>
+                                <f:Panel CssClass="blockpanel" BlockMD="6" Height="190px"
+                                    runat="server" ShowBorder="true" ShowHeader="false" Title="反面">
+                                    <Items>
+                                        <f:Image ID="imgIDCardBack" CssClass="userphoto" ImageUrl="~/res/images/idcard.png"
+                                            runat="server">
+                                        </f:Image>
+                                    </Items>
+                                </f:Panel>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:Panel>
+                <f:Panel CssClass="blockpanel" Block="12" EnableCollapse="true"
+                    runat="server" ShowBorder="true" ShowHeader="true" Title="详细信息">
+                    <Items>
+                        <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="400px" ShowBorder="true"
+                            TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
+                            <Tabs>
+                                <f:Tab ID="Tab1" Title="详细信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
+                                    <Items>
+                                        <f:Form ID="SimpleForm2" ShowBorder="true" ShowHeader="false" AutoScroll="true" LabelWidth="110px"
+                                            BodyPadding="10px" runat="server" LabelAlign="Right">
+                                            <Rows>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:DatePicker ID="txtBirthday" runat="server" Label="出生日期">
+                                                        </f:DatePicker>
+                                                        <f:NumberBox ID="txtAge" runat="server" Label="年龄">
+                                                        </f:NumberBox>
+                                                        <f:RadioButtonList ID="rblSex" runat="server" Label="性别">
+                                                            <f:RadioItem Value="1" Text="男" Selected="true" />
+                                                            <f:RadioItem Value="2" Text="女" />
+                                                        </f:RadioButtonList>
+                                                        <f:TextBox ID="txtRealNameTime" runat="server" Label="同步集团时间" Readonly="true">
+                                                        </f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:DropDownList ID="drpNation" runat="server" Label="民族" EnableEdit="true">
+                                                        </f:DropDownList>
+                                                        <f:DropDownList ID="drpPoliticsStatus" runat="server" Label="政治面貌" EnableEdit="true">
+                                                        </f:DropDownList>
+                                                        <f:DropDownList ID="drpEduLevel" runat="server" Label="文化程度" EnableEdit="true">
+                                                        </f:DropDownList>
+                                                        <f:DropDownList ID="drpMaritalStatus" runat="server" Label="婚姻状况" EnableEdit="true">
+                                                        </f:DropDownList>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:DropDownList ID="drpPosition" runat="server" Label="职务" EnableEdit="true">
+                                                        </f:DropDownList>
+                                                        <f:DropDownList ID="drpPostTitle" runat="server" Label="职称" LabelAlign="Right" EnableEdit="true">
+                                                        </f:DropDownList>
+                                                        <f:DatePicker ID="txtPostTitleDate" runat="server" Label="职称取得时间">
+                                                        </f:DatePicker>
+                                                        <f:TextBox ID="txtGraduate" runat="server" Label="毕业院校" MaxLength="50">
+                                                        </f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:TextBox ID="txtMajor" runat="server" Label="所学专业" MaxLength="50">
+                                                        </f:TextBox>
+                                                        <f:TextBox ID="txtForeignLanguage" runat="server" Label="外语能力" MaxLength="50">
+                                                        </f:TextBox>
+                                                        <f:DropDownList ID="drpCountryCode" runat="server" Label="籍贯"
+                                                            ShowEmptyLabel="true" EmptyText="国家"
+                                                            EnableEdit="true" AutoPostBack="true">
+                                                        </f:DropDownList>
+                                                        <f:DropDownList ID="drpProvinceCode" runat="server" EnableEdit="true"
+                                                            ShowEmptyLabel="true" EmptyText="省/地区">
+                                                        </f:DropDownList>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow ColumnWidths="25% 25% 50%">
+                                                    <Items>
+                                                        <f:TextBox ID="txtRelativeName" runat="server" Label="亲属姓名" MaxLength="50">
+                                                        </f:TextBox>
+                                                        <f:TextBox ID="txtRelativeTel" runat="server" Label="亲属电话" MaxLength="50">
+                                                        </f:TextBox>
+                                                        <f:TextBox ID="txtAddress" runat="server" Label="家庭地址" MaxLength="500">
+                                                        </f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                            </Rows>
+                                        </f:Form>
+                                    </Items>
+                                </f:Tab>
+                                <f:Tab ID="TabCertificate" Title="证书信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
+                                    <Items>
+                                        <f:Grid ID="GridCertificate" ShowBorder="true" ShowHeader="false" Title="证书信息"
+                                            runat="server" DataKeyNames="PersonQualityId" DataIDField="PersonQualityId" AllowSorting="true"
+                                            SortField="SendDate" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
+                                            SortDirection="DESC" OnSort="GridCertificate_Sort" AllowPaging="true" IsDatabasePaging="true"
+                                            OnPageIndexChange="GridCertificate_PageIndexChange" EnableTextSelection="True"
+                                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="GridCertificate_RowDoubleClick">                                           
+                                            <Columns>
+                                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                    TextAlign="Center" />
+                                                <f:RenderField Width="150px" ColumnID="CertificateName" DataField="CertificateName"
+                                                    FieldType="String" HeaderText="证书名称" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="120px" ColumnID="CertificateNo" DataField="CertificateNo"
+                                                    FieldType="String" HeaderText="证书编号" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="200px" ColumnID="SendUnit" DataField="SendUnit"
+                                                    FieldType="String" HeaderText="发证单位" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="SendDate" DataField="SendDate"
+                                                    FieldType="Date" RendererArgument="yyyy-MM-dd" HeaderText="发证时间" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="RegisterDate" DataField="RegisterDate"
+                                                    FieldType="Date" RendererArgument="yyyy-MM-dd" HeaderText="注册时间" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="Major" DataField="Major"
+                                                    FieldType="String" HeaderText="专业" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="LimitDate" DataField="LimitDate"
+                                                    FieldType="Date" RendererArgument="yyyy-MM-dd" HeaderText="有效期至" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                            </Columns>
+                                            <Listeners>
+                                                <f:Listener Event="beforerowcontextmenuCertificate" Handler="onRowContextMenuCertificate" />
+                                            </Listeners>
+                                            <PageItems>
+                                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                                </f:ToolbarSeparator>
+                                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                                </f:ToolbarText>
+                                                <f:DropDownList runat="server" ID="ddlPageSizeGridCertificate" Width="80px" AutoPostBack="true"
+                                                    OnSelectedIndexChanged="ddlPageSizeGridCertificate_SelectedIndexChanged">
+                                                </f:DropDownList>
+                                            </PageItems>
+                                        </f:Grid>
+                                    </Items>
+                                </f:Tab>
+                                <f:Tab ID="TabContract" Title="合同信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
+                                    <Items>
+                                        <f:Grid ID="GridContract" ShowBorder="true" ShowHeader="false" Title="合同信息"
+                                            runat="server" DataKeyNames="PersonContractId" DataIDField="PersonContractId" AllowSorting="true"
+                                            SortField="StartDate" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
+                                            SortDirection="DESC" OnSort="GridContract_Sort" AllowPaging="true" IsDatabasePaging="true"
+                                            OnPageIndexChange="GridContract_PageIndexChange" EnableTextSelection="True"
+                                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="GridContract_RowDoubleClick">                                       
+                                            <Columns>
+                                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                    TextAlign="Center" />
+                                                 <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName"
+                                                    FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="150px" ColumnID="UnitName" DataField="UnitName"
+                                                    FieldType="String" HeaderText="甲方(单位名称)" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:TemplateField Width="100px" HeaderText="负责人姓名" HeaderTextAlign="Center" TextAlign="Center">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="Label1" runat="server" Text='<%# GetPersonNameByPersonId(Eval("LeadManId")) %>'></asp:Label>
+                                                    </ItemTemplate>
+                                                </f:TemplateField>
+                                                <f:RenderField Width="100px" ColumnID="Telephone" DataField="Telephone"
+                                                    FieldType="String" HeaderText="联系电话" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:TemplateField Width="110px" HeaderText="乙方（劳动者姓名）" HeaderTextAlign="Center" TextAlign="Center">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="Label2" runat="server" Text='<%# GetPersonNameByPersonId(Eval("PersonId")) %>'></asp:Label>
+                                                    </ItemTemplate>
+                                                </f:TemplateField>
+                                                <f:TemplateField Width="230px" HeaderText="合同有效期" HeaderTextAlign="Center" TextAlign="Center">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="Label3" runat="server" Text='<%# GetContractType(Eval("PersonContractId")) %>'></asp:Label>
+                                                    </ItemTemplate>
+                                                </f:TemplateField>
+                                            </Columns>
+                                            <Listeners>
+                                                <f:Listener Event="beforerowcontextmenuContract" Handler="onRowContextMenuContract" />
+                                            </Listeners>
+                                            <PageItems>
+                                                <f:ToolbarSeparator ID="ToolbarSeparator4" runat="server">
+                                                </f:ToolbarSeparator>
+                                                <f:ToolbarText ID="ToolbarText4" runat="server" Text="每页记录数：">
+                                                </f:ToolbarText>
+                                                <f:DropDownList runat="server" ID="ddlPageSizeGridContract" Width="80px" AutoPostBack="true"
+                                                    OnSelectedIndexChanged="ddlPageSizeGridContract_SelectedIndexChanged">
+                                                </f:DropDownList>
+                                            </PageItems>
+                                        </f:Grid>
+                                    </Items>
+                                </f:Tab>
+                                <f:Tab ID="Tab4" Title="考勤信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
+                                    <Items>
+                                    </Items>
+                                </f:Tab>
+                                <f:Tab ID="Tab5" Title="工资信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
+                                    <Items>
+                                    </Items>
+                                </f:Tab>
+                                <f:Tab ID="Tab6" Title="培训信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
+                                    <Items>
+                                        <f:Grid ID="GridTestRecord" ShowBorder="true" ShowHeader="false" Title="培训信息"
+                                            runat="server" DataKeyNames="TestRecordId" DataIDField="TestRecordId" AllowSorting="true"
+                                            SortField="TestStartTime" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
+                                            SortDirection="DESC" OnSort="GridTestRecord_Sort" AllowPaging="true" IsDatabasePaging="true"
+                                            OnPageIndexChange="GridTestRecord_PageIndexChange" EnableTextSelection="True">
+                                            <Columns>
+                                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                    TextAlign="Center" />
+                                                <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName"
+                                                    FieldType="String" HeaderText="项目" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="TrainTypeName" DataField="TrainTypeName"
+                                                    FieldType="String" HeaderText="培训类型" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="150px" ColumnID="TrainStartDate" DataField="TrainStartDate"
+                                                    FieldType="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" HeaderText="培训时间" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="150px" ColumnID="PlanName" DataField="PlanName"
+                                                    FieldType="String" HeaderText="考试名称" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="160px" ColumnID="TestPalce" DataField="TestPalce"
+                                                    FieldType="String" HeaderText="考试地点" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="150px" ColumnID="TestStartTime" DataField="TestStartTime"
+                                                    FieldType="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" HeaderText="考试时间" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="80px" ColumnID="TestScores" DataField="TestScores"
+                                                    FieldType="Double" HeaderText="成绩" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                            </Columns>
+                                            <PageItems>
+                                                <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
+                                                </f:ToolbarSeparator>
+                                                <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
+                                                </f:ToolbarText>
+                                                <f:DropDownList runat="server" ID="ddlPageSizeGridTestRecord" Width="80px" AutoPostBack="true"
+                                                    OnSelectedIndexChanged="ddlPageSizeGridTestRecord_SelectedIndexChanged">
+                                                </f:DropDownList>
+                                            </PageItems>
+                                        </f:Grid>
+                                    </Items>
+                                </f:Tab>
+                                <f:Tab ID="Tab7" Title="违章信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
+                                    <Items>
+                                    </Items>
+                                </f:Tab>
+                                <f:Tab ID="InOut" Title="工作经历" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
+                                    <Items>
+                                        <f:Grid ID="GridInOut" ShowBorder="true" ShowHeader="false" Title="工作经历"
+                                            runat="server" DataKeyNames="PersonItemId" DataIDField="PersonItemId" AllowSorting="true"
+                                            SortField="InTime" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
+                                            SortDirection="DESC" OnSort="GridInOut_Sort" AllowPaging="true" IsDatabasePaging="true"
+                                            OnPageIndexChange="GridInOut_PageIndexChange" EnableTextSelection="True"
+                                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="GridInOut_RowDoubleClick">                                           
+                                            <Columns>
+                                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                    TextAlign="Center" />
+                                                <f:RenderField Width="230px" ColumnID="UnitName" DataField="UnitName"
+                                                    FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="250px" ColumnID="ProjectName" DataField="ProjectName"
+                                                    FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="WorkPostName" DataField="WorkPostName"
+                                                    FieldType="String" HeaderText="岗位/工种" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="150px" ColumnID="TeamGroupName" DataField="TeamGroupName"
+                                                    FieldType="String" HeaderText="班组名称" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="120px" ColumnID="InTime" DataField="InTime"
+                                                    FieldType="Date" Renderer="Date" HeaderText="进场时间" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="120px" ColumnID="OutTime" DataField="OutTime"
+                                                    FieldType="Date" Renderer="Date" HeaderText="退场时间" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="150px" ColumnID="OutResult" DataField="OutResult"
+                                                    FieldType="String" HeaderText="退场原因" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                            </Columns>
+                                            <Listeners>
+                                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenuInOut" />
+                                            </Listeners>
+                                            <PageItems>
+                                                <f:ToolbarSeparator ID="ToolbarSeparator3" runat="server">
+                                                </f:ToolbarSeparator>
+                                                <f:ToolbarText ID="ToolbarText3" runat="server" Text="每页记录数：">
+                                                </f:ToolbarText>
+                                                <f:DropDownList runat="server" ID="ddlPageSizeGridInOut" Width="80px" AutoPostBack="true"
+                                                    OnSelectedIndexChanged="ddlPageSizeGridInOut_SelectedIndexChanged">
+                                                </f:DropDownList>
+                                            </PageItems>
+                                        </f:Grid>
+                                    </Items>
+                                </f:Tab>
+                            </Tabs>
+                        </f:TabStrip>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="查看信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
+            Height="600px">
+        </f:Window>
+        <f:Menu ID="MenuCertificate" runat="server">
+            <f:MenuButton ID="btnCertificateEdit" OnClick="btnCertificateEdit_Click" EnablePostBack="true"
+                runat="server" Text="查看" Icon="Find">
+            </f:MenuButton>         
+        </f:Menu>
+        <f:Menu ID="MenuInOut" runat="server">
+            <f:MenuButton ID="btnInOutEdit" OnClick="btnInOutEdit_Click" EnablePostBack="true"
+                runat="server" Text="查看" Icon="Find">
+            </f:MenuButton>
+        </f:Menu>
+        <f:Menu ID="MenuContract" runat="server">
+            <f:MenuButton ID="btnContractEdit" OnClick="btnContractEdit_Click" EnablePostBack="true"
+                runat="server" Text="查看" Icon="Find">
+            </f:MenuButton>
+        </f:Menu>
+    </form>
+    <script type="text/jscript">
+        var menuIDCertificate = '<%= MenuCertificate.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenuCertificate(event, rowId) {
+            F(menuIDCertificate).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        var menuIDInOut = '<%= MenuInOut.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenuInOut(event, rowId) {
+            F(menuIDInOut).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        var menuIDContract = '<%= MenuContract.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenuContract(event, rowId) {
+            F(menuIDContract).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonView.aspx.cs b/SGGL/FineUIPro.Web/Person/ProjectPersonView.aspx.cs
new file mode 100644
index 00000000..ae4359d2
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Person/ProjectPersonView.aspx.cs
@@ -0,0 +1,704 @@
+using BLL;
+using FastReport.Editor.Syntax;
+using Newtonsoft.Json.Linq;
+using System;
+using System.IO;
+using System.Linq;
+
+namespace FineUIPro.Web.Person
+{
+    public partial class ProjectPersonView : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 人员主键
+        /// </summary>
+        public string PersonId
+        {
+            get
+            {
+                return (string)ViewState["PersonId"];
+            }
+            set
+            {
+                ViewState["PersonId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 项目人员ID
+        /// </summary>
+        public string SitePersonId
+        {
+            get
+            {
+                return (string)ViewState["SitePersonId"];
+            }
+            set
+            {
+                ViewState["SitePersonId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                ProjectService.InitProjectDropDownList(this.drpProject, true);
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
+                }
+                else if (!string.IsNullOrEmpty(Request.Params["ProjectId"]))
+                {
+                    this.drpProject.SelectedValue = Request.Params["ProjectId"];
+                }
+
+                this.SitePersonId = Request.Params["SitePersonId"];
+                this.InitDropDownList();
+                if (!string.IsNullOrEmpty(this.SitePersonId))
+                {
+                    SetProjectPerson();
+                    SetPersonInfoByIdCard(this.txtIdentityCard.Text.Trim());
+                }
+                else
+                {
+                    this.InitDropDownListProject();
+                    this.txtIdentityCard.Focus();
+                }
+
+                if (string.IsNullOrEmpty(this.drpProject.SelectedValue) || this.drpProject.SelectedValue == Const._Null)
+                {
+                    this.drpProject.Readonly = false;
+                    Alert.ShowInParent("请先选择项目！", MessageBoxIcon.Warning);
+                }
+          
+                getInitGridCertificate();
+                getInitGridTestRecord();
+                getInitGridInOut();
+                getInitGridContract();
+            }
+        }
+        #endregion
+
+        #region 根据身份证号码获取人员信息
+        /// <summary>
+        /// 根据身份证号码获取人员信息
+        /// </summary>
+        private void SetPersonInfoByIdCard(string idCard)
+        {
+            if (!string.IsNullOrEmpty(idCard))
+            {
+                var person = BLL.Person_PersonsService.GetPerson_PersonsByIdCard(idCard);
+                if (person != null)
+                {
+                    this.PersonId = person.PersonId;
+                    this.drpUnit.Readonly = true;
+                    if (person.IsCardNoOK == true)
+                    {
+                        this.txtIdentityCard.Readonly = true;
+                    }
+                    #region 基本信息
+                    this.txtPersonName.Text = person.PersonName;
+                    this.drpUnit.SelectedValue = person.UnitId;
+                    if (string.IsNullOrEmpty(this.drpUnit.SelectedValue))
+                    {
+                        string name = UnitService.GetUnitNameByUnitId(person.UnitId);
+                        Alert.ShowInParent("当前人员所属单位【" + name + "】不在该项目单位中，请查证！", MessageBoxIcon.Warning);
+                    }
+                    this.txtAccount.Text = person.Account;
+                    if (person.IsForeign.HasValue)
+                    {
+                        this.ckIsForeign.Checked = person.IsForeign.Value;
+                    }
+                    this.rbPersonType.SelectedValue = person.PersonType;
+                    if (!string.IsNullOrEmpty(person.IdcardType))
+                    {
+                        this.drpIdcardType.SelectedValue = person.IdcardType;
+                    }
+                    this.txtIdentityCard.Text = person.IdentityCard;
+                    this.txtIdcardAddress.Text = person.IdcardAddress;
+                    if (!string.IsNullOrEmpty(person.IdcardForever))
+                    {
+                        this.rblIdcardForever.SelectedValue = person.IdcardForever;
+                        if (person.IdcardForever == "Y")
+                        {
+                            this.txtIdcardEndDate.ShowRedStar = false;
+                            this.txtIdcardEndDate.Required = false;
+                        }
+                    }
+                    this.txtIdcardStartDate.Text = string.Format("{0:yyyy-MM-dd}", person.IdcardStartDate);
+                    this.txtIdcardEndDate.Text = string.Format("{0:yyyy-MM-dd}", person.IdcardEndDate);
+                    if (!string.IsNullOrEmpty(person.Sex))
+                    {
+                        this.rblSex.SelectedValue = person.Sex;
+                    }
+                    if (person.Birthday.HasValue)
+                    {
+                        this.txtBirthday.Text = string.Format("{0:yyyy-MM-dd}", person.Birthday);
+                        this.txtAge.Text = IDCardValid.CalculateAgeCorrect(person.Birthday.Value).ToString();
+                    }
+                    this.txtTelephone.Text = person.Telephone;
+                    if (!string.IsNullOrEmpty(person.PhotoUrl))
+                    {
+                        imgPhoto.ImageUrl = ("~/" + person.PhotoUrl);
+                    }
+                    if (!string.IsNullOrEmpty(person.QRCodeAttachUrl))
+                    {
+                        imgQR.ImageUrl = ("~/" + person.QRCodeAttachUrl);
+                    }
+                    if (!string.IsNullOrEmpty(person.IDCardUrl))
+                    {
+                        imgIDCard.ImageUrl = ("~/" + person.IDCardUrl);
+                    }
+                    if (!string.IsNullOrEmpty(person.IDCardBackUrl))
+                    {
+                        imgIDCardBack.ImageUrl = ("~/" + person.IDCardBackUrl);
+                    }
+                    #endregion
+
+                    #region 详细信息                       
+                    this.txtMajor.Text = person.Major;
+                    this.txtForeignLanguage.Text = person.ForeignLanguage;
+                    if (!string.IsNullOrEmpty(person.CountryCode))
+                    {
+                        this.drpCountryCode.SelectedValue = person.CountryCode;
+                        CityService.InitCityDropDownList(this.drpProvinceCode, person.CountryCode, false);
+                    }
+                    if (!string.IsNullOrEmpty(person.ProvinceCode))
+                    {
+                        this.drpProvinceCode.SelectedValue = person.ProvinceCode;
+                    }
+                    if (!string.IsNullOrEmpty(person.Nation))
+                    {
+                        this.drpNation.SelectedValue = person.Nation;
+                    }
+                    if (!string.IsNullOrEmpty(person.PoliticsStatus))
+                    {
+                        this.drpPoliticsStatus.SelectedValue = person.PoliticsStatus;
+                    }
+                    if (!string.IsNullOrEmpty(person.EduLevel))
+                    {
+                        this.drpEduLevel.SelectedValue = person.EduLevel;
+                    }
+                    if (!string.IsNullOrEmpty(person.MaritalStatus))
+                    {
+                        this.drpMaritalStatus.SelectedValue = person.MaritalStatus;
+                    }
+                    this.txtRelativeName.Text = person.RelativeName;
+                    this.txtRelativeTel.Text = person.RelativeTel;
+                    this.txtAddress.Text = person.Address;
+                    #endregion
+                }
+                else
+                {
+                    this.drpUnit.Readonly = false;
+                }
+            }
+        }
+        #endregion
+
+        #region 初始化项目人员信息
+        /// <summary>
+        ///  初始化项目人员信息
+        /// </summary>
+        private void SetProjectPerson()
+        {
+            var getProjectPerson = SitePerson_PersonService.GetSitePersonById(this.SitePersonId);
+            if (getProjectPerson != null)
+            {
+                this.txtIdentityCard.Text = getProjectPerson.IdentityCard;
+                if (!string.IsNullOrEmpty(getProjectPerson.PersonName))
+                {
+                    this.txtPersonName.Text = getProjectPerson.PersonName;
+                }
+                this.hdStates.Text = getProjectPerson.States;
+                this.lbStates.Text = GetProjectPersonStates(getProjectPerson.States);
+                          
+                this.drpProject.SelectedValue = getProjectPerson.ProjectId;
+                InitDropDownListProject();
+                this.drpUnit.SelectedValue = getProjectPerson.UnitId;
+                if (!string.IsNullOrEmpty(getProjectPerson.UnitId))
+                {
+                    TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, getProjectPerson.ProjectId, getProjectPerson.UnitId, false);
+                }
+                this.txtCardNo.Text = getProjectPerson.CardNo;
+                if (!string.IsNullOrEmpty(getProjectPerson.RoleIds))
+                {
+                    this.drpProjectRole.SelectedValueArray = getProjectPerson.RoleIds.Split(',');
+                }
+                this.drpAuditor.SelectedValue = getProjectPerson.AuditorId;
+                this.drpProjectWorkPost.SelectedValue = getProjectPerson.WorkPostId;
+                this.drpTeamGroup.SelectedValue = getProjectPerson.TeamGroupId;
+                if (!string.IsNullOrEmpty(getProjectPerson.WorkAreaId))
+                {
+                    this.txtWorkArea.Values = getProjectPerson.WorkAreaId.Split(',');
+                }
+                this.txtInTime.Text = string.Format("{0:yyyy-MM-dd}", getProjectPerson.InTime);
+                this.txtOutTime.Text = string.Format("{0:yyyy-MM-dd}", getProjectPerson.OutTime);
+                this.txtOutResult.Text = getProjectPerson.OutResult;
+                this.txtRealNameTime.Text = string.Format("{0:yyyy-MM-dd HH:mm:ss}", getProjectPerson.RealNameAddTime);
+                this.txtAuditorDate.Text = string.Format("{0:yyyy-MM-dd}", getProjectPerson.AuditorDate);
+            }
+            else
+            {
+                this.txtInTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+            }
+        }
+        #endregion
+
+        #region 下拉框事件
+        /// <summary>
+        ///  初始化下拉框
+        /// </summary>
+        private void InitDropDownList()
+        {
+            RoleService.InitRoleDropDownList(this.drpProjectRole, null, false, true);
+            WorkPostService.InitWorkPostDropDownList(this.drpProjectWorkPost, false);
+            BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpEduLevel, "EDU_LEVEL", true);
+            BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpMaritalStatus, "MARITAL_STATUS", true);
+            BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpIdcardType, "ZHENGJIAN_TYPE", false);
+            this.drpIdcardType.SelectedValue = "SHENFEN_ZHENGJIAN";
+            BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpPoliticsStatus, "POLITICAL_LANDSCAPE", true);
+            BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpNation, "MINZU_TYPE", true);
+            SynchroSetService.InitCountryDropDownList(this.drpCountryCode, false);
+            this.drpCountryCode.SelectedValue = "101";
+            CityService.InitCityDropDownList(this.drpProvinceCode, this.drpCountryCode.SelectedValue, true);
+            PositionService.InitPositionDropDownList(this.drpPosition, true);
+            PostTitleService.InitPostTitleDropDownList(this.drpPostTitle, true);
+            DropListService.InitConstRadioButtonList(this.rbPersonType, DropListService.Group_PersonType, "1");
+        }
+
+        /// <summary>
+        /// 初始化下拉框- 项目相关
+        /// </summary>
+        private void InitDropDownListProject()
+        {
+            UnitService.InitUnitDropDownList(this.drpUnit, this.drpProject.SelectedValue, false);
+            string UnitId = Request.Params["UnitId"];
+            if (!string.IsNullOrEmpty(UnitId))
+            {
+                this.drpUnit.SelectedValue = UnitId;
+                this.drpUnit.Readonly = true;
+            }
+            else
+            {
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId ?? Const.UnitId_SEDIN;
+            }
+            Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAuditor, this.drpProject.SelectedValue, Const.UnitId_SEDIN, BLL.Const.HSSEManager + "," + BLL.Const.HSSEAssistantManager, false);
+            TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, this.drpProject.SelectedValue, this.drpUnit.SelectedValue, false);
+            gvWorkArea.DataSource = UnitWorkService.GetUnitWorkLists(this.drpProject.SelectedValue);
+            gvWorkArea.DataBind();//单位工程 
+        }
+
+        #region 项目下拉框事件
+        /// <summary>
+        ///  项目下拉框事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpProject_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            InitDropDownListProject();
+        }
+        #endregion
+
+        #region 角色下拉框事件
+        /// <summary>
+        ///  角色下拉框事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpRole_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.drpProjectRole.SelectedItemArray.Count() > 4)
+            {
+                this.drpProjectRole.SelectedValueArray = null;
+                Alert.ShowInParent("最多可选择4个角色！", MessageBoxIcon.Warning);
+            }
+            else
+            {
+                this.drpProjectRole.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpProjectRole.SelectedValueArray);
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            //  this.trRole.Hidden = true;
+            if (this.drpUnit.SelectedValue == BLL.Const.UnitId_SEDIN)
+            {
+                //    this.trRole.Hidden = false;
+                this.txtIdentityCard.Required = false;
+                this.txtIdentityCard.ShowRedStar = false;
+            }
+            else
+            {
+                this.txtIdentityCard.Required = true;
+                this.txtIdentityCard.ShowRedStar = true;
+            }
+            TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, this.drpProject.SelectedValue, this.drpUnit.SelectedValue, false);
+        }
+        #endregion
+
+        #region 证书信息
+        /// <summary>
+        /// 
+        /// </summary>
+        private void getInitGridCertificate()
+        {
+            Funs.DropDownPageSize(this.ddlPageSizeGridCertificate);
+            BindGridCertificate();
+        }
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGridCertificate()
+        {
+            var getData = PersonQualityService.getListData(this.PersonId, GridCertificate);
+            GridCertificate.RecordCount = PersonQualityService.count;
+            GridCertificate.DataSource = getData;
+            GridCertificate.DataBind();
+        }
+        #endregion
+
+        #region 分页
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridCertificate_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGridCertificate();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSizeGridCertificate_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridCertificate.PageSize = Convert.ToInt32(ddlPageSizeGridCertificate.SelectedValue);
+            BindGridCertificate();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridCertificate_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            BindGridCertificate();
+        }
+        #endregion
+
+        #region 数据操作事件
+        /// <summary>
+        /// 双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridCertificate_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditDataCertificate();
+        }
+        protected void btnCertificateEdit_Click(object sender, EventArgs e)
+        {
+            this.EditDataCertificate();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditDataCertificate()
+        {
+            if (GridCertificate.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/QualityAudit/PersonQualityEdit.aspx?PersonQualityId={0}&value=0", GridCertificate.SelectedRowID, "编辑 - ")));
+        }
+        #endregion
+        #endregion
+
+        #region 人员培训考试记录
+        /// <summary>
+        /// 
+        /// </summary>
+        private void getInitGridTestRecord()
+        {
+            Funs.DropDownPageSize(this.ddlPageSizeGridTestRecord);
+            BindGridTestRecord();
+        }
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGridTestRecord()
+        {
+            var getData = TestRecordService.getListData(this.PersonId, GridTestRecord);
+            GridTestRecord.RecordCount = TestRecordService.count;
+            GridTestRecord.DataSource = getData;
+            GridTestRecord.DataBind();
+        }
+        #endregion
+
+        #region 分页
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridTestRecord_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGridTestRecord();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSizeGridTestRecord_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridTestRecord.PageSize = Convert.ToInt32(ddlPageSizeGridTestRecord.SelectedValue);
+            BindGridTestRecord();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridTestRecord_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            BindGridTestRecord();
+        }
+        #endregion
+
+        #endregion
+
+        #region 人员工作经历
+        /// <summary>
+        /// 
+        /// </summary>
+        private void getInitGridInOut()
+        {
+            Funs.DropDownPageSize(this.ddlPageSizeGridInOut);
+            BindGridInOut();
+        }
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGridInOut()
+        {
+            var getData = SitePerson_PersonItemService.getListData(null, null, this.PersonId, null, null, null, null, GridInOut);
+            GridInOut.RecordCount = Person_PersonsService.count;
+            GridInOut.DataSource = getData;
+            GridInOut.DataBind();
+        }
+        #endregion
+
+        #region 分页
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridInOut_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGridInOut();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSizeGridInOut_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridInOut.PageSize = Convert.ToInt32(ddlPageSizeGridInOut.SelectedValue);
+            BindGridInOut();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridInOut_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            BindGridInOut();
+        }
+        #endregion
+
+        #region 数据操作事件
+        /// <summary>
+        /// 双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridInOut_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditDataInOut();
+        }
+        protected void btnInOutEdit_Click(object sender, EventArgs e)
+        {
+            this.EditDataInOut();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditDataInOut()
+        {
+            if (GridInOut.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PersonItemEdit.aspx?PersonItemId={0}&value=0", GridInOut.SelectedRowID, "编辑 - ")));
+        }
+        #endregion
+        #endregion
+
+        #region 合同信息
+        /// <summary>
+        /// 
+        /// </summary>
+        private void getInitGridContract()
+        {
+            Funs.DropDownPageSize(this.ddlPageSizeGridContract);
+            BindGridContract();
+        }
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGridContract()
+        {
+            var getData = Person_PersonContractService.getListData(this.PersonId, GridContract);
+            GridContract.RecordCount = Person_PersonContractService.count;
+            GridContract.DataSource = getData;
+            GridContract.DataBind();
+        }
+        #endregion
+
+        #region 分页
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridContract_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGridContract();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSizeGridContract_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridContract.PageSize = Convert.ToInt32(ddlPageSizeGridContract.SelectedValue);
+            BindGridContract();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridContract_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            BindGridContract();
+        }
+        #endregion
+
+        #region 数据操作事件
+        /// <summary>
+        /// 双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridContract_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditDataContract();
+        }
+        protected void btnContractEdit_Click(object sender, EventArgs e)
+        {
+            this.EditDataContract();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditDataContract()
+        {
+            if (GridContract.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PersonContractEdit.aspx?PersonContractId={0}&value=0", GridContract.SelectedRowID, "编辑 - ")));
+        }
+        #endregion
+
+        #region 获取合同有效期
+        /// <summary>
+        /// 获取合同有效期
+        /// </summary>
+        /// <param name="personContractId"></param>
+        /// <returns></returns>
+        protected string GetContractType(object personContractId)
+        {
+            string returnValue = string.Empty;
+            if (personContractId != null)
+            {
+                var getC = Funs.DB.Person_PersonContract.FirstOrDefault(x => x.PersonContractId == personContractId.ToString());
+                if (getC != null)
+                {
+                    returnValue = DropListService.getContractTypeNameByValue(getC.ContractType);
+                    if (getC.ContractType == "1")
+                    {
+                        string startDateStr = string.Format("{0:yyyy-MM-dd}", getC.StartDate);
+                        string endDateStr = string.Format("{0:yyyy-MM-dd}", getC.EndDate);
+                        returnValue += "(自" + startDateStr + "起至" + endDateStr + "止）";
+                    }
+                }
+            }
+            return returnValue;
+        }
+        #endregion
+        #endregion
+
+
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonView.aspx.designer.cs b/SGGL/FineUIPro.Web/Person/ProjectPersonView.aspx.designer.cs
new file mode 100644
index 00000000..bcf1c8e2
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Person/ProjectPersonView.aspx.designer.cs
@@ -0,0 +1,836 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Person
+{
+
+
+    public partial class ProjectPersonView
+    {
+
+        /// <summary>
+        /// _form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm _form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panel1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// lbStates 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lbStates;
+
+        /// <summary>
+        /// hdStates 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdStates;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// txtPersonName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPersonName;
+
+        /// <summary>
+        /// drpUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnit;
+
+        /// <summary>
+        /// drpIdcardType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpIdcardType;
+
+        /// <summary>
+        /// txtIdentityCard 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIdentityCard;
+
+        /// <summary>
+        /// txtIdcardAddress 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIdcardAddress;
+
+        /// <summary>
+        /// rblIdcardForever 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIdcardForever;
+
+        /// <summary>
+        /// ckIsForeign 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckIsForeign;
+
+        /// <summary>
+        /// txtIdcardStartDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtIdcardStartDate;
+
+        /// <summary>
+        /// txtIdcardEndDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtIdcardEndDate;
+
+        /// <summary>
+        /// txtTelephone 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTelephone;
+
+        /// <summary>
+        /// txtCardNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCardNo;
+
+        /// <summary>
+        /// txtAccount 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtAccount;
+
+        /// <summary>
+        /// trRole 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow trRole;
+
+        /// <summary>
+        /// drpProjectWorkPost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProjectWorkPost;
+
+        /// <summary>
+        /// drpProjectRole 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProjectRole;
+
+        /// <summary>
+        /// drpTeamGroup 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpTeamGroup;
+
+        /// <summary>
+        /// txtWorkArea 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownBox txtWorkArea;
+
+        /// <summary>
+        /// gvWorkArea 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvWorkArea;
+
+        /// <summary>
+        /// txtInTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtInTime;
+
+        /// <summary>
+        /// rbPersonType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbPersonType;
+
+        /// <summary>
+        /// drpAuditor 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpAuditor;
+
+        /// <summary>
+        /// txtAuditorDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtAuditorDate;
+
+        /// <summary>
+        /// txtOutTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtOutTime;
+
+        /// <summary>
+        /// txtOutResult 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtOutResult;
+
+        /// <summary>
+        /// imgPhoto 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Image imgPhoto;
+
+        /// <summary>
+        /// imgQR 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Image imgQR;
+
+        /// <summary>
+        /// imgIDCard 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Image imgIDCard;
+
+        /// <summary>
+        /// imgIDCardBack 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Image imgIDCardBack;
+
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
+        /// <summary>
+        /// Tab1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab1;
+
+        /// <summary>
+        /// SimpleForm2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm2;
+
+        /// <summary>
+        /// txtBirthday 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtBirthday;
+
+        /// <summary>
+        /// txtAge 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtAge;
+
+        /// <summary>
+        /// rblSex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblSex;
+
+        /// <summary>
+        /// txtRealNameTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRealNameTime;
+
+        /// <summary>
+        /// drpNation 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpNation;
+
+        /// <summary>
+        /// drpPoliticsStatus 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpPoliticsStatus;
+
+        /// <summary>
+        /// drpEduLevel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpEduLevel;
+
+        /// <summary>
+        /// drpMaritalStatus 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpMaritalStatus;
+
+        /// <summary>
+        /// drpPosition 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpPosition;
+
+        /// <summary>
+        /// drpPostTitle 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpPostTitle;
+
+        /// <summary>
+        /// txtPostTitleDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtPostTitleDate;
+
+        /// <summary>
+        /// txtGraduate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtGraduate;
+
+        /// <summary>
+        /// txtMajor 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMajor;
+
+        /// <summary>
+        /// txtForeignLanguage 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtForeignLanguage;
+
+        /// <summary>
+        /// drpCountryCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpCountryCode;
+
+        /// <summary>
+        /// drpProvinceCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProvinceCode;
+
+        /// <summary>
+        /// txtRelativeName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRelativeName;
+
+        /// <summary>
+        /// txtRelativeTel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRelativeTel;
+
+        /// <summary>
+        /// txtAddress 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtAddress;
+
+        /// <summary>
+        /// TabCertificate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab TabCertificate;
+
+        /// <summary>
+        /// GridCertificate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GridCertificate;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSizeGridCertificate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSizeGridCertificate;
+
+        /// <summary>
+        /// TabContract 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab TabContract;
+
+        /// <summary>
+        /// GridContract 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GridContract;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label3;
+
+        /// <summary>
+        /// ToolbarSeparator4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator4;
+
+        /// <summary>
+        /// ToolbarText4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText4;
+
+        /// <summary>
+        /// ddlPageSizeGridContract 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSizeGridContract;
+
+        /// <summary>
+        /// Tab4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab4;
+
+        /// <summary>
+        /// Tab5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab5;
+
+        /// <summary>
+        /// Tab6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab6;
+
+        /// <summary>
+        /// GridTestRecord 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GridTestRecord;
+
+        /// <summary>
+        /// ToolbarSeparator2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
+
+        /// <summary>
+        /// ToolbarText2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText2;
+
+        /// <summary>
+        /// ddlPageSizeGridTestRecord 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSizeGridTestRecord;
+
+        /// <summary>
+        /// Tab7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab7;
+
+        /// <summary>
+        /// InOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab InOut;
+
+        /// <summary>
+        /// GridInOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GridInOut;
+
+        /// <summary>
+        /// ToolbarSeparator3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator3;
+
+        /// <summary>
+        /// ToolbarText3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText3;
+
+        /// <summary>
+        /// ddlPageSizeGridInOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSizeGridInOut;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// MenuCertificate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu MenuCertificate;
+
+        /// <summary>
+        /// btnCertificateEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnCertificateEdit;
+
+        /// <summary>
+        /// MenuInOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu MenuInOut;
+
+        /// <summary>
+        /// btnInOutEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnInOutEdit;
+
+        /// <summary>
+        /// MenuContract 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu MenuContract;
+
+        /// <summary>
+        /// btnContractEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnContractEdit;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs
index eb6c9d7b..e673dc2e 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs
@@ -436,10 +436,9 @@
         /// <param name="e"></param>
         protected void btnSee_Click(object sender, EventArgs e)
         {
-            var getSitePerson = SitePerson_PersonService.GetSitePersonById(Grid1.SelectedRowID);
-            if (getSitePerson != null)
+            if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
             {
-                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../Person/PersonView.aspx?PersonId={0}", getSitePerson.PersonId, "查看 - ")));
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../Person/ProjectPersonView.aspx?SitePersonId={0}", Grid1.SelectedRowID, "查看 - ")));
             }
         }
     }
diff --git a/SGGL/FineUIPro.Web/common/PageBase.cs b/SGGL/FineUIPro.Web/common/PageBase.cs
index 866d5483..c0b71269 100644
--- a/SGGL/FineUIPro.Web/common/PageBase.cs
+++ b/SGGL/FineUIPro.Web/common/PageBase.cs
@@ -1073,11 +1073,12 @@ namespace FineUIPro.Web
         }
         #endregion
 
-        //<summary>
-        // 获取员工责任书 - 岗位名称
-        //</summary>
-        //<param name="state"></param>
-        //<returns></returns>
+        #region 获取员工责任书 - 岗位名称
+        /// <summary>
+        /// 获取员工责任书 - 岗位名称
+        /// </summary>
+        /// <param name="WorkPostId"></param>
+        /// <returns></returns>
         protected string ConvertDutyWorkPostName(object WorkPostId)
         {
             string WorkPostName = string.Empty;
@@ -1092,6 +1093,7 @@ namespace FineUIPro.Web
             }
             return WorkPostName;
         }
+        #endregion
 
         #endregion