月报权限修改,考试记录查询条件修改
This commit is contained in:
parent
6515f5e4b9
commit
156069a20b
|
@ -760,7 +760,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
|
|||
{
|
||||
return;
|
||||
}
|
||||
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.WeekReportMenuId);
|
||||
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CQMonthReportMenuId);
|
||||
if (buttonList.Count() > 0)
|
||||
{
|
||||
if (buttonList.Contains(BLL.Const.BtnAdd))
|
||||
|
|
|
@ -34,8 +34,8 @@
|
|||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
|
||||
<Items>
|
||||
<f:TextBox ID="txtName" runat="server" Label="查询" EmptyText="输入查询条件" AutoPostBack="true"
|
||||
OnTextChanged="TextBox_TextChanged" Width="180px" LabelWidth="60px" LabelAlign="Right">
|
||||
<f:TextBox ID="txtName" runat="server" Label="查询" EmptyText="输入姓名、公司名称、考试计划名称或培训名称" AutoPostBack="true"
|
||||
OnTextChanged="TextBox_TextChanged" Width="400px" LabelWidth="60px" LabelAlign="Right">
|
||||
</f:TextBox>
|
||||
<f:NumberBox runat="server" ID="txtMinScores" Label="分值范围" AutoPostBack="true" NoNegative="true"
|
||||
OnTextChanged="TextBox_TextChanged" Width="180px" LabelWidth="80px" LabelAlign="Right">
|
||||
|
|
|
@ -78,7 +78,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
|||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
|
||||
{
|
||||
strSql += " AND (Person.PersonName LIKE @name OR TestPlan.PlanName LIKE @name OR Training.TrainingName LIKE @name)";
|
||||
strSql += " AND (Person.PersonName LIKE @name OR TestPlan.PlanName LIKE @name OR Training.TrainingName LIKE @name OR Unit.UnitName like @name)";
|
||||
listStr.Add(new SqlParameter("@name", "%" + this.txtName.Text.Trim() + "%"));
|
||||
}
|
||||
if (!string.IsNullOrEmpty(this.txtMinScores.Text.Trim()))
|
||||
|
|
Loading…
Reference in New Issue