lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0917-005-gaofei

This commit is contained in:
gaofei 2021-09-17 16:04:52 +08:00
parent d8dc0be1ce
commit 938713a942
6 changed files with 182 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
################################################################################ ################################################################################
/SGGLPackFile/PackFile/bin /SGGLPackFile/PackFile/bin
/SGGLPackFile

19
SGGL/BLL/SysManage/UserService.cs
View File

@ -311,6 +311,25 @@ namespace BLL
} }
#endregion #endregion
/// <summary>
/// ÐÞ¸ÄÔ±¹¤ÐÅÏ¢
/// </summary>
/// <param name="user">ÈËԱʵÌå</param>
public static void UpdateUserInfo(Model.Sys_User user)
{
Model.Sys_User newUser = Funs.DB.Sys_User.FirstOrDefault(e => e.UserId == user.UserId);
if (newUser != null)
{
newUser.Account = user.Account;
newUser.UserName = user.UserName;
newUser.UserCode = user.UserCode;
newUser.IdentityCard = user.IdentityCard;
newUser.Email = user.Email;
newUser.Telephone = user.Telephone;
Funs.DB.SubmitChanges();
}
}
/// <summary> /// <summary>
/// 根据人员Id删除一个人员信息 /// 根据人员Id删除一个人员信息
/// </summary> /// </summary>

2
SGGL/FineUIPro.Web/JDGL/WBS/CostControlWeekItemDetailEdit.aspx.cs
View File

@ -69,6 +69,8 @@ namespace FineUIPro.Web.JDGL.WBS
Model.WBS_CostControlDetail costControlDetail = BLL.CostControlDetailService.GetCostControlDetailByCostControlDetailId(this.Id); Model.WBS_CostControlDetail costControlDetail = BLL.CostControlDetailService.GetCostControlDetailByCostControlDetailId(this.Id);
detail.CostControlDetailId = SQLHelper.GetNewID(); detail.CostControlDetailId = SQLHelper.GetNewID();
detail.Months = costControlDetail.Months; detail.Months = costControlDetail.Months;
detail.StartDate= costControlDetail.Months;
detail.EndDate = costControlDetail.Months.Value.AddMonths(1).AddDays(-1);
list.Add(detail); list.Add(detail);
Grid1.DataSource = list; Grid1.DataSource = list;
Grid1.DataBind(); Grid1.DataBind();

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

