HSE巡检调整
This commit is contained in:
@@ -29,17 +29,17 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
|
||||
/// <summary>
|
||||
/// 巡检类型 0 日常 1 常规
|
||||
/// </summary>
|
||||
public string Type
|
||||
{
|
||||
public string Type
|
||||
{
|
||||
get
|
||||
{
|
||||
return (string )ViewState["Type"];
|
||||
return (string)ViewState["Type"];
|
||||
}
|
||||
set
|
||||
set
|
||||
{
|
||||
ViewState["Type"] = value;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
@@ -90,11 +90,11 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
|
||||
strSql += " AND CheckManName LIKE @CheckMan";
|
||||
listStr.Add(new SqlParameter("@CheckMan", "%" + this.txtCheckMan.Text.Trim() + "%"));
|
||||
}
|
||||
if (!string.IsNullOrEmpty(this.txtType.Text.Trim()))
|
||||
{
|
||||
strSql += " AND RegisterTypesName LIKE @Type";
|
||||
listStr.Add(new SqlParameter("@Type", "%" + this.txtType.Text.Trim() + "%"));
|
||||
}
|
||||
//if (!string.IsNullOrEmpty(this.txtType.Text.Trim()))
|
||||
//{
|
||||
// strSql += " AND RegisterTypesName LIKE @Type";
|
||||
// listStr.Add(new SqlParameter("@Type", "%" + this.txtType.Text.Trim() + "%"));
|
||||
//}
|
||||
if (!string.IsNullOrEmpty(this.txtWorkAreaName.Text.Trim()))
|
||||
{
|
||||
strSql += " AND WorkAreaName LIKE @WorkAreaName";
|
||||
@@ -149,7 +149,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
|
||||
Grid1.RecordCount = tb.Rows.Count;
|
||||
Grid1.RecordCount = tb.Rows.Count;
|
||||
var table = this.GetPagedDataTable(Grid1, tb);
|
||||
|
||||
Grid1.DataSource = table;
|
||||
@@ -175,7 +175,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Grid1_Sort(object sender, GridSortEventArgs e)
|
||||
{
|
||||
{
|
||||
BindGrid();
|
||||
}
|
||||
|
||||
@@ -256,7 +256,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
|
||||
{
|
||||
if (registration.CheckManId == this.CurrUser.UserId) //当前人是检查人,可以在整改前继续编辑
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?HazardRegisterId={0}&&Type={1}", RegistrationId,Type, "编辑 - ")));
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?HazardRegisterId={0}&&Type={1}", RegistrationId, Type, "编辑 - ")));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -371,7 +371,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
|
||||
{
|
||||
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnAdd))
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?Type={0}",Type, "登记 - ")));
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?Type={0}", Type, "登记 - ")));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -418,7 +418,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
|
||||
if (getD != null)
|
||||
{
|
||||
BLL.LogService.AddSys_Log(this.CurrUser, getD.HazardCode, getD.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnDelete);
|
||||
BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(RegistrationId);
|
||||
BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(RegistrationId);
|
||||
BindGrid();
|
||||
ShowNotify("删除成功!", MessageBoxIcon.Success);
|
||||
}
|
||||
@@ -470,6 +470,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
|
||||
#endregion
|
||||
|
||||
#region 格式化字符串
|
||||
|
||||
/// <summary>
|
||||
/// 获取整改前图片
|
||||
/// </summary>
|
||||
@@ -640,7 +641,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
|
||||
this.BindGrid();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
@@ -659,7 +660,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
|
||||
{
|
||||
hazardRegisterIds = hazardRegisterIds.Substring(0, hazardRegisterIds.LastIndexOf(","));
|
||||
}
|
||||
// PageContext.RegisterStartupScript(Window4.GetShowReference(String.Format("HiddenRectificationPrint.aspx?HazardRegisterIds={0}&CheckType={1}", hazardRegisterIds,"0", "查看 - ")));
|
||||
// PageContext.RegisterStartupScript(Window4.GetShowReference(String.Format("HiddenRectificationPrint.aspx?HazardRegisterIds={0}&CheckType={1}", hazardRegisterIds,"0", "查看 - ")));
|
||||
this.hdRemark.Text = string.Empty;
|
||||
//}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user