Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

SGGL/BLL/DropListService.cs

@@ -138,8 +138,8 @@
         public static ListItem[] IsPostDropList()
         {
             ListItem[] lis = new ListItem[2];
-            lis[0] = new ListItem("在岗", BLL.Const._True);
+            lis[0] = new ListItem("在职", BLL.Const._True);
-            lis[1] = new ListItem("离岗", BLL.Const._False);
+            lis[1] = new ListItem("离职", BLL.Const._False);
             return lis;
         }
         #endregion

SGGL/BLL/Person/Person_PersonsService.cs

@@ -112,9 +112,9 @@ namespace BLL
                        x.RoleIds,
                        RoleName = RoleService.getRoleNamesRoleIds(x.RoleIds),
                        x.CurrentProjectId,
-                       CurrentProjectName = db.Base_Project.First(u => u.ProjectId == x.CurrentProjectId).ShortName,
+                       CurrentProjectName = getCurrentProjectName(x.PersonId),
                        x.CurrentProjectWorkPostId,
-                       CurrentProjectWorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.CurrentProjectWorkPostId),
+                       CurrentProjectWorkPostName = getCurrentProjectWorkPostName(x.PersonId),
                        IsPost = x.IsPost ?? true,
                        x.SignatureUrl,
                        x.Address,
@@ -140,6 +140,46 @@ namespace BLL
         }
         #endregion
 
