lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

This commit is contained in:
高飞 2023-03-17 09:59:58 +08:00
parent 4a3fb76c8c 1b564e74ea
commit 00938773c1
9 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DataBase/版本日志/SGGLDB_V2023-03-16 lpf.sql Normal file
View File

@ -0,0 +1 @@
insert into Sys_Role values('FB3EF667-7C38-48EC-9D64-A2A19A0D9E57','Ê©¹¤ÀÍÎñ','50','',1,1)

4
SGGL/BLL/Common/Const.cs
View File

@ -443,6 +443,10 @@
/// 施工管理部副部长
/// </summary>
public const string ConstructionViceMinister = "4607ea62-37d3-4b80-b3b5-a72f454d6fc9";
/// <summary>
/// 施工劳务
/// </summary>
public const string ConstructionLabor = "FB3EF667-7C38-48EC-9D64-A2A19A0D9E57";
/// <summary>
/// 项目安全总监

2
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs
View File

@ -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 = "运营管理部";

2
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx.cs
View File

@ -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 = "运营管理部";

2
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs
View File

@ -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 = "运营管理部";

14
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractReviewEdit.aspx.cs
View File

@ -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);
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();

10
SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx
View File

@ -32,14 +32,8 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList runat="server" ID="DropDownList1" Label="数据来源">
<f:ListItem Text="施工管理部" Value="Value1" />
<f:ListItem Text="环境工程事业部" Value="Value2" />
<f:ListItem Text="基础设施事业部" Value="Value3" />
<f:ListItem Text="运营管理部" Value="Value4" />
<f:ListItem Text="宁波公司" Value="Value5" />
<f:ListItem Text="焦化公司" Value="Value6" />
</f:DropDownList>
<f:DropDownList ID="drpDepartId" runat="server" Label="主办部门" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:TextBox runat="server" Label="总承包合同编号" ID="txtProjectCode" EmptyText="输入查询条件" Width="300px" LabelWidth="120px"
LabelAlign="left">

2
SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs
View File

@ -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)

4
SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.designer.cs generated
View File

@ -60,13 +60,13 @@ namespace FineUIPro.Web.PHTGL.Filing
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// DropDownList1 控件。
/// drpDepartId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList1;
protected global::FineUIPro.DropDownList drpDepartId;
/// <summary>
/// txtProjectCode 控件。