提交代码
This commit is contained in:
@@ -14,6 +14,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
|
||||
{
|
||||
if (!IsPostBack)
|
||||
{
|
||||
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
|
||||
this.txtRepairMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
|
||||
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
|
||||
this.InitTreeMenu();//加载树
|
||||
@@ -243,6 +244,10 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
|
||||
&& x.UnitWorkId == ChildNodes.NodeID
|
||||
orderby x.RepairRecordCode descending
|
||||
select x;
|
||||
if (this.drpUnit.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
repairs = repairs.Where(x => x.UnitId == this.drpUnit.SelectedValue).OrderBy(x => x.RepairRecordCode);
|
||||
}
|
||||
foreach (var r in repairs)
|
||||
{
|
||||
var jot = BLL.WeldJointService.GetWeldJointByWeldJointId(r.WeldJointId);
|
||||
@@ -287,16 +292,16 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
|
||||
}
|
||||
if (b)
|
||||
{
|
||||
newNode.Text = iso.PipelineCode + "-" + jot.WeldJointCode + r.RepairMark;
|
||||
newNode.Text = iso.PipelineCode + "-" + jot.WeldJointCode + r.RepairMark + "【" + BLL.UnitService.GetUnitNameByUnitId(r.UnitId) + "】";
|
||||
}
|
||||
else
|
||||
{
|
||||
newNode.Text = "<font color='#EE0000'>" + iso.PipelineCode + "-" + jot.WeldJointCode + r.RepairMark + "</font>";
|
||||
newNode.Text = "<font color='#EE0000'>" + iso.PipelineCode + "-" + jot.WeldJointCode + r.RepairMark + "【" + BLL.UnitService.GetUnitNameByUnitId(r.UnitId) + "】" + "</font>";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
newNode.Text = iso.PipelineCode + "-" + jot.WeldJointCode + r.RepairMark;
|
||||
newNode.Text = iso.PipelineCode + "-" + jot.WeldJointCode + r.RepairMark + "【" + BLL.UnitService.GetUnitNameByUnitId(r.UnitId) + "】";
|
||||
}
|
||||
newNode.NodeID = r.RepairRecordId;
|
||||
newNode.ToolTip = "返修单";
|
||||
|
||||
Reference in New Issue
Block a user