Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx

@@ -18,7 +18,7 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" runat="server">
                             <Items>
-                                <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程名称" LabelWidth="120px" LabelAlign="Right" EnableEdit="true"></f:DropDownList>
+                                <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程名称" LabelWidth="120px" LabelAlign="Right" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpUnitWork_SelectedIndexChanged"></f:DropDownList>
                                 <f:DropDownList ID="drpBranchEngineering" runat="server" Label="分部工程名称" LabelWidth="120px" LabelAlign="Right" EnableEdit="true"></f:DropDownList>
                                 <f:Button ID="btnSearch" runat="server" Text="查询" Icon="SystemSearch" OnClick="btnSearch_Click"></f:Button>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>

SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.cs

@@ -25,11 +25,11 @@ namespace FineUIPro.Web.CQMS.WBS.Control
             {
                 BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWork, this.CurrUser.LoginProjectId, true);
 
-                var subProjectLists = from x in Funs.DB.Division_SubProjects where x.ProjectId==this.CurrUser.LoginProjectId && x.ParentId==null select x;
+                //var subProjectLists = from x in Funs.DB.Division_SubProjects where x.ProjectId==this.CurrUser.LoginProjectId && x.ParentId==null select x;
-                this.drpBranchEngineering.DataTextField = "BranchEngineeringName";
+                //this.drpBranchEngineering.DataTextField = "BranchEngineeringName";
-                this.drpBranchEngineering.DataValueField = "DivisionId";
+                //this.drpBranchEngineering.DataValueField = "DivisionId";
-                this.drpBranchEngineering.DataSource = subProjectLists;
+                //this.drpBranchEngineering.DataSource = subProjectLists;
-                this.drpBranchEngineering.DataBind();
+                //this.drpBranchEngineering.DataBind();
                 Funs.FineUIPleaseSelect(this.drpBranchEngineering);
 
                 BindGrid();
@@ -208,5 +208,33 @@ namespace FineUIPro.Web.CQMS.WBS.Control
             }
         }
         #endregion
+
+        /// <summary>
+        /// 单位工程下拉选择
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpUnitWork_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.drpBranchEngineering.Items.Clear();
+            if (this.drpUnitWork.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpUnitWork.SelectedValue))
+            {
+                var q = (from x in Funs.DB.View_WBS_DivisionDivide
+                         where x.ProjectId == this.CurrUser.LoginProjectId
+                         && x.UnitWorkId == this.drpUnitWork.SelectedValue
+                         && x.ParentId==null
+                         select new
+                         {
+                             x.DivisionId,
+                             x.BranchEngineeringName
+                         }).Distinct().ToList();
+                this.drpBranchEngineering.DataTextField = "BranchEngineeringName";
+                this.drpBranchEngineering.DataValueField = "DivisionId";
+                this.drpBranchEngineering.DataSource = q;
+                this.drpBranchEngineering.DataBind();
+                Funs.FineUIPleaseSelect(this.drpBranchEngineering);
+                this.drpBranchEngineering.SelectedIndex = 0;
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNewEdit.aspx.cs

@@ -235,11 +235,11 @@ namespace FineUIPro.Web.CQMS.WBS.Control
                     }
                     else
                     {
-                        var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
+                        //var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
-                        if (sub.DivisionLevel == 1)
+                        //if (sub.DivisionLevel == 1)
-                        {
+                        //{
                             newSubProjects.DivisionLevel = 2;
-                        }
+                        //}
                         newSubProjects.ProEngineeringName = this.txtProEngineeringName.Text.Trim();
                         newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects));
                         this.DivisionId = newSubProjects.DivisionId;
@@ -264,15 +264,15 @@ namespace FineUIPro.Web.CQMS.WBS.Control
                     }
                     else
                     {
-                        var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
+                        //var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
-                        if (sub.DivisionLevel == 1)
+                        //if (sub.DivisionLevel == 1)
-                        {
+                        //{
-                            newSubProjects.DivisionLevel = 2;
+                        //    newSubProjects.DivisionLevel = 2;
-                        }
+                        //}
-                        else if (sub.DivisionLevel==2)
+                        //else if (sub.DivisionLevel==2)
-                        {
+                        //{
                             newSubProjects.DivisionLevel = 3;
-                        }
+                        //}
                         newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects));
                         this.DivisionId = newSubProjects.DivisionId;
                         BLL.SubProjectsService.AddSubProjects(newSubProjects);

SGGL/FineUIPro.Web/common/Menu_CQMS.xml

@@ -8,9 +8,10 @@
 <TreeNode id="6769098A-53D7-4585-87CC-2DADBCBC2C74" Text="类似项目施工经验总结清单" NavigateUrl="CQMS/QualityPlanning/ConExperienceSummary.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="3B322232-38A1-4291-9832-CD4A01C2A975" Text="检验试验计划/单位分部分项工程划分" NavigateUrl=""><TreeNode id="1025D812-2325-4FE9-A1E9-D53F2CAACDC6" Text="现场控制点裁剪(新)" NavigateUrl="CQMS/WBS/Control/PointCropping.aspx"></TreeNode>
-<TreeNode id="17E206A1-E06B-40C0-8DCB-E3AAA2E3B339" Text="分部分项工程(新)" NavigateUrl="CQMS/WBS/Control/DivisionSubProjects.aspx"></TreeNode>
+<TreeNode id="0E1CCE60-6F9D-419D-B763-E9E0AF5621E6" Text="单位分部分项工程划分、裁剪" NavigateUrl=""><TreeNode id="17E206A1-E06B-40C0-8DCB-E3AAA2E3B339" Text="分部分项工程数据库" NavigateUrl="CQMS/WBS/Control/DivisionSubProjectsNew.aspx"></TreeNode>
 <TreeNode id="FB94A120-921B-4AAB-B54F-EC11B6F561FD" Text="单位分部分项工程划分、裁剪" NavigateUrl="CQMS/WBS/Control/DivisionDivideAndCrop.aspx"></TreeNode>
 <TreeNode id="BA250432-492B-49A3-8BB6-D04BF74D2EDD" Text="单位分部分项工程划分表" NavigateUrl="CQMS/WBS/Control/DivisionDivideList.aspx"></TreeNode>
+</TreeNode>
 <TreeNode id="5AA08233-9E04-4808-AC43-DD411C5F9D31" Text="现场控制点裁剪" NavigateUrl="CQMS/WBS/ProjectControlPoint.aspx"></TreeNode>
 <TreeNode id="88F115C3-D193-4455-8E8D-76F2EAF56291" Text="现场控制点资料柜" NavigateUrl="CQMS/WBS/ProjectControlPointFile.aspx"></TreeNode>
 </TreeNode>