公司级树补充

This commit is contained in:
2025-04-11 11:33:48 +08:00
parent ae90319ee4
commit 2a876b4c2f
21 changed files with 1332 additions and 662 deletions
@@ -9,6 +9,22 @@ namespace FineUIPro.Web.Comprehensive
{
public partial class InspectionEquipment : PageBase
{
#region
/// <summary>
/// 项目主键
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
#endregion
#region
/// <summary>
/// 加载页面
@@ -19,17 +35,55 @@ namespace FineUIPro.Web.Comprehensive
{
if (!IsPostBack)
{
GetButtonPower();
BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.CurrUser.LoginProjectId, true);
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
this.InitDropDownList();
this.ucTree.UnitId = this.CurrUser.UnitId;
this.ucTree.ProjectId = this.ProjectId;
if (!string.IsNullOrEmpty(this.ProjectId))
{
this.panelLeftRegion.Hidden = true;
////权限按钮方法
this.GetButtonPower();
}
BindGrid();
}
}
private void InitDropDownList()
{
BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.ProjectId, true);
}
/// <summary>
/// 公司级树加载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void changeTree(object sender, EventArgs e)
{
this.ProjectId = this.ucTree.ProjectId;
this.InitDropDownList();
if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
btnNew.Hidden = true;
}
this.GetButtonPower();
this.BindGrid();
}
/// <summary>
/// 数据绑定
/// </summary>
public void BindGrid()
{
if (string.IsNullOrEmpty(this.ProjectId))
{
return;
}
string strSql = @"select InspectionEquipmentId,ProjectId,C.UnitId,Status, U.UnitName,InspectionCode,CN.ProfessionalName,InspectionName,Specifications,
Supplier,Counts,SamplingCount,(CASE WHEN SamplingResult=1 THEN '合格' WHEN SamplingResult=0 THEN '不合格' ELSE '' END) AS SamplingResult,
InspectionDate,AttachUrl,Attribute,RemarkCode,UsedPlace,EquipmentNO from Comprehensive_InspectionEquipment C
@@ -37,8 +91,8 @@ namespace FineUIPro.Web.Comprehensive
left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId
where C.ProjectId = @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (sdrpUnitId.SelectedValue != BLL.Const._Null)
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
if (this.sdrpUnitId.SelectedValue != null && this.sdrpUnitId.SelectedValue != BLL.Const._Null)
{
strSql += " AND C.UnitId=@UnitId";
listStr.Add(new SqlParameter("@UnitId", sdrpUnitId.SelectedValue));
@@ -214,7 +268,7 @@ namespace FineUIPro.Web.Comprehensive
{
return;
}
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.InspectionEquipmentMenuId);
var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.InspectionEquipmentMenuId);
if (buttonList.Count() > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))
@@ -270,31 +324,31 @@ namespace FineUIPro.Web.Comprehensive
public static string ConvertState(object Status)
{
if (Status != null)
{
if (Status != null)
{
if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReCompile)
{
if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReCompile)
{
return "重报";
}
else if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReJect)
{
return "驳回";
}
else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Compile)
{
return "编制";
}
else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Audit)
{
return "待审批";
}
else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Complete)
{
return "审批完成";
}
return "重报";
}
else if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReJect)
{
return "驳回";
}
else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Compile)
{
return "编制";
}
else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Audit)
{
return "待审批";
}
else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Complete)
{
return "审批完成";
}
}
return "编制";
}