合并最新

This commit is contained in:
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
+99 -85
View File
@@ -5,98 +5,108 @@
<head runat="server">
<title>个人信息</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.userphoto .f-field-label
{
<style type="text/css">
.userphoto .f-field-label {
margin-top: 0;
}
.userphoto img
{
.userphoto img {
width: 150px;
height: 180px;
height: 180px;
}
.uploadbutton .f-btn
{
.uploadbutton .f-btn {
width: 100%;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1"/>
<f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" MarginRight="5px">
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
<f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" MarginRight="5px">
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="440px" 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="SimpleForm1" LabelAlign="Right" MessageTarget="Qtip" RedStarPosition="BeforeText"
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">
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="440px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
<Tabs>
<f:Tab ID="Tab1" Title="基础信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:Label runat="server" ID="lbSystemVersion" Hidden="true" Label="系统版本"></f:Label>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" OnClick="btnSave_Click" Hidden="true">
</f:Button>
<f:Button ID="btnCustomQuery" Text="自定义查询" Icon="SystemSearch" runat="server"
OnClick="btnCustomQuery_Click" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Form ID="SimpleForm1" LabelAlign="Right" MessageTarget="Qtip" RedStarPosition="BeforeText"
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: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: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>
<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 ID="Tab2" Title="其他信息" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server">
<Items>
@@ -104,17 +114,21 @@
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Left">
<Rows>
<f:FormRow>
<Items>
<Items>
</Items>
</f:FormRow>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Tab>
</f:Tab>
</Tabs>
</f:TabStrip>
</Items>
</Items>
</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">
</f:Window>
</form>
</body>
</html>
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.UI;
@@ -38,6 +39,12 @@ namespace FineUIPro.Web.Personal
{
/// Tab1加载页面方法
this.Tab1LoadData();
if (this.CurrUser.UserId == Const.hfnbdId)
{
this.btnCustomQuery.Hidden = false;
this.lbSystemVersion.Hidden = false;
this.lbSystemVersion.Text = Funs.SystemVersion;
}
}
}
@@ -98,6 +105,55 @@ 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());
}
protected void btnCustomQuery_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../SysManage/CustomQuery.aspx"), "查询"));
}
}
}
+47 -2
View File
@@ -2,8 +2,8 @@
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为,并且如果
// 重新生成代码,这些更改将丢失。
// 对此文件的更改可能导致不正确的行为,如果
// 重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
@@ -57,6 +57,42 @@ namespace FineUIPro.Web.Personal {
/// </remarks>
protected global::FineUIPro.Tab Tab1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// lbSystemVersion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSystemVersion;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnCustomQuery 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnCustomQuery;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -272,5 +308,14 @@ namespace FineUIPro.Web.Personal {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm2;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
}
}