fix:升级

SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs

@@ -15,9 +15,8 @@ namespace FineUIPro.Web.CQMS.WBS
 {
     public partial class ProjectControlPoint : PageBase
     {
-        #region 项目主键
         /// <summary>
-        /// 项目主键
+        /// 主键
         /// </summary>
         public string ProjectId
         {
@@ -30,7 +29,6 @@ namespace FineUIPro.Web.CQMS.WBS
                 ViewState["ProjectId"] = value;
             }
         }
-        #endregion
         /// <summary>
         /// 被选择项列表
         /// </summary>
@@ -71,12 +69,13 @@ namespace FineUIPro.Web.CQMS.WBS
         {
             if (!IsPostBack)
             {
+                this.SelectedList = new List<string>();
+                this.NoSelectedList = new List<string>();
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
                 if (!string.IsNullOrEmpty(this.ProjectId))
@@ -85,9 +84,6 @@ namespace FineUIPro.Web.CQMS.WBS
                     ////权限按钮方法
                     this.GetButtonPower();
                 }
-                this.SelectedList = new List<string>();
-                this.NoSelectedList = new List<string>();
-                //GetButtonPower();
                 InitTreeMenu();
                 this.Grid1.Columns[2].Hidden = false;
                 this.Grid1.Columns[3].Hidden = true;
@@ -102,8 +98,7 @@ namespace FineUIPro.Web.CQMS.WBS
             }
         }
         #endregion
-
-        #region  加载树
+        
         /// <summary>
         /// 公司级树加载
         /// </summary>
@@ -112,23 +107,21 @@ namespace FineUIPro.Web.CQMS.WBS
         protected void changeTree(object sender, EventArgs e)
         {
             this.ProjectId = this.ucTree.ProjectId;
-
+            this.GetButtonPower();
             if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
             {
                 btnNew.Hidden = true;
+                btnSave.Hidden = true;
             }
-            this.GetButtonPower();
             this.InitTreeMenu();
         }
+
+        #region  加载树
         /// <summary>
         /// 加载树
         /// </summary>
         private void InitTreeMenu()
         {
-            if (string.IsNullOrEmpty(this.ProjectId))
-            {
-                return;
-            }
             this.trWBS.Nodes.Clear();
             this.trWBS.ShowBorder = false;
             this.trWBS.ShowHeader = false;
@@ -329,10 +322,6 @@ namespace FineUIPro.Web.CQMS.WBS
         /// <param name="e"></param>
         protected void trWBS_NodeCheck(object sender, FineUIPro.TreeCheckEventArgs e)
         {
-            if (string.IsNullOrEmpty(this.ProjectId))
-            {
-                return;
-            }
             if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnSave))
             {
                 Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(e.NodeID);
@@ -1409,11 +1398,15 @@ namespace FineUIPro.Web.CQMS.WBS
                 }
                 else if (CheckAcceptType.ToString() == "4")
                 {
-                    name = "单位工程一次验收";
+                    name = "单位工程验收";
                 }
                 else if (CheckAcceptType.ToString() == "5")
                 {
-                    name = "材料进场复验";
+                    name = "分部工程验收";
+                }
+                else if (CheckAcceptType.ToString() == "6")
+                {
+                    name = "分项工程验收";
                 }
             }
             return name;