@ -5,98 +5,106 @@
<head runat="server"> <head runat="server">
<title>个人信息</title> <title>个人信息</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" /> <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css"> <style type="text/css">
.userphoto .f-field-label .userphoto .f-field-label {
{
margin-top: 0; margin-top: 0;
} }
.userphoto img .userphoto img {
{
width: 150px; width: 150px;
height: 180px; height: 180px;
} }
.uploadbutton .f-btn .uploadbutton .f-btn {
{
width: 100%; width: 100%;
} }
</style> </style>
</head> </head>
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1"/> <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
<f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" MarginRight="5px"> <f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" MarginRight="5px">
<Items> <Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="440px" ShowBorder="true" <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="480px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server"> TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
<Tabs> <Tabs>
<f:Tab ID="Tab1" Title="基础信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server"> <f:Tab ID="Tab1" Title="基础信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
<Items> <Toolbars>
<f:Form ID="SimpleForm1" LabelAlign="Right" MessageTarget="Qtip" RedStarPosition="BeforeText" <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
LabelWidth="90px" BodyPadding="5px" ShowBorder="false" ShowHeader="false" runat="server"
AutoScroll="false">
<Items>
<f:Panel ID="Panel3" runat="server" ShowBorder="false" ShowHeader="false" Layout="HBox"
BoxConfigAlign="StretchMax">
<Items>
<f:Panel ID="Panel1" Title="面板1" BoxFlex="5" MarginRight="5px" runat="server" ShowBorder="false"
Width="200px" ShowHeader="false">
<Items>
<f:TextBox ID="txtUserName" runat="server" Label="姓名" Readonly="true"></f:TextBox>
<f:TextBox ID="txtUserCode" runat="server" Label="用户编号" Readonly="true"></f:TextBox>
<f:TextBox ID="drpSex" Label="性别" runat="server" Readonly="true"></f:TextBox>
<f:TextBox ID="dpBirthDay" Label="出生日期" runat="server" Readonly="true"></f:TextBox>
<f:TextBox ID="drpMarriage" Readonly="true" Label="婚姻状况" runat="server">
</f:TextBox>
<f:TextBox ID="drpNation" Readonly="true" Label="民族" runat="server"></f:TextBox>
<f:TextBox ID="drpUnit" Readonly="true" Label="所在单位" runat="server" ></f:TextBox>
</Items>
</f:Panel>
<f:Panel ID="Panel4" runat="server" BoxFlex="5" ShowBorder="false" ShowHeader="false"
Width="200px" MarginRight="5px" Layout="VBox">
<Items>
<f:TextBox ID="txtAccount" runat="server" Label="登录账号" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtIdentityCard" runat="server" Label="身份证号" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtEmail" runat="server" Label="邮箱" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtTelephone" runat="server" Label="手机号" Readonly="true">
</f:TextBox>
<f:TextBox ID="drpEducation" Label="文化程度" runat="server" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtHometown" runat="server" Label="籍贯" Readonly="true">
</f:TextBox>
<f:TextBox ID="drpPosition" Label="职务" runat="server" Readonly="true">
</f:TextBox>
</Items>
</f:Panel>
<f:Panel ID="Panel5" Title="面板1" BoxFlex="3" runat="server" ShowBorder="false" ShowHeader="false"
Layout="VBox">
<Items> <Items>
<f:Image ID="Image1" CssClass="userphoto" ImageUrl="~/res/images/blank_180.png" runat="server" <f:ToolbarFill runat="server"></f:ToolbarFill>
BoxFlex="1"> <f:Button ID="btnSave" Icon="SystemSave" runat="server"
</f:Image> OnClick="btnSave_Click">
</Items> </f:Button>
</f:Panel> </Items>
</Items> </f:Toolbar>
</f:Panel> </Toolbars>
</Items> <Items>
<Items> <f:Form ID="SimpleForm1" LabelAlign="Right" MessageTarget="Qtip" RedStarPosition="BeforeText"
<f:Form ID="Form7" ShowBorder="false" ShowHeader="false" runat="server"> LabelWidth="90px" BodyPadding="5px" ShowBorder="false" ShowHeader="false" runat="server"
<Rows> AutoScroll="false">
<f:FormRow>
<Items> <Items>
<f:TextArea ID="txtPerformance" runat="server" Label="个人简历" Readonly="true"> <f:Panel ID="Panel3" runat="server" ShowBorder="false" ShowHeader="false" Layout="HBox"
</f:TextArea> BoxConfigAlign="StretchMax">
</Items> <Items>
</f:FormRow> <f:Panel ID="Panel1" Title="面板1" BoxFlex="5" MarginRight="5px" runat="server" ShowBorder="false"
</Rows> Width="200px" ShowHeader="false">
</f:Form> <Items>
</Items> <f:TextBox ID="txtUserName" runat="server" Label="姓名"></f:TextBox>
</f:Form> <f:TextBox ID="txtUserCode" runat="server" Label="用户编号"></f:TextBox>
</Items> <f:TextBox ID="drpSex" Label="性别" runat="server" Readonly="true"></f:TextBox>
<f:TextBox ID="dpBirthDay" Label="出生日期" runat="server" Readonly="true"></f:TextBox>
<f:TextBox ID="drpMarriage" Readonly="true" Label="婚姻状况" runat="server">
</f:TextBox>
<f:TextBox ID="drpNation" Readonly="true" Label="民族" runat="server"></f:TextBox>
<f:TextBox ID="drpUnit" Readonly="true" Label="所在单位" runat="server"></f:TextBox>
</Items>
</f:Panel>
<f:Panel ID="Panel4" runat="server" BoxFlex="5" ShowBorder="false" ShowHeader="false"
Width="200px" MarginRight="5px" Layout="VBox">
<Items>
<f:TextBox ID="txtAccount" runat="server" Label="登录账号">
</f:TextBox>
<f:TextBox ID="txtIdentityCard" runat="server" Label="身份证号" RegexPattern="IDENTITY_CARD">
</f:TextBox>
<f:TextBox ID="txtEmail" runat="server" Label="邮箱">
</f:TextBox>
<f:TextBox ID="txtTelephone" runat="server" Label="手机号">
</f:TextBox>
<f:TextBox ID="drpEducation" Label="文化程度" runat="server" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtHometown" runat="server" Label="籍贯" Readonly="true">
</f:TextBox>
<f:TextBox ID="drpPosition" Label="职务" runat="server" Readonly="true">
</f:TextBox>
</Items>
</f:Panel>
<f:Panel ID="Panel5" Title="面板1" BoxFlex="3" runat="server" ShowBorder="false" ShowHeader="false"
Layout="VBox">
<Items>
<f:Image ID="Image1" CssClass="userphoto" ImageUrl="~/res/images/blank_180.png" runat="server"
BoxFlex="1">
</f:Image>
</Items>
</f:Panel>
</Items>
</f:Panel>
</Items>
<Items>
<f:Form ID="Form7" ShowBorder="false" ShowHeader="false" runat="server">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtPerformance" runat="server" Label="个人简历" Readonly="true">
</f:TextArea>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Form>
</Items>
</f:Tab> </f:Tab>
<f:Tab ID="Tab2" Title="其他信息" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"> <f:Tab ID="Tab2" Title="其他信息" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server">
<Items> <Items>
@ -104,16 +112,16 @@
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Left"> BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Left">
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
</f:Form> </f:Form>
</Items> </Items>
</f:Tab> </f:Tab>
</Tabs> </Tabs>
</f:TabStrip> </f:TabStrip>
</Items> </Items>
</f:Panel> </f:Panel>
</form> </form>
</body> </body>

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

