From 904833ad7e2e6706b6fc5f6969fcdc78fc1fb8dd Mon Sep 17 00:00:00 2001 From: jackchenyang <874821510@qq.com> Date: Thu, 16 May 2024 15:50:44 +0800 Subject: [PATCH] 122 --- HJGL/.vs/HJGL/v17/.suo | Bin 943616 -> 1051136 bytes .../Email_Send/Email_Params_Edit.aspx.cs | 5 +- .../Email_Send/Email_Params_List.aspx | 2 +- .../Email_Send/Email_Params_List.aspx.cs | 4 +- .../Email_Send/Email_Pop_Edit.aspx.cs | 2 +- .../Email_SendTemplate_Edit.aspx.cs | 16 ++--- .../Email_Send/Email_SendTemplate_List.aspx | 16 ++--- .../Email_SendTemplate_List.aspx.cs | 4 +- .../Email_Send/Email_Send_Edit.aspx | 2 +- .../Email_Send/Email_Send_Edit.aspx.cs | 6 ++ .../Email_Send/SelectUserControl.ascx | 16 +++-- .../Email_Send/SelectUserControl.ascx.cs | 56 +++++++++++------- .../SelectUserControl.ascx.designer.cs | 27 ++++++--- 13 files changed, 97 insertions(+), 59 deletions(-) diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 791fda5584be575adda89297152b4448e05242c9..e1850e8ebd1ff8f72ff974e22e9c8c89ed7f967e 100644 GIT binary patch delta 26095 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 delta 37462 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 diff --git a/HJGL/FineUIPro.Web/Email_Send/Email_Params_Edit.aspx.cs b/HJGL/FineUIPro.Web/Email_Send/Email_Params_Edit.aspx.cs index 47653d1..1ecf2fd 100644 --- a/HJGL/FineUIPro.Web/Email_Send/Email_Params_Edit.aspx.cs +++ b/HJGL/FineUIPro.Web/Email_Send/Email_Params_Edit.aspx.cs @@ -38,6 +38,7 @@ namespace FineUIPro.Web.Email_Send string emailId = Request.Params["id"]; pops = BLL.Email_Send.Email_ParamsService.GetEmail_ParamsPop(emailId); + if (pops == null) { Email_Params pop = new Email_Params(); @@ -50,7 +51,7 @@ namespace FineUIPro.Web.Email_Send BLL.Email_Send.Email_ParamsService.AddEmail_Params(pop); //BLL.Sys_LogService.AddLog(Const.System_2, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.SendEmailPopMenuId,, "Add Parameter information",); - ShowNotify("Send Successfully!", MessageBoxIcon.Success); + ShowNotify("发送成功!", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } else { @@ -61,7 +62,7 @@ namespace FineUIPro.Web.Email_Send pops.UpdateTime = DateTime.Now; BLL.Email_Send.Email_ParamsService.UpdateEmail_Params(pops); //BLL.Sys_LogService.AddLog(Const.System_2, this.CurrUser.LoginProjectId, this.CurrUser.UserId,Const.menuId, "Update Parameter information"); - ShowNotify("Send Successfully!", MessageBoxIcon.Success); + ShowNotify("发送成功!", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } } diff --git a/HJGL/FineUIPro.Web/Email_Send/Email_Params_List.aspx b/HJGL/FineUIPro.Web/Email_Send/Email_Params_List.aspx index e49c43c..7ae9523 100644 --- a/HJGL/FineUIPro.Web/Email_Send/Email_Params_List.aspx +++ b/HJGL/FineUIPro.Web/Email_Send/Email_Params_List.aspx @@ -30,7 +30,7 @@ - diff --git a/HJGL/FineUIPro.Web/Email_Send/Email_Params_List.aspx.cs b/HJGL/FineUIPro.Web/Email_Send/Email_Params_List.aspx.cs index ccf6a84..285808a 100644 --- a/HJGL/FineUIPro.Web/Email_Send/Email_Params_List.aspx.cs +++ b/HJGL/FineUIPro.Web/Email_Send/Email_Params_List.aspx.cs @@ -72,7 +72,7 @@ namespace FineUIPro.Web.Email_Send { if (Grid1.SelectedRowIndexArray.Length == 0) { - Alert.ShowInParent("Please select at least one record!"); + Alert.ShowInParent("请选择至少一条记录!"); return; } string Id = Grid1.SelectedRowID; @@ -119,7 +119,7 @@ namespace FineUIPro.Web.Email_Send string rowID = Grid1.DataKeys[rowIndex][0].ToString(); BLL.Email_Send.Email_ParamsService.DeleteEmail_ParamsById(rowID); - ShowNotify("Deleted successfully!"); + ShowNotify("删除成功!"); } BindGrid(); diff --git a/HJGL/FineUIPro.Web/Email_Send/Email_Pop_Edit.aspx.cs b/HJGL/FineUIPro.Web/Email_Send/Email_Pop_Edit.aspx.cs index 592f88f..9e43890 100644 --- a/HJGL/FineUIPro.Web/Email_Send/Email_Pop_Edit.aspx.cs +++ b/HJGL/FineUIPro.Web/Email_Send/Email_Pop_Edit.aspx.cs @@ -49,7 +49,7 @@ namespace FineUIPro.Web.Email_Send BLL.Email_Send.Email_PopService.UpdateEmail_Pop(pop); //BLL.Sys_LogService.AddLog(this.CurrUser.UserId, "Update Email information"); - ShowNotify("Save Successfully!", MessageBoxIcon.Success); + ShowNotify("保存成功!", MessageBoxIcon.Success); } diff --git a/HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_Edit.aspx.cs b/HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_Edit.aspx.cs index 11dad8b..10403c9 100644 --- a/HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_Edit.aspx.cs +++ b/HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_Edit.aspx.cs @@ -238,7 +238,7 @@ namespace FineUIPro.Web.Email_Send } else { - ShowNotify("Cannot Be Created Repeatedly!", MessageBoxIcon.Error); + ShowNotify("不能重复创建!", MessageBoxIcon.Error); return; } @@ -266,8 +266,8 @@ namespace FineUIPro.Web.Email_Send tep.EmtempID = emailId; tep.EmuserID = item.UserId.ToString(); tep.EMPeopleType = BLL.Const.SenderType; - tep.EmuserName = item.UserName.ToString(); - tep.EmuaerEmailAddress = item.Email.ToString(); + tep.EmuserName = item.UserName; + tep.EmuaerEmailAddress = item.Email; tplist.Add(tep); } } @@ -280,10 +280,10 @@ namespace FineUIPro.Web.Email_Send Model.Email_ToPeople tep = new Model.Email_ToPeople(); tep.EmID = Guid.NewGuid().ToString(); tep.EmtempID = temp.EmailId; - tep.EmuserID = item.UserId.ToString(); - tep.EmuserName = item.UserName.ToString(); + tep.EmuserID = item.UserId; + tep.EmuserName = item.UserName; tep.EMPeopleType = BLL.Const.CCType; - tep.EmuaerEmailAddress = item.Email.ToString(); + tep.EmuaerEmailAddress = item.Email; tplist.Add(tep); } } @@ -381,7 +381,7 @@ namespace FineUIPro.Web.Email_Send } else { - ShowNotify("Cannot Be Created Repeatedly!", MessageBoxIcon.Error); + ShowNotify("不能重复创建", MessageBoxIcon.Error); return; } } @@ -482,7 +482,7 @@ namespace FineUIPro.Web.Email_Send //BLL.Sys_LogService.AddLog(this.CurrUser.UserId, "Update SendEmailTemplate!"); } } - ShowNotify("Save Successfully!", MessageBoxIcon.Success); + ShowNotify("保存成功!", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } } diff --git a/HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_List.aspx b/HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_List.aspx index 871b6ee..15ae2a0 100644 --- a/HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_List.aspx +++ b/HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_List.aspx @@ -30,7 +30,7 @@ - @@ -43,26 +43,26 @@ + HeaderTextAlign="Left" TextAlign="Left" FieldType="String" HeaderText="邮件通知人"> + HeaderTextAlign="Left" TextAlign="Left" HeaderText="邮件标题"> + HeaderTextAlign="Left" TextAlign="Left" FieldType="String" HeaderText="发送条件"> + HeaderTextAlign="Left" TextAlign="Left" HeaderText="邮件内容"> <%-- + HeaderTextAlign="Left" TextAlign="Left" FieldType="String" HeaderText="EmailDesc" ExpandUnusedSpace="true"> --%> + HeaderTextAlign="Left" TextAlign="Center" EnableFilter="true"> @@ -107,7 +107,7 @@ Icon="BulletEdit" runat="server" Text="Modify" Hidden="true"> diff --git a/HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_List.aspx.cs b/HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_List.aspx.cs index 0c8e602..c9e4f26 100644 --- a/HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_List.aspx.cs +++ b/HJGL/FineUIPro.Web/Email_Send/Email_SendTemplate_List.aspx.cs @@ -73,7 +73,7 @@ namespace FineUIPro.Web.Email_Send { if (Grid1.SelectedRowIndexArray.Length == 0) { - Alert.ShowInParent("Please select at least one record!"); + Alert.ShowInParent("请选择至少一条记录!"); return; } string Id = Grid1.SelectedRowID; @@ -124,7 +124,7 @@ namespace FineUIPro.Web.Email_Send string rowID = Grid1.DataKeys[rowIndex][0].ToString(); BLL.Email_Send.Email_SendTemplateService.Delete(rowID); - ShowNotify("Deleted successfully!"); + ShowNotify("成功删除!"); } BindGrid(); diff --git a/HJGL/FineUIPro.Web/Email_Send/Email_Send_Edit.aspx b/HJGL/FineUIPro.Web/Email_Send/Email_Send_Edit.aspx index 08c1b31..8587f2d 100644 --- a/HJGL/FineUIPro.Web/Email_Send/Email_Send_Edit.aspx +++ b/HJGL/FineUIPro.Web/Email_Send/Email_Send_Edit.aspx @@ -28,7 +28,7 @@ - diff --git a/HJGL/FineUIPro.Web/Email_Send/Email_Send_Edit.aspx.cs b/HJGL/FineUIPro.Web/Email_Send/Email_Send_Edit.aspx.cs index cf4545c..6c653f9 100644 --- a/HJGL/FineUIPro.Web/Email_Send/Email_Send_Edit.aspx.cs +++ b/HJGL/FineUIPro.Web/Email_Send/Email_Send_Edit.aspx.cs @@ -110,6 +110,7 @@ namespace FineUIPro.Web.Email_Send Email_Pop pop = new Email_Pop(); pop = MailHelper.getEmailPop("7EC5E991-B7A0-495A-90ED-2BE15370C959"); + string mailFrom = pop.EmailYx; string[] mailTo = null; @@ -129,6 +130,11 @@ namespace FineUIPro.Web.Email_Send namelist.Add(tn.CommandName); } } + if (namelist.Count == 0) + { + ShowNotify("请至少选择一项用户进行发送！", MessageBoxIcon.Warning); + return; + } mailTo = namelist.ToList().ToArray(); mailSubject = this.txtSendTitle.Text.Trim(); diff --git a/HJGL/FineUIPro.Web/Email_Send/SelectUserControl.ascx b/HJGL/FineUIPro.Web/Email_Send/SelectUserControl.ascx index 001aaa5..d773e8a 100644 --- a/HJGL/FineUIPro.Web/Email_Send/SelectUserControl.ascx +++ b/HJGL/FineUIPro.Web/Email_Send/SelectUserControl.ascx @@ -7,10 +7,13 @@ - + + - + @@ -24,10 +27,11 @@ OnSort="Grid1_Sort"> - - + + + - \ No newline at end of file + diff --git a/HJGL/FineUIPro.Web/Email_Send/SelectUserControl.ascx.cs b/HJGL/FineUIPro.Web/Email_Send/SelectUserControl.ascx.cs index fbff4b8..d2e0d36 100644 --- a/HJGL/FineUIPro.Web/Email_Send/SelectUserControl.ascx.cs +++ b/HJGL/FineUIPro.Web/Email_Send/SelectUserControl.ascx.cs @@ -17,7 +17,8 @@ namespace FineUIPro.Web.Email_Send { if (!IsPostBack) { - BindGrid(); + BindGrid(""); + DataBindDrpUnit(); } } @@ -27,13 +28,13 @@ namespace FineUIPro.Web.Email_Send #region BindGrid - private void BindGrid() + private void BindGrid(string selectUnitId) { // 1.设置总项数（特别注意：数据库分页一定要设置总记录数RecordCount） - Grid1.RecordCount = GetTotalCount(); + Grid1.RecordCount = GetTotalCount(selectUnitId); // 2.获取当前分页数据 - DataTable table = GetPagedDataTable(); + DataTable table = GetPagedDataTable(selectUnitId); // 3.绑定到Grid Grid1.DataSource = table; @@ -44,21 +45,30 @@ namespace FineUIPro.Web.Email_Send /// 模拟返回总项数 /// /// - private int GetTotalCount() + private int GetTotalCount(string selectUnitId) { - return GetSource().Rows.Count; + return GetSource(selectUnitId).Rows.Count; } + private void DataBindDrpUnit() + { + var data = Funs.DB.Base_Unit.ToList(); + drpSearch.DataSource = data; + drpSearch.DataTextField = "UnitName"; + drpSearch.DataValueField = "UnitId"; + drpSearch.DataBind(); + drpSearch.Items.Insert(0,new ListItem("请选择单位","")); + } /// /// 模拟数据库分页（实际项目中请直接使用SQL语句返回分页数据！） /// /// - private DataTable GetPagedDataTable() + private DataTable GetPagedDataTable(string selectUnitId) { int pageIndex = Grid1.PageIndex; int pageSize = Grid1.PageSize; - DataTable table = GetSource(); + DataTable table = GetSource(selectUnitId); DataTable paged = table.Clone(); int rowbegin = pageIndex * pageSize; @@ -74,30 +84,36 @@ namespace FineUIPro.Web.Email_Send return paged; } - - private DataTable GetSource() + protected void drpSearch_SelectedIndexChanged(object sender, EventArgs e) + { + string rowId = this.drpSearch.SelectedValue; + this.BindGrid(rowId); + } + private DataTable GetSource(string selectUnitId) { string sortField = Grid1.SortField; string sortDirection = Grid1.SortDirection; - string strSql = @"select UserId,UserName,Email from Sys_User where 1=1"; + 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 +inner join Base_Unit as c on b.UnitId=c.UnitId where b.IsPost=1 order by c.UnitName "; List listStr = new List(); SqlParameter[] parameter = listStr.ToArray(); DataTable table2 = SQLHelper.GetDataTableRunText(strSql, parameter); - DataView view2 = table2.DefaultView; - view2.Sort = String.Format("{0} {1}", sortField, sortDirection); - + List filters = new List(); string searchKeyword = ttbSearch.Text.Trim(); if (!String.IsNullOrEmpty(searchKeyword) && ttbSearch.ShowTrigger1) { // RowFilter的用法：http://www.csharp-examples.net/dataview-rowfilter/ - filters.Add(String.Format("UserName LIKE '*{0}*'", EscapeLikeValue(searchKeyword))); + filters.Add(String.Format("(UnitName LIKE '*{0}*' or UserName like '*{0}*')", EscapeLikeValue(searchKeyword))); + } + if (!string.IsNullOrEmpty(selectUnitId)) + { + filters.Add(string.Format(" UnitId='{0}'", selectUnitId)); } - if (filters.Count > 0) { @@ -137,7 +153,7 @@ namespace FineUIPro.Web.Email_Send { //Grid1.PageIndex = e.NewPageIndex; - BindGrid(); + BindGrid(string.Empty); ; } protected void Grid1_Sort(object sender, GridSortEventArgs e) @@ -145,7 +161,7 @@ namespace FineUIPro.Web.Email_Send //Grid1.SortDirection = e.SortDirection; //Grid1.SortField = e.SortField; - BindGrid(); + BindGrid(string.Empty); } @@ -154,14 +170,14 @@ namespace FineUIPro.Web.Email_Send ttbSearch.Text = String.Empty; ttbSearch.ShowTrigger1 = false; - BindGrid(); + BindGrid(string.Empty); } protected void ttbSearch_Trigger2Click(object sender, EventArgs e) { ttbSearch.ShowTrigger1 = true; - BindGrid(); + BindGrid(string.Empty); } diff --git a/HJGL/FineUIPro.Web/Email_Send/SelectUserControl.ascx.designer.cs b/HJGL/FineUIPro.Web/Email_Send/SelectUserControl.ascx.designer.cs index ae1daf7..be1267b 100644 --- a/HJGL/FineUIPro.Web/Email_Send/SelectUserControl.ascx.designer.cs +++ b/HJGL/FineUIPro.Web/Email_Send/SelectUserControl.ascx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.Email_Send { - - - public partial class SelectUserControl { - +namespace FineUIPro.Web.Email_Send +{ + + + public partial class SelectUserControl + { + /// /// Panel7 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.Email_Send { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel7; - + /// /// Form5 控件。 /// @@ -29,7 +31,16 @@ namespace FineUIPro.Web.Email_Send { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form5; - + + /// + /// drpSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpSearch; + /// /// ttbSearch 控件。 /// @@ -38,7 +49,7 @@ namespace FineUIPro.Web.Email_Send { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TwinTriggerBox ttbSearch; - + /// /// Grid1 控件。 ///