shecs/Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11212121

Browse Source
This commit is contained in:
jackchenyang
2024-05-17 15:28:32 +08:00
parent 904833ad7e
commit e8c8ac8d23
28 changed files with 211 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_Edit.aspx
+7 -7
View File
@@ -8,7 +8,7 @@
<html>
<head runat="server">
<title></title>
<title>编辑</title>
</head>
<body>
<form id="form1" runat="server">
@@ -17,7 +17,7 @@
<Rows>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="ddlEmailParamsID" LabelWidth="150px" Label="邮件类型">
<f:DropDownList runat="server" ID="ddlEmailParamsID" Required="true" ShowRedStar="true" LabelWidth="150px" Label="邮件类型">
</f:DropDownList>
</Items>
</f:FormRow>
@@ -25,7 +25,7 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtTemplateCondition" ShowLabel="true" Required="true" LabelWidth="150px" LabelAlign="Right"
<f:TextBox ID="txtTemplateCondition" ShowLabel="true" ShowRedStar="true" Required="true" LabelWidth="150px" LabelAlign="Right"
BoxFlex="2" runat="server" Label="模版条件">
</f:TextBox>
</Items>
@@ -34,7 +34,7 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtTemplateName" ShowLabel="true" Required="true" LabelWidth="150px" LabelAlign="Right"
<f:TextBox ID="txtTemplateName" ShowLabel="true" ShowRedStar="true" Required="true" LabelWidth="150px" LabelAlign="Right"
BoxFlex="2" runat="server" Label="模版名称">
</f:TextBox>
</Items>
@@ -53,8 +53,8 @@
<Items>
<f:RadioButtonList ID="rblAutoPostBack" AutoPostBack="true" OnSelectedIndexChanged="rblAutoPostBack_SelectedIndexChanged" LabelWidth="150px" LabelAlign="Right"
Label="选择人员" ColumnNumber="3" runat="server" Required="true">
<f:RadioItem Text="不选择" Value="0" Selected="true" />
<f:RadioItem Text="选择用户" Value="1" />
<f:RadioItem Text="不选择" Value="0" />
<f:RadioItem Text="选择用户" Value="1" Selected="true" />
<f:RadioItem Text="选择角色" Value="2" />
</f:RadioButtonList>
</Items>
@@ -63,7 +63,7 @@
<Rows>
<f:FormRow>
<Items>
<f:DropDownBox runat="server" Label="接收人" ID="ddlSendUserName" LabelWidth="150px" EmptyText="请选择" DataControlID="Grid1"
<f:DropDownBox runat="server" Label="接收人" Required="true" ShowRedStar="true" ID="ddlSendUserName" LabelWidth="150px" EmptyText="请选择" DataControlID="Grid1"
EnableMultiSelect="true" MatchFieldWidth="false" EnableEdit="true">
<PopPanel>
<f:UserControlConnector runat="server">
HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_Edit.aspx.cs
+1
View File
@@ -107,6 +107,7 @@ namespace FineUIPro.Web.Email_Send
ddlEmailParamsID.DataValueField = "MailClassID";
ddlEmailParamsID.DataSource = email_Params;
ddlEmailParamsID.DataBind();
ddlEmailParamsID.Items.Insert(0,new ListItem("",""));
}
#endregion
HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_List.aspx
+1 -1
View File
@@ -97,7 +97,7 @@
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="SendEmailTemplate Editor" Hidden="true" EnableIFrame="true" EnableMaximize="false"
<f:Window ID="Window1" Title="新增/编辑" Hidden="true" EnableIFrame="true" EnableMaximize="false"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1000px" Height="650px">
</f:Window>
HJGL/FineUIPro.Web/Email_Send/Email_Send_Edit.aspx.cs
+6 -3
View File
@@ -107,9 +107,12 @@ namespace FineUIPro.Web.Email_Send
protected void btnSave_Click(object sender, EventArgs e)
{
//string mailFrom = MailHelper.MailServerFrom;
Email_Pop pop = new Email_Pop();
pop = MailHelper.getEmailPop("7EC5E991-B7A0-495A-90ED-2BE15370C959");
var pop = MailHelper.getEmailPop();
if (pop == null)
{
ShowNotify("未配置邮件服务器", MessageBoxIcon.Error);
return;
}
string mailFrom = pop.EmailYx;
HJGL/FineUIPro.Web/Email_Send/SelectUserControl.ascx.cs
+1 -1
View File
@@ -94,7 +94,7 @@ namespace FineUIPro.Web.Email_Send
string sortField = Grid1.SortField;
string sortDirection = Grid1.SortDirection;
string strSql = @"select a.UserId,b.UnitId,b.UserName,c.UnitName from Project_User as a inner join Sys_User as b on a.UserId=b.UserId
string strSql = @"select a.UserId,b.UnitId,b.UserName,c.UnitName,b.Email from Project_User as a inner join Sys_User as b on a.UserId=b.UserId
inner join Base_Unit as c on b.UnitId=c.UnitId where b.IsPost=1 order by c.UnitName ";
List<SqlParameter> listStr = new List<SqlParameter>();
SqlParameter[] parameter = listStr.ToArray();
HJGL/FineUIPro.Web/Global.asax.cs
+7 -1
View File
@@ -14,6 +14,8 @@
using System.Data;
using System.Data.SqlClient;
using BLL;
using FineUIPro.Web.common;
using System.Threading.Tasks;
public class Global : System.Web.HttpApplication
{
@@ -47,6 +49,8 @@
// 开启线程
System.Threading.Thread LoadServiceData = new System.Threading.Thread(new System.Threading.ThreadStart(ExpirePoint));
LoadServiceData.Start();
}
private void ExpirePoint()
@@ -60,6 +64,7 @@
ExpirePoint.Elapsed += new System.Timers.ElapsedEventHandler(ExpirePoint_Elapsed);
}
void ExpirePoint_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
@@ -141,7 +146,8 @@
}
}
protected void Session_Start(object sender, EventArgs e)
{
Session.Timeout = 36000;
HJGL/FineUIPro.Web/Web.config
+1 -1
View File
@@ -14,7 +14,7 @@
providerName="System.Data.SqlClient" />-->
</connectionStrings>
<FineUIPro DebugMode="false" CustomTheme="Metro_Dark_Blue" EnableAnimation="true" JSLibrary="All"/>
<appSettings>
<appSettings>
<!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=HJGLDB;Integrated Security=False; User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>-->
<!--系统名称-->
HJGL/FineUIPro.Web/common/SysManage/UserListEdit.aspx.cs
+2 -1
View File
@@ -69,7 +69,8 @@ namespace FineUIPro.Web.common.SysManage
this.txtUserName.Text = user.UserName;
this.txtAccount.Text = user.Account;
this.txtDepart.Text = user.Depart;
this.txtEmail.Text = user.Email;
this.txtEmailPassword.Text = user.EmailPassword;
if (user.IsPost.HasValue)
{
this.cbIsPost.Checked = user.IsPost.Value;