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

增加项目策划、总包合同模块

Browse Source
This commit is contained in:
高飞
2023-06-05 10:32:48 +08:00
parent 8185480c15
commit 973560f00b
39 changed files with 8307 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs
+1 -1
View File
@@ -58,7 +58,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
{
if (!string.IsNullOrEmpty(this.ProjectId))
{
string strSql = "SELECT ActionPlanList.ActionPlanListId,ActionPlanList.ProjectId,ActionPlanListCode,ActionPlanList.ActionPlanListName,ActionPlanList.VersionNo,(CASE ProjectType WHEN '1' THEN '系统内项目' WHEN '2' THEN '系统外项目' WHEN '3' THEN '海外项目' END ) AS ProjectType,ActionPlanList.ActionPlanListContents,ActionPlanList.CompileMan,Users.PersonName AS CompileManName, ActionPlanList.CompileDate,ActionPlanList.States"
string strSql = "SELECT ActionPlanList.ActionPlanListId,ActionPlanList.ProjectId,ActionPlanListCode,ActionPlanList.ActionPlanListName,ActionPlanList.VersionNo,(CASE ActionPlanList.ProjectType WHEN '1' THEN 'EPC' WHEN '2' THEN 'EPCM' WHEN '3' THEN 'C' WHEN '4' THEN '其他' END ) AS ProjectType,ActionPlanList.ActionPlanListContents,ActionPlanList.CompileMan,Users.PersonName AS CompileManName, ActionPlanList.CompileDate,ActionPlanList.States"
+ @" FROM ActionPlan_ActionPlanList AS ActionPlanList "
+ @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON ActionPlanList.ActionPlanListId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+ @" LEFT JOIN Person_Persons AS OperateUser ON FlowOperate.OperaterId=OperateUser.PersonId "
SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx
+4 -3
View File
@@ -30,9 +30,10 @@
</f:TextBox>
<f:DropDownList ID="drpProjectType" runat="server" Label="项目类型" LabelAlign="Right"
LabelWidth="120px">
<f:ListItem Value="1" Text="系统内项目" Selected="true" />
<f:ListItem Value="2" Text="系统外项目" />
<f:ListItem Value="3" Text="海外项目" />
<f:ListItem Value="1" Text="EPC" Selected="true" />
<f:ListItem Value="2" Text="EPCM" />
<f:ListItem Value="3" Text="C" />
<f:ListItem Value="4" Text="其他" />
</f:DropDownList>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs
+6 -1
View File
@@ -68,7 +68,12 @@ namespace FineUIPro.Web.HSSE.ActionPlan
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.ProjectId = this.CurrUser.LoginProjectId;
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpCompileMan, this.ProjectId, null, null, true);
BLL.Person_PersonsService.InitUserUnitIdDepartIdDropDownList(this.drpReviewMan, BLL.Const.UnitId_SEDIN, BLL.Const.Depart_constructionId, true);
var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole select x).ToList();
this.drpReviewMan.DataTextField = "PersonName";
this.drpReviewMan.DataValueField = "PersonId";
this.drpReviewMan.DataSource = q;
this.drpReviewMan.DataBind();
Funs.FineUIPleaseSelect(this.drpReviewMan);
CQMSConstructSolutionService.setRoleTree(trOne, this.CurrUser.LoginProjectId, "专业工程师", Const.ProjectUnitType_1, Const.ZBCNEngineer);
CQMSConstructSolutionService.setRoleTree(trTwo, this.CurrUser.LoginProjectId, "质量组", Const.ProjectUnitType_1, Const.QAManager + "," + Const.CQEngineer);
CQMSConstructSolutionService.setRoleTree(trThree, this.CurrUser.LoginProjectId, "HSE组", Const.ProjectUnitType_1, Const.HSSEManager + "," + Const.HSSEEngineer);
SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListView.aspx
+4 -3
View File
@@ -29,9 +29,10 @@
</f:TextBox>
<f:DropDownList ID="drpProjectType" runat="server" Label="项目类型" LabelAlign="Right" Readonly="true"
LabelWidth="120px">
<f:ListItem Value="1" Text="系统内项目" Selected="true" />
<f:ListItem Value="2" Text="系统外项目" />
<f:ListItem Value="3" Text="海外项目" />
<f:ListItem Value="1" Text="EPC" Selected="true" />
<f:ListItem Value="2" Text="EPCM" />
<f:ListItem Value="3" Text="C" />
<f:ListItem Value="4" Text="其他" />
</f:DropDownList>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListView.aspx.cs
+6 -1
View File
@@ -36,7 +36,12 @@ namespace FineUIPro.Web.HSSE.ActionPlan
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
BLL.Person_PersonsService.InitUserUnitIdDepartIdDropDownList(this.drpReviewMan, BLL.Const.UnitId_SEDIN, BLL.Const.Depart_constructionId, true);
var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole select x).ToList();
this.drpReviewMan.DataTextField = "PersonName";
this.drpReviewMan.DataValueField = "PersonId";
this.drpReviewMan.DataSource = q;
this.drpReviewMan.DataBind();
Funs.FineUIPleaseSelect(this.drpReviewMan);
CQMSConstructSolutionService.setRoleTree(trOne, this.CurrUser.LoginProjectId, "专业工程师", Const.ProjectUnitType_1, Const.ZBCNEngineer);
CQMSConstructSolutionService.setRoleTree(trTwo, this.CurrUser.LoginProjectId, "质量组", Const.ProjectUnitType_1, Const.QAManager + "," + Const.CQEngineer);
CQMSConstructSolutionService.setRoleTree(trThree, this.CurrUser.LoginProjectId, "HSE组", Const.ProjectUnitType_1, Const.HSSEManager + "," + Const.HSSEEngineer);