1

2025-04-11 11:36:28 +08:00 · 2025-04-11 11:36:28 +08:00 · 35e0ebb3b9
parent 2a876b4c2f
commit 35e0ebb3b9
3 changed files with 234 additions and 128 deletions
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx
@ -1,5 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DesignChangeOrder.aspx.cs" Inherits="FineUIPro.Web.Comprehensive.DesignChangeOrder" %>

+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>

 <html xmlns="http://www.w3.org/1999/xhtml">
@ -9,9 +11,21 @@
 </head>
 <body>
    <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
                    <Items>
                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设计变更单" EnableCollapse="true"
                            runat="server" BoxFlex="1" DataKeyNames="DesignChangeOrderId" AllowCellEditing="true" EnableColumnLines="true"
@ -83,7 +97,7 @@
                                <f:RenderField ColumnID="CompleteDate" DataField="CompleteDate" FieldType="Date" Renderer="Date" HeaderText="施工完成日期" TextAlign="Center"
                                    HeaderTextAlign="Center" Width="120px">
                                </f:RenderField>
-                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
+                                <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
                                    <ItemTemplate>
                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
                                            Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("DesignChangeOrderId")) %>' ToolTip="附件查看"></asp:LinkButton>
@ -107,6 +121,8 @@
                        </f:Grid>
                    </Items>
                </f:Panel>
+            </Items>
+        </f:Panel>
        <f:Window ID="Window1" Title="设计变更单管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
            Width="900px" Height="400px">
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs
@ -8,6 +8,23 @@ namespace FineUIPro.Web.Comprehensive
 {
    public partial class DesignChangeOrder : PageBase
    {
+
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
        #region 加载
        /// <summary>
        /// 加载页面
@ -18,17 +35,52 @@ namespace FineUIPro.Web.Comprehensive
        {
            if (!IsPostBack)
            {
-                GetButtonPower();
+                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))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+
                BLL.CNProfessionalService.InitCNProfessionalDownList(this.sdrpCNProfessionalId, true);
                BindGrid();
            }
        }

+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            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 C.DesignChangeOrderId,
                                     C.ProjectId, 
                                     C.CNProfessionalId,
@ -49,7 +101,7 @@ 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));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
            SqlParameter[] parameter = listStr.ToArray();
            if (this.sdrpCNProfessionalId.SelectedValue != BLL.Const._Null)
            {
@ -289,7 +341,7 @@ namespace FineUIPro.Web.Comprehensive
            {
                return;
            }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DesignChangeOrderMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.DesignChangeOrderMenuId);
            if (buttonList.Count() > 0)
            {
                if (buttonList.Contains(BLL.Const.BtnAdd))
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.designer.cs
@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.Comprehensive {
+namespace FineUIPro.Web.Comprehensive
+{


-    public partial class DesignChangeOrder {
+    public partial class DesignChangeOrder
+    {

        /// <summary>
        /// form1 控件。
@ -39,6 +41,42 @@ namespace FineUIPro.Web.Comprehensive {
        /// </remarks>
        protected global::FineUIPro.Panel Panel1;

+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
        /// <summary>
        /// Grid1 控件。
        /// </summary>