From ca74968104bb7f647269738ba6b53c7158e261c7 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Thu, 16 Mar 2023 18:20:05 +0800 Subject: [PATCH] =?UTF-8?q?2023-03-16=20=E5=A2=9E=E5=8A=A0=E6=96=BD?= =?UTF-8?q?=E5=B7=A5=E5=8A=B3=E5=8A=A1=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2023-03-16.sql | 4 ++++ SGGL/BLL/Common/Const.cs | 4 ++++ .../BiddingManagement/ActionPlanReviewEdit.aspx.cs | 2 ++ .../BiddingManagement/SetSubReviewEdit.aspx.cs | 2 ++ .../BiddingManagement/SetSubReviewEdit2.aspx.cs | 2 ++ .../ContractCompile/ContractReviewEdit.aspx.cs | 14 ++++++++------ .../PHTGL/Filing/BidDocumentsStandingBook.aspx | 10 ++-------- .../PHTGL/Filing/BidDocumentsStandingBook.aspx.cs | 2 ++ .../BidDocumentsStandingBook.aspx.designer.cs | 4 ++-- 9 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-03-16.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-03-16.sql b/DataBase/版本日志/SGGLDB_V2023-03-16.sql new file mode 100644 index 00000000..569025b9 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-03-16.sql @@ -0,0 +1,4 @@ + +insert into Sys_Role values('FB3EF667-7C38-48EC-9D64-A2A19A0D9E57','ʩ','50','',1,1) + + \ No newline at end of file diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 77de9e77..4f87c5e9 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -443,6 +443,10 @@ /// 施工管理部副部长 /// public const string ConstructionViceMinister = "4607ea62-37d3-4b80-b3b5-a72f454d6fc9"; + /// + /// 施工劳务 + /// + public const string ConstructionLabor = "FB3EF667-7C38-48EC-9D64-A2A19A0D9E57"; /// /// 项目安全总监 diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs index 4ca903e3..8cdf8354 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs @@ -63,6 +63,8 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropDeputyGeneralManager, null, this.CurrUser.UnitId, Const.DeputyGeneralManager, false); if (PHTGL_ActionPlanReviewService.IsSpecialProject(this.CurrUser.LoginProjectId)) { + BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(Approval_Construction, null, CurrUser.UnitId, Const.ConstructionLabor, false); + DropConstructionManager.Label = "现场执行经理"; Approval_Construction.Label = "劳务管理组"; DropProjectManager.Label = "运营管理部"; diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx.cs index cb68eada..6bcdae70 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx.cs @@ -52,6 +52,8 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropDeputyGeneralManager, null, this.CurrUser.UnitId, Const.DeputyGeneralManager, false); if (PHTGL_ActionPlanReviewService.IsSpecialProject(this.CurrUser.LoginProjectId)) { + BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropApproval_Construction, null, CurrUser.UnitId, Const.ConstructionLabor, false); + DropConstructionManager.Label = "现场执行经理"; DropApproval_Construction.Label = "劳务管理组"; DropProjectManager.Label = "运营管理部"; diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs index 31e8802a..3b1a6698 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs @@ -50,6 +50,8 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropDeputyGeneralManager, null, this.CurrUser.UnitId, Const.DeputyGeneralManager, false); if (PHTGL_ActionPlanReviewService.IsSpecialProject(this.CurrUser.LoginProjectId)) { + BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropApproval_Construction, null, CurrUser.UnitId, Const.ConstructionLabor, false); + DropConstructionManager.Label = "现场执行经理"; DropApproval_Construction.Label = "劳务管理组"; DropProjectManager.Label = "运营管理部"; diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractReviewEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractReviewEdit.aspx.cs index dc1ca094..65050db7 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractReviewEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractReviewEdit.aspx.cs @@ -28,13 +28,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile { ContractReviewId = Request.Params["ContractReviewId"]; this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); - if (PHTGL_ActionPlanReviewService.IsSpecialProject(this.CurrUser.LoginProjectId)) - { - dropApproval_Construction.Label = "劳务管理组"; - DropProjectManager2.Label = "运营管理部"; - } + BLL.DepartService.InitDepartDropDownList(DropDepart, true); - #region 会签下拉框 BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropConstructionManager, null, Const.UnitId_SEDIN, null, true);//施工经理 BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropPurchasingManager, null, Const.UnitId_SEDIN, null, true);//采购经理 @@ -60,6 +55,13 @@ namespace FineUIPro.Web.PHTGL.ContractCompile BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropDeputyGeneralManager, null, this.CurrUser.UnitId, Const.DeputyGeneralManager, false); //项目主管领导 BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropChairman, null, this.CurrUser.UnitId, Const.Chairman, false);//董事长 #endregion + if (PHTGL_ActionPlanReviewService.IsSpecialProject(this.CurrUser.LoginProjectId)) + { + BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(dropApproval_Construction, null, CurrUser.UnitId, Const.ConstructionLabor, false); + + dropApproval_Construction.Label = "劳务管理组"; + DropProjectManager2.Label = "运营管理部"; + } BindGrid(); BindFrom(); getButtonPower(); diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx index c2ae5fae..b215cd61 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx @@ -32,14 +32,8 @@ - - - - - - - - + + diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs index b0697816..8eacdc53 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs @@ -37,6 +37,8 @@ namespace FineUIPro.Web.PHTGL.Filing { ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); // btnNew.OnClientClick = Window1.GetShowReference("ContractFormationEdit.aspx", "基本信息") + "return false;"; + BLL.DepartService.InitDepartDropDownList(this.drpDepartId, false); + GetButtonPower(); this.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.designer.cs index bd71cc39..242b407b 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.designer.cs @@ -60,13 +60,13 @@ namespace FineUIPro.Web.PHTGL.Filing protected global::FineUIPro.Toolbar Toolbar2; /// - /// DropDownList1 控件。 + /// drpDepartId 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList DropDownList1; + protected global::FineUIPro.DropDownList drpDepartId; /// /// txtProjectCode 控件。