@ -47,7 +47,7 @@ namespace FineUIPro.Web.Personal
/// </summary> /// </summary>
private void Tab1LoadData() private void Tab1LoadData()
{ {
var user = Funs.DB.Sys_User.FirstOrDefault(x=>x.UserId == this.CurrUser.UserId); var user = Funs.DB.Sys_User.FirstOrDefault(x => x.UserId == this.CurrUser.UserId);
if (user != null) if (user != null)
{ {
this.txtUserName.Text = user.UserName; this.txtUserName.Text = user.UserName;
@ -70,7 +70,7 @@ namespace FineUIPro.Web.Personal
{ {
this.drpNation.Text = NationVules.ConstText; this.drpNation.Text = NationVules.ConstText;
} }
var units = Funs.DB.Base_Unit.FirstOrDefault(x=>x.UnitId == user.UnitId); var units = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == user.UnitId);
if (units != null) if (units != null)
{ {
this.drpUnit.Text = units.UnitName; this.drpUnit.Text = units.UnitName;
@ -98,6 +98,50 @@ namespace FineUIPro.Web.Personal
} }
} }
} }
#endregion #endregion
/// <summary>
/// 保存按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
var q = Funs.DB.Sys_User.FirstOrDefault(x => x.Account == this.txtAccount.Text.Trim() && (x.UserId != this.CurrUser.UserId || (this.CurrUser.UserId == null && x.UserId != null)));
if (q != null)
{
Alert.ShowInParent("输入的账号已存在！", MessageBoxIcon.Warning);
return;
}
if (!string.IsNullOrEmpty(this.txtUserCode.Text))
{
var q2 = Funs.DB.Sys_User.FirstOrDefault(x => x.UserCode == this.txtUserCode.Text.Trim() && (x.UserId != this.CurrUser.UserId || (this.CurrUser.UserId == null && x.UserId != null)));
if (q2 != null)
{
Alert.ShowInParent("输入的编号已存在！", MessageBoxIcon.Warning);
return;
}
}
if (!string.IsNullOrEmpty(this.txtIdentityCard.Text) && BLL.UserService.IsExistUserIdentityCard(this.CurrUser.UserId, this.txtIdentityCard.Text.Trim()) == true)
{
Alert.ShowInParent("输入的身份证号码已存在！", MessageBoxIcon.Warning);
return;
}
Model.Sys_User newUser = new Model.Sys_User
{
UserCode = this.txtUserCode.Text.Trim(),
UserName = this.txtUserName.Text.Trim(),
Account = this.txtAccount.Text.Trim(),
IdentityCard = this.txtIdentityCard.Text.Trim(),
Email = this.txtEmail.Text.Trim(),
Telephone = this.txtTelephone.Text.Trim(),
};
newUser.UserId = this.CurrUser.UserId;
UserService.UpdateUserInfo(newUser);
Alert.ShowInParent("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
} }
} }

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

@ -2,8 +2,8 @@
// <自动生成> // <自动生成>
// 此代码由工具生成。 // 此代码由工具生成。
// //
// 对此文件的更改可能会导致不正确的行为，并且如果 // 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，这些更改将会丢失。 // 重新生成代码，则所做更改将丢失。
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -57,6 +57,24 @@ namespace FineUIPro.Web.Personal {
/// </remarks> /// </remarks>
protected global::FineUIPro.Tab Tab1; protected global::FineUIPro.Tab Tab1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary> /// <summary>
/// SimpleForm1 控件。 /// SimpleForm1 控件。
/// </summary> /// </summary>