焊接修改

2025-09-24 17:31:28 +08:00
parent cb92dcb730
commit 0f70405339
64 changed files with 2492 additions and 2040 deletions
@@ -13,7 +13,7 @@
        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
            <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="评标小组名单审批" EnableCollapse="true"
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="评标委员会组建审批" EnableCollapse="true"
                    runat="server" BoxFlex="1" DataKeyNames="ApproveUserReviewID" AllowCellEditing="true"
                    ClicksToEdit="2" DataIDField="ApproveUserReviewID" AllowSorting="true" OnSort="Grid1_Sort"
                    SortDirection="DESC" EnableColumnLines="true" OnRowDoubleClick="Grid1_RowDoubleClick" OnPageIndexChange="Grid1_PageIndexChange"
@@ -110,7 +110,7 @@
                </f:Grid>
            </Items>
        </f:Panel>
-        <f:Window ID="Window1" Title="评标小组名单审批" Hidden="true" EnableIFrame="true" EnableMaximize="true" Maximized="false"
+        <f:Window ID="Window1" Title="评标委员会组建审批" Hidden="true" EnableIFrame="true" EnableMaximize="true" Maximized="false"
            Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close"  EnableDrag="true"
            Width="1200px" Height="650px">
        </f:Window>
@@ -32,7 +32,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                    Const.ContractReviewing.ToString (),
                    Const.ContractReview_Refuse.ToString()
                };
-                btnNew.OnClientClick = Window1.GetShowReference("ApproveUserReviewEdit.aspx", "评标小组名单审批创建") + "return false;";
+                btnNew.OnClientClick = Window1.GetShowReference("ApproveUserReviewEdit.aspx", "评标委员会组建审批") + "return false;";
                GetButtonPower();
                BindGrid();
            }
@@ -97,13 +97,12 @@

                        <f:DropDownList ID="DropApproval_Construction" runat="server" AutoPostBack="true" EnableEdit="true" Label="主办部门负责人" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
                    </Items>
-                </f:FormRow>
-
- <%--               <f:FormRow>
+                </f:FormRow> 
+                <f:FormRow>
                    <Items>
-                        <f:DropDownList ID="DropDeputyGeneralManager" runat="server" AutoPostBack="true" EnableEdit="true" Label="项目主管领导" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
+                        <f:DropDownList ID="DropDeputyGeneralManager" runat="server" AutoPostBack="true" EnableEdit="true" Label="分管领导" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
                    </Items>
-                </f:FormRow>--%>
+                </f:FormRow>
                <f:FormRow>
                    <Items>
                        <f:Label ID="label12" runat="server" Text="注：“说明”栏填写内容为“技术或技术组小组长”或“商务或商务组小组长”或“评标组长”。"></f:Label>
@@ -50,6 +50,9 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropApproval_Construction, null, CurrUser.UnitId, Const.ConstructionMinister + "," + Const.ConstructionViceMinister, false);

                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropConstructionManager, null, Const.UnitId_SEDIN, null, true);
+                //分管领导
+                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropDeputyGeneralManager, null, this.CurrUser.UnitId, Const.DeputyGeneralManager, false);
+
                Bind();
                BindGrid();
                #region Grid1
@@ -109,7 +112,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                    DropConstructionManager.SelectedValue = Bid.ConstructionManager;
                    //  DropProjectManager.SelectedValue = Bid.ProjectManager;
                    DropApproval_Construction.SelectedValue = Bid.Approval_Construction;
-                    //DropDeputyGeneralManager.SelectedValue = Bid.DeputyGeneralManager;
+                    DropDeputyGeneralManager.SelectedValue = Bid.DeputyGeneralManager;
                    DropDepart.SelectedValue = Bid.DepartId;
                }

@@ -192,12 +195,12 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                return false;

            }
-            //if (DropDeputyGeneralManager.SelectedValue == Const._Null)
-            //{
-            //    ShowNotify("请选择分管副总经理！", MessageBoxIcon.Warning);
-            //    return false;
+/*            if (DropDeputyGeneralManager.SelectedValue == Const._Null)
+            {
+                ShowNotify("请选择分管副总经理！", MessageBoxIcon.Warning);
+                return false;

-            //}
+            }*/

            Model.PHTGL_BidApproveUserReview newtable = new Model.PHTGL_BidApproveUserReview();
            var Bid = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(drpBidDocumentCode.SelectedValue);
@@ -211,7 +214,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
            newtable.ConstructionManager = DropConstructionManager.SelectedValue;
            // newtable.ProjectManager = DropProjectManager.SelectedValue;
            newtable.Approval_Construction = DropApproval_Construction.SelectedValue;
-            // newtable.DeputyGeneralManager = DropDeputyGeneralManager.SelectedValue;
+            newtable.DeputyGeneralManager = DropDeputyGeneralManager.SelectedValue;
            newtable.DepartId = DropDepart.SelectedValue;
            if (string.IsNullOrEmpty(ApproveUserReviewID))
            {
@@ -194,6 +194,15 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
        /// </remarks>
        protected global::FineUIPro.DropDownList DropApproval_Construction;

+        /// <summary>
+        /// DropDeputyGeneralManager 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList DropDeputyGeneralManager;
+
        /// <summary>
        /// label12 控件。
        /// </summary>