1、系统菜单调整;

2、系统看板UI调整;
3、事故事件功能
4、其他
This commit is contained in:
2025-12-10 15:58:02 +08:00
parent 3d00bb7a94
commit 6619f1e004
276 changed files with 131707 additions and 50045 deletions
+25 -19
View File
@@ -10,9 +10,9 @@ namespace FineUIPro.Web.SysManage
public partial class Unit : PageBase
{
protected void Page_Load(object sender, EventArgs e)
{
{
if (!IsPostBack)
{
{
////权限按钮方法
this.GetButtonPower();
this.btnNew.OnClientClick = Window1.GetShowReference("UnitEdit.aspx") + "return false;";
@@ -20,35 +20,41 @@ namespace FineUIPro.Web.SysManage
if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
{
Grid1.PageSize = this.CurrUser.PageSize.Value;
}
}
this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
this.BindGrid();
}
}
/// <summary>
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT Unit.UnitId,Unit.UnitCode,Unit.UnitName,Unit.ProjectRange,Unit.Corporate,Unit.Address,Unit.Telephone,Unit.Fax,Unit.EMail,UnitType.UnitTypeId,UnitType.UnitTypeCode,UnitType.UnitTypeName,Unit.IsBranch,supUnit.UnitName AS supUnitName"
+ @" From dbo.Base_Unit AS Unit "
+ @" LEFT JOIN Base_UnitType AS UnitType ON UnitType.UnitTypeId=Unit.UnitTypeId"
+ @" LEFT JOIN Base_Unit AS supUnit ON Unit.SupUnitId=supUnit.UnitId"
+ @" WHERE 1=1";
List<SqlParameter> listStr = new List<SqlParameter>();
//string strSql = @"SELECT Unit.UnitId,Unit.UnitCode,Unit.UnitName,Unit.ProjectRange,Unit.Corporate,Unit.Address,Unit.Telephone,Unit.Fax,Unit.EMail,UnitType.UnitTypeId,UnitType.UnitTypeCode,UnitType.UnitTypeName,Unit.IsBranch,supUnit.UnitName AS supUnitName"
// + @" From dbo.Base_Unit AS Unit "
// + @" LEFT JOIN Base_UnitType AS UnitType ON UnitType.UnitTypeId=Unit.UnitTypeId"
// + @" LEFT JOIN Base_Unit AS supUnit ON Unit.SupUnitId=supUnit.UnitId"
// + @" WHERE 1=1";
string strSql = @"SELECT Unit.UnitId,Unit.UnitCode,Unit.UnitName,Unit.ProjectRange,Unit.Corporate,Unit.Address,Unit.Telephone,Unit.Fax,Unit.EMail,UnitType.UnitTypeId,UnitType.UnitTypeCode,UnitType.UnitTypeName,Unit.IsBranch,
(case Unit.IsBranch when '1' then ( select UnitId from Base_Unit where IsThisUnit=1 ) else '0' end ) as SuperUnitId
From dbo.Base_Unit AS Unit
LEFT JOIN Base_UnitType AS UnitType ON UnitType.UnitTypeId=Unit.UnitTypeId
WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtUnitName.Text.Trim()))
{
strSql += " AND Unit.UnitName LIKE @UnitName";
listStr.Add(new SqlParameter("@UnitName", "%" + this.txtUnitName.Text.Trim() + "%"));
}
strSql += " order by IsThisUnit desc,Unit.UnitCode ";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
//var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = tb;
Grid1.DataBind();
}
@@ -80,7 +86,7 @@ namespace FineUIPro.Web.SysManage
this.btnNew.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnModify))
{
{
this.btnMenuEdit.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnDelete))
@@ -94,7 +100,7 @@ namespace FineUIPro.Web.SysManage
}
}
#endregion
/// <summary>
/// 右键删除事件
/// </summary>
@@ -174,7 +180,7 @@ namespace FineUIPro.Web.SysManage
{
BindGrid();
}
/// <summary>
/// Grid行双击事件
/// </summary>
@@ -208,7 +214,7 @@ namespace FineUIPro.Web.SysManage
if (!this.btnMenuEdit.Hidden) ////双击事件 编辑权限有:编辑页面,无:查看页面 或者状态是完成时查看页面
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("UnitEdit.aspx?UnitId={0}", Grid1.SelectedRowID, "编辑 - ")));
}
}
else
{
Alert.ShowInTop("您没有权限修改别单位信息!", MessageBoxIcon.Warning);
@@ -224,7 +230,7 @@ namespace FineUIPro.Web.SysManage
private string judgementDelete(string id)
{
string content = string.Empty;
var unit =Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == id) ;
var unit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == id);
if (unit != null && unit.UnitId == Const.UnitId_XJYJ)
{
content += "【本单位】,不能删除!";
@@ -245,7 +251,7 @@ namespace FineUIPro.Web.SysManage
/// <param name="e"></param>
protected void btnImport_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("UnitIn.aspx","","导入 - ")));
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("UnitIn.aspx", "", "导入 - ")));
}
/// <summary>