河北专项检查和移动端
This commit is contained in:
@@ -50,12 +50,14 @@ namespace FineUIPro.Web.HSSE.Meeting
|
||||
this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
|
||||
this.drpUnitId.Enabled = false;
|
||||
}
|
||||
this.btnNew.OnClientClick = Window1.GetShowReference("ClassMeetingEdit.aspx") + "return false;";
|
||||
|
||||
if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
|
||||
{
|
||||
Grid1.PageSize = this.CurrUser.PageSize.Value;
|
||||
}
|
||||
this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
|
||||
this.txtStartTime.Text = DateTime.Today.ToString("yyyy-MM-dd");
|
||||
this.txtEndTime.Text = DateTime.Today.ToString("yyyy-MM-dd");
|
||||
// 绑定表格
|
||||
this.BindGrid();
|
||||
}
|
||||
@@ -72,7 +74,7 @@ namespace FineUIPro.Web.HSSE.Meeting
|
||||
+ @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON ClassMeeting.ClassMeetingId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
|
||||
+ @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId"
|
||||
+ @" LEFT JOIN Sys_User AS Users ON ClassMeeting.CompileMan = Users.UserId"
|
||||
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId WHERE 1=1 ";
|
||||
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=ClassMeeting.UnitId WHERE 1=1 ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
|
||||
{
|
||||
@@ -84,15 +86,15 @@ namespace FineUIPro.Web.HSSE.Meeting
|
||||
strSql += " AND Unit.UnitId = @UnitId";
|
||||
listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
|
||||
}
|
||||
if (!string.IsNullOrEmpty(this.txtClassMeetingCode.Text.Trim()))
|
||||
if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
|
||||
{
|
||||
strSql += " AND ClassMeetingCode LIKE @ClassMeetingCode";
|
||||
listStr.Add(new SqlParameter("@ClassMeetingCode", "%" + this.txtClassMeetingCode.Text.Trim() + "%"));
|
||||
strSql += " AND ClassMeeting.CompileDate >= @StartTime";
|
||||
listStr.Add(new SqlParameter("@StartTime", string.Format("{0} {1}", this.txtStartTime.Text.Trim(), "00:00:00")));
|
||||
}
|
||||
if (!string.IsNullOrEmpty(this.txtClassMeetingName.Text.Trim()))
|
||||
if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
|
||||
{
|
||||
strSql += " AND ClassMeetingName LIKE @ClassMeetingName";
|
||||
listStr.Add(new SqlParameter("@ClassMeetingName", "%" + this.txtClassMeetingName.Text.Trim() + "%"));
|
||||
strSql += " AND ClassMeeting.CompileDate <= @EndTime";
|
||||
listStr.Add(new SqlParameter("@EndTime", string.Format("{0} {1}", this.txtEndTime.Text.Trim(), "23:59:59")));
|
||||
}
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
@@ -269,10 +271,6 @@ namespace FineUIPro.Web.HSSE.Meeting
|
||||
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectClassMeetingMenuId);
|
||||
if (buttonList.Count() > 0)
|
||||
{
|
||||
if (buttonList.Contains(BLL.Const.BtnAdd))
|
||||
{
|
||||
this.btnNew.Hidden = false;
|
||||
}
|
||||
if (buttonList.Contains(BLL.Const.BtnModify))
|
||||
{
|
||||
this.btnMenuEdit.Hidden = false;
|
||||
|
||||
Reference in New Issue
Block a user