shecs/Basf_EProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20240929 修改RP超时不允许编辑

Browse Source
This commit is contained in:
毕文静
2024-09-29 15:48:12 +08:00
parent 17ac63f758
commit d6c2b68ebc
13 changed files with 129 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EProject/FineUIPro.Web/ResourcePlan/ResourcePlan.aspx.cs
+75 -58
View File
@@ -369,26 +369,35 @@ namespace FineUIPro.Web.ResourcePlan
var role = BLL.Sys_RoleService.GetRole(user.RoleId);
string projectManager = epro.ProjectControl_ProjectManager;
string leadByName = epro.ProjectControl_LeadByName;
// 权限已特殊处理
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//if (!string.IsNullOrEmpty(projectManager) && !string.IsNullOrEmpty(leadByName) && epro.ProjectControl_LeadByName.Contains("CTE") && (epro.ProjectControl_ProjectManager == this.CurrUser.UserName || user.DepartId != BLL.Const.CTEM_DepartId))
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//}
////lead by不是CTE的项目，需CTE做设计支持的项目的RP授权给Project Control
//else if (!string.IsNullOrEmpty(leadByName) && !epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName == "PPE")
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//}
//else if (this.CurrUser.UserId == BLL.Const.GlyId)
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//}
//else
//{
// Alert.Show("您不是PM、非CTE/M用户或PPE，不能填报资源", MessageBoxIcon.Warning);
//}
var manHours = (from x in Funs.DB.ManHours_Plan where x.ResourcePlanId == Id select x).FirstOrDefault();
if (manHours.AccountDisabled == 0)
{
// 权限已特殊处理
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//if (!string.IsNullOrEmpty(projectManager) && !string.IsNullOrEmpty(leadByName) && epro.ProjectControl_LeadByName.Contains("CTE") && (epro.ProjectControl_ProjectManager == this.CurrUser.UserName || user.DepartId != BLL.Const.CTEM_DepartId))
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//}
////lead by不是CTE的项目，需CTE做设计支持的项目的RP授权给Project Control
//else if (!string.IsNullOrEmpty(leadByName) && !epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName == "PPE")
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//}
//else if (this.CurrUser.UserId == BLL.Const.GlyId)
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//}
//else
//{
// Alert.Show("您不是PM、非CTE/M用户或PPE，不能填报资源", MessageBoxIcon.Warning);
//}
}
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanView.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
}
}
}
}
@@ -426,45 +435,53 @@ namespace FineUIPro.Web.ResourcePlan
object[] keys = Grid2.DataKeys[e.RowIndex];
string eProjectId = keys[1].ToString();
//var epro = BLL.EProjectService.GeteProjectById(eProjectId);
//if (epro != null)
//{
// var user = BLL.Sys_UserService.GetUsersByUserId(this.CurrUser.UserId);
// if (user != null)
// {
//if (!string.IsNullOrEmpty(user.RoleId))
//{
//var role = BLL.Sys_RoleService.GetRole(user.RoleId);
//if (role != null)
//{
//if (epro.ProjectControl_LeadByName.Contains("CTE") && user.DepartId == BLL.Const.CTEM_DepartId)
//{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//}
//else if (epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName != "PM")
//{
// ShowAlert("您不是PM，不能填报Lead by是CTE的项目资源", MessageBoxIcon.Warning);
//}
//else if (!epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName == "PPE")
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//}
//else if (!epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName != "PPE")
//{
// ShowAlert("您不是PPE，不能填报Lead by不是CTE的项目资源", MessageBoxIcon.Warning);
//}
//else
//{
// Alert.Show("您不是PM或PPE，不能填报资源", MessageBoxIcon.Warning);
//}
//}
//}
//else if (this.CurrUser.UserId == BLL.Const.GlyId)
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//}
// }
//}
var manHours = (from x in Funs.DB.ManHours_Plan where x.ResourcePlanId == Id select x).FirstOrDefault();
if (manHours.AccountDisabled == 0)
{
//var epro = BLL.EProjectService.GeteProjectById(eProjectId);
//if (epro != null)
//{
// var user = BLL.Sys_UserService.GetUsersByUserId(this.CurrUser.UserId);
// if (user != null)
// {
//if (!string.IsNullOrEmpty(user.RoleId))
//{
//var role = BLL.Sys_RoleService.GetRole(user.RoleId);
//if (role != null)
//{
//if (epro.ProjectControl_LeadByName.Contains("CTE") && user.DepartId == BLL.Const.CTEM_DepartId)
//{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//}
//else if (epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName != "PM")
//{
// ShowAlert("您不是PM，不能填报Lead by是CTE的项目资源", MessageBoxIcon.Warning);
//}
//else if (!epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName == "PPE")
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//}
//else if (!epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName != "PPE")
//{
// ShowAlert("您不是PPE，不能填报Lead by不是CTE的项目资源", MessageBoxIcon.Warning);
//}
//else
//{
// Alert.Show("您不是PM或PPE，不能填报资源", MessageBoxIcon.Warning);
//}
//}
//}
//else if (this.CurrUser.UserId == BLL.Const.GlyId)
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//}
// }
//}
}
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanView.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
}
}
protected void Grid2_RowCommand(object sender, GridCommandEventArgs e)
EProject/FineUIPro.Web/ResourcePlan/ResourcePlanAdd.aspx.cs
+2 -4
View File
@@ -2,13 +2,9 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.ResourcePlan
{
@@ -144,6 +140,8 @@ namespace FineUIPro.Web.ResourcePlan
}
//绑定
BindGrid();
}
}
}
EProject/FineUIPro.Web/ResourcePlan/ResourcePlanEdit.aspx.cs
+38 -35
View File
@@ -62,51 +62,54 @@ namespace FineUIPro.Web.ResourcePlan
if (!string.IsNullOrEmpty(resourcePlanId))
{
var rp = BLL.ResourcePlanService.GetModelsResourcePlans(resourcePlanId);
var eProject = BLL.EProjectService.GeteProjectById(rp.EProjectId);
if (eProject != null)
if (rp != null)
{
this.txtJobNo.Text = eProject.ProjectControl_JobNo;
this.txtJobTitle.Text = eProject.ProjectControl_JobTitle;
this.txtMOCNo.Text = eProject.ProjectControl_MOCFormNo;
var eProject = BLL.EProjectService.GeteProjectById(rp.EProjectId);
if (eProject != null)
{
this.txtJobNo.Text = eProject.ProjectControl_JobNo;
this.txtJobTitle.Text = eProject.ProjectControl_JobTitle;
this.txtMOCNo.Text = eProject.ProjectControl_MOCFormNo;
foreach (CheckItem lst in this.checkJobType.Items)//项目类型
{
if (!string.IsNullOrEmpty(eProject.ProjectControl_JobType))
foreach (CheckItem lst in this.checkJobType.Items)//项目类型
{
if (eProject.ProjectControl_JobType.Equals(lst.Value))
lst.Selected = true;
if (!string.IsNullOrEmpty(eProject.ProjectControl_JobType))
{
if (eProject.ProjectControl_JobType.Equals(lst.Value))
lst.Selected = true;
}
}
}
//foreach (CheckItem lsts in this.checkPriority.Items)//优先级
//{
// if (!string.IsNullOrEmpty(eProject.PM_General_Priority))
// {
// if (eProject.PM_General_Priority.Equals(lsts.Value))
// lsts.Selected = true;
// }
//}
var wbs = BLL.DisciplinesWBSService.GetDisciplinesWBSListByType("4"); //"4"表示项目经理
if (wbs != null)
{
Model.ManHours_Plan p = BLL.PlanService.GetPlanByIds(resourcePlanId, wbs.FirstOrDefault().DisciplinesWBSId);
if (p != null)
//foreach (CheckItem lsts in this.checkPriority.Items)//优先级
//{
// if (!string.IsNullOrEmpty(eProject.PM_General_Priority))
// {
// if (eProject.PM_General_Priority.Equals(lsts.Value))
// lsts.Selected = true;
// }
//}
var wbs = BLL.DisciplinesWBSService.GetDisciplinesWBSListByType("4"); //"4"表示项目经理
if (wbs != null)
{
this.DropDownList7.SelectedValue = p.EngineerId;
this.NumberBox15.Text = p.ManHours.ToString();
Model.ManHours_Plan p = BLL.PlanService.GetPlanByIds(resourcePlanId, wbs.FirstOrDefault().DisciplinesWBSId);
if (p != null)
{
this.DropDownList7.SelectedValue = p.EngineerId;
this.NumberBox15.Text = p.ManHours.ToString();
}
else if (!string.IsNullOrEmpty(eProject.ProjectControl_ProjectManagerId))
{
this.DropDownList7.SelectedValue = eProject.ProjectControl_ProjectManagerId;
}
}
else if (!string.IsNullOrEmpty(eProject.ProjectControl_ProjectManagerId))
if (!string.IsNullOrEmpty(rp.Phase))
{
this.DropDownList7.SelectedValue = eProject.ProjectControl_ProjectManagerId;
checkPhase.SelectedValueArray = rp.Phase.Split(',');
}
//绑定
BindGrid();
}
if (!string.IsNullOrEmpty(rp.Phase))
{
checkPhase.SelectedValueArray = rp.Phase.Split(',');
}
//绑定
BindGrid();
}
//foreach (CheckItem item in checkPhase.Items)
//{
// if (!string.IsNullOrEmpty(rp.Phase))