lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
李鹏飞 2022-10-10 09:57:07 +08:00
parent 00aeaac1e2 5ab904bf0b
commit a04abe56f2
7 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -73,21 +73,18 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll</HintPath>
</Reference>
<Reference Include="FastReport, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\FastReport.dll</HintPath>
<Reference Include="FastReport">
<HintPath>..\FineUIPro\Reference BLL\FastReport.dll</HintPath>
</Reference>
<Reference Include="FastReport.Bars, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\FastReport.Bars.dll</HintPath>
</Reference>
<Reference Include="FastReport.Editor, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\FastReport.Editor.dll</HintPath>
<Reference Include="FastReport.Editor">
<HintPath>..\FineUIPro\Reference BLL\FastReport.Editor.dll</HintPath>
</Reference>
<Reference Include="FastReport.Web, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\FastReport.Web.dll</HintPath>
<Reference Include="FastReport.Web">
<HintPath>..\FineUIPro\Reference BLL\FastReport.Web.dll</HintPath>
</Reference>
<Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

21
SGGL/FineUIPro.Web/Person/DepartPerson.aspx
View File

@ -21,7 +21,7 @@
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="部门员工" EnableHeaderMenu="true"
runat="server" DataKeyNames="PersonId" DataIDField="PersonId" AllowSorting="true"
SortField="PersonName" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
SortField="PersonName" EnableColumnLines="true" BoxFlex="1" PageSize="10" ForceFit="true"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
@ -74,21 +74,24 @@
<asp:Label ID="lbAge" runat="server" Text='<%# ConvertAgeByIdentityCard(Eval("IdentityCard")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="IdentityCard" DataField="IdentityCard"
<f:RenderField Width="170px" ColumnID="IdentityCard" DataField="IdentityCard"
FieldType="String" HeaderText="身份证" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Address" DataField="Address"
<f:RenderField Width="180px" ColumnID="Address" DataField="Address"
FieldType="String" HeaderText="家庭住址" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Telephone" DataField="Telephone"
<f:RenderField Width="110px" ColumnID="Telephone" DataField="Telephone"
FieldType="String" HeaderText="联系电话" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="EduLevelName" DataField="EduLevelName"
<f:RenderField Width="90px" ColumnID="EduLevelName" DataField="EduLevelName"
FieldType="String" HeaderText="最高学历" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="Major" DataField="Major"
<f:RenderField Width="85px" ColumnID="Major" DataField="Major"
FieldType="String" HeaderText="所学专业" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="WorkPostName" DataField="WorkPostName"
FieldType="String" HeaderText="岗位" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="PersonTypeName" DataField="PersonTypeName"
FieldType="String" HeaderText="员工类别" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
@ -100,10 +103,10 @@
<asp:Label ID="lbIsPost" runat="server" Text='<%# GetIsPost(Eval("IsPost")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="CurrentProjectName" DataField="CurrentProjectName"
<f:RenderField Width="90px" ColumnID="CurrentProjectName" DataField="CurrentProjectName"
FieldType="String" HeaderText="当前项目" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CurrentProjectWorkPostName" DataField="CurrentProjectWorkPostName"
<f:RenderField Width="120px" ColumnID="CurrentProjectWorkPostName" DataField="CurrentProjectWorkPostName"
FieldType="String" HeaderText="项目岗位" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="IntoDate" DataField="IntoDate" Hidden="true"
@ -151,7 +154,7 @@
<f:RenderField Width="100px" ColumnID="RelativeTel" DataField="RelativeTel" Hidden="true"
FieldType="String" HeaderText="亲属电话" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="50px" ColumnID="Actions" HeaderText="操作" HeaderTextAlign="Center" TextAlign="Center">
<f:TemplateField Width="80px" ColumnID="Actions" HeaderText="操作" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<div class="action btncontainer"></div>
</ItemTemplate>

4
SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx
View File

@ -36,6 +36,8 @@
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:HiddenField runat="server" ID="hdUrl"></f:HiddenField>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" OnClick="btnSave_Click" Text="保存">
</f:Button>
<f:Button ID="btnALLSave" Icon="SystemSave" runat="server" OnClick="btnALLSave_Click" Text="编辑个人信息">
</f:Button>
<f:Button ID="btnCustomQuery" Text="自定义查询" Icon="SystemSearch" runat="server"
OnClick="btnCustomQuery_Click" Hidden="true">
@ -142,7 +144,7 @@
</f:Panel>
<f:Window ID="Window1" Title="查询" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px" Maximized="true"
Height="620px">
Height="620px" OnClose="Window1_Close">
</f:Window>
</form>
</body>

16
SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.cs
View File

@ -6,6 +6,7 @@
using System;
using System.IO;
using System.Linq;
using System.Web.UI.DataVisualization.Charting;
public partial class PersonalInfo : PageBase
{
@ -233,5 +234,20 @@
}
}
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnALLSave_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../Person/PersonEdit.aspx?PersonId={0}", this.CurrUser.PersonId, "编辑 - ")));
}
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
this.Tab1LoadData();
}
}
}

9
SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.designer.cs generated
View File

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

7
SGGL/FineUIPro.Web/Personal/PersonalSet.aspx
View File

@ -110,12 +110,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:DropDownList runat="server" ID="drpPageSize" LabelWidth="150px" Label="列表每页显示记录数">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="100000" />
<f:DropDownList runat="server" ID="drpPageSize" LabelWidth="150px" Label="列表每页显示记录数">
</f:DropDownList>
<f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" Height="35px" Width="100px"
BoxFlex="1" Hidden="true">

1
SGGL/FineUIPro.Web/Personal/PersonalSet.aspx.cs
View File

@ -46,6 +46,7 @@ namespace FineUIPro.Web.Personal
{
if (!IsPostBack)
{
Funs.DropDownPageSize(this.drpPageSize);
/// Tab1加载页面方法
this.Tab1LoadData();
}