提交代码

SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs

@@ -15,6 +15,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
         {
             if (!IsPostBack)
             {
+                BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
                 this.txtTrustDateMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
                 this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                 //BLL.Base_UnitService.InitProjectUnitDropDownList(this.drpNDEUnit, false, this.CurrUser.LoginProjectId, BLL.Const.UnitType_4, "请选择");
@@ -174,18 +175,22 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
                              && x.DetectionTypeId == e.NodeID.Split('|')[0]
                              orderby x.TrustBatchCode descending
                              select x;
+                if (this.drpUnit.SelectedValue != BLL.Const._Null)
+                {
+                    trusts = trusts.Where(x => x.UnitId == this.drpUnit.SelectedValue).OrderBy(x => x.TrustBatchCode);
+                }
                 foreach (var trust in trusts)
                 {
                     TreeNode newNode = new TreeNode();
                     string code = "FXWT-" + trust.TrustBatchCode.Substring(trust.TrustBatchCode.Length - 4);
                     if (string.Format("{0:yyyy-MM-dd}", trust.TrustDate) == string.Format("{0:yyyy-MM-dd}", System.DateTime.Now))
                     {
-                        newNode.Text = "<font color='#EE0000'>" + code + "</font>";
+                        newNode.Text = "<font color='#EE0000'>" + code + "【" + BLL.UnitService.GetUnitNameByUnitId(trust.UnitId) + "】" + "</font>";
                         newNode.ToolTip = "当天委托单";
                     }
                     else
                     {
-                        newNode.Text = code;
+                        newNode.Text = code + "【" + BLL.UnitService.GetUnitNameByUnitId(trust.UnitId) + "】";
                         newNode.ToolTip = "非当天委托单";
                     }
                     newNode.NodeID = trust.TrustBatchId;