+        #region 获取当前项目及岗位
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="ProjectId"></param>
+        /// <param name="PersonId"></param>
+        /// <returns></returns>
+        public static string getCurrentProjectName(string PersonId)
+        {
+            var getItem = Funs.DB.SitePerson_PersonItem.FirstOrDefault(u => u.PersonId == PersonId && !u.OutTime.HasValue);
+            if (getItem != null)
+            {
+                return ProjectService.GetShortNameByProjectId(getItem.ProjectId); 
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="WorkPostId"></param>
+        /// <param name="PersonId"></param>
+        /// <returns></returns>
+        public static string getCurrentProjectWorkPostName( string PersonId)
+        {
+            var getItem = Funs.DB.SitePerson_PersonItem.FirstOrDefault(u => u.PersonId == PersonId && !u.OutTime.HasValue);
+            if (getItem != null)
+            {
+                return WorkPostService.getWorkPostNamesWorkPostIds(getItem.WorkPostId);
+            }
+            else
+            {
+                return null;
+            }
+        }
+        #endregion
+
         #region 根据主键获取人员信息
         /// <summary>
         /// 根据主键获取人员信息

SGGL/FineUIPro.Web/Person/DepartPerson.aspx

@@ -95,9 +95,9 @@
                         <f:RenderField Width="100px" ColumnID="ValidityDate" DataField="ValidityDate"
                             FieldType="Date" Renderer="Date" HeaderText="合同有效期" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:TemplateField Width="60px" ColumnID="tfIsPost" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
+                        <f:TemplateField Width="80px" ColumnID="tfIsPost" HeaderText="是否在职" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
-                                <asp:Label ID="lbIsPost" runat="server" Text='<%# GetIsOrNo(Eval("IsPost")) %>'></asp:Label>
+                                <asp:Label ID="lbIsPost" runat="server" Text='<%# GetIsPost(Eval("IsPost")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField Width="100px" ColumnID="CurrentProjectName" DataField="CurrentProjectName"
@@ -175,7 +175,7 @@
         </f:Panel>
         <f:Window ID="Window1" Title="员工信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" Maximized="true"
-            Height="620px">
+            Height="620px" OnClose="Window1_Close">
         </f:Window>
         <f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="false"

SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs

@@ -7,6 +7,21 @@ namespace FineUIPro.Web.Person
 {
     public partial class DepartPerson : PageBase
     {
+        /// <summary>
+        /// 页面
+        /// </summary>
+        //public int? PageSize
+        //{
+        //    get
+        //    {
+        //        return (int?)ViewState["PageSize"];
+        //    }
+        //    set
+        //    {
+        //        ViewState["PageSize"] = value;
+        //    }
+        //}
+
         /// <summary>
         /// 加载页面
         /// </summary>
@@ -93,6 +108,10 @@ namespace FineUIPro.Web.Person
         protected void btSearch_Click(object sender, EventArgs e)
         {
             this.BindGrid();
+            //if (this.PageSize.HasValue)
+            //{
+            //    this.ddlPageSize.SelectedValue = this.PageSize.ToString();
+            //}
         }
         #endregion 
 
@@ -132,6 +151,7 @@ namespace FineUIPro.Web.Person
         /// <param name="e"></param>
         protected void btnMenuDelete_Click(object sender, EventArgs e)
         {
+           // this.PageSize = this.Grid1.PageIndex;
             this.DeleteData();
         }
 
@@ -214,6 +234,7 @@ namespace FineUIPro.Web.Person
         /// </summary>
         private void EditData()
         {
+            //this.PageSize = this.Grid1.PageIndex;
             if (Grid1.SelectedRowIndexArray.Length == 0)
             {
                 Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning);
@@ -276,5 +297,10 @@ namespace FineUIPro.Web.Person
             Response.End();
         }
         #endregion
+
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
     }
 }

SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs

@@ -566,7 +566,7 @@ namespace FineUIPro.Web.Person
                     LogService.AddSys_Log(this.CurrUser, newPerson.PersonName, newPerson.PersonId, BLL.Const.PersonLibMenuId, BLL.Const.BtnAdd);
                 }
                 Alert.ShowInParent("保存成功！", MessageBoxIcon.Success);
-                PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+                PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
             }
             else
             {

SGGL/FineUIPro.Web/Person/PersonLib.aspx

@@ -88,7 +88,7 @@
                         <f:RenderField Width="100px" ColumnID="CurrentProjectWorkPostName" DataField="CurrentProjectWorkPostName"
                             FieldType="String" HeaderText="项目岗位" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                          <f:TemplateField Width="60px" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
+                          <f:TemplateField Width="60px" HeaderText="是否在职" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="lbIsPost" runat="server" Text='<%# GetIsOrNo(Eval("IsPost")) %>'></asp:Label>
                             </ItemTemplate>

SGGL/FineUIPro.Web/Person/ProjectPerson.aspx

@@ -50,7 +50,7 @@
                                     <f:RadioItem Text="全部" Value="-2" />
                                     <f:RadioItem Text="在审" Value="0" />
                                     <f:RadioItem Text="在岗" Value="1" Selected="true" />
-                                    <f:RadioItem Text="离岗" Value="2" />
+                                    <f:RadioItem Text="退场" Value="2" />
                                     <f:RadioItem Text="打回" Value="-1" />
                                 </f:RadioButtonList>
                                 <f:ToolbarFill runat="server">
@@ -138,7 +138,7 @@
         </f:Panel>
       <f:Window ID="Window1" Title="项目人员" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"  Maximized="true"
-            Height="620px">
+            Height="620px" OnClose="Window1_Close">
         </f:Window>
         <f:Window ID="Window2" Title="导入项目人员" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="false"

SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs

@@ -304,5 +304,10 @@ namespace FineUIPro.Web.Person
             Funs.FineUIPleaseSelect(drpUnit, "按单位查询");
             this.BindGrid();
         }
+
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            this.BindGrid();
+        }
     }
 }

SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs

@@ -659,7 +659,7 @@ namespace FineUIPro.Web.Person
                     }
 
                     Alert.ShowInParent("保存成功！", MessageBoxIcon.Success);
-                    PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+                    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
                 }
                 else
                 {

SGGL/FineUIPro.Web/common/PageBase.cs

@@ -786,6 +786,30 @@ namespace FineUIPro.Web
         }
         #endregion
 
+        #region 获取是否字面值，在 ASPX 中调用
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="bitValue"></param>
+        /// <returns></returns>
+        protected string GetIsPost(object bitValue)
+        {
+            string value = string.Empty;
+            if (bitValue != null)
+            {
+                if (bitValue.ToString() == "1" || Convert.ToBoolean(bitValue.ToString()))
+                {
+                    value = "在职";
+                }
+                else
+                {
+                    value = "离职";
+                }
+            }
+            return value;
+        }
+        #endregion
+
         #region 获取项目状态的字面值，在 ASPX 中调用
         /// <summary>
         /// 获取项目状态的字面值，在 ASPX 中调用