lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20240614 菜单调整

Browse Source
This commit is contained in:
毕文静
2024-06-14 15:46:10 +08:00
parent 0860e6b9b1
commit c3a6231320
70 changed files with 3017 additions and 3683 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs
+224 -224
View File
@@ -37,12 +37,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorks, this.CurrUser.LoginProjectId, false);
BLL.UnitService.GetUnit(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
LoadAuditSelect();
this.agree.Hidden = true;
this.options.Hidden = true;
//LoadAuditSelect();
//this.agree.Hidden = true;
//this.options.Hidden = true;
this.btnSave.Hidden = true;
this.btnSubmit.Hidden = true;
//this.btnSubmit.Hidden = true;
this.DesignDetailsId = Request.Params["DesignDetailsId"];
Model.Comprehensive_DesignDetails designDetails = BLL.DesignDetailsService.GetDesignDetailsById(this.DesignDetailsId);
if (designDetails != null)
@@ -72,42 +72,42 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtJoinPersonNum.Text = designDetails.JoinPersonNum.ToString();
}
this.txtRemarkCode.Text = designDetails.RemarCode.HasValue ? designDetails.RemarCode.ToString() : "";
var auditApprove = DesignDetailsApproveService.GetAuditApprove(designDetails.DesignDetailsId, BLL.Const.Comprehensive_Audit);
if (auditApprove != null)
{
drpAudit.SelectedValue = auditApprove.ApproveMan;
//var auditApprove = DesignDetailsApproveService.GetAuditApprove(designDetails.DesignDetailsId, BLL.Const.Comprehensive_Audit);
//if (auditApprove != null)
//{
// drpAudit.SelectedValue = auditApprove.ApproveMan;
}
var currApprove = DesignDetailsApproveService.GetCurrentApprove(designDetails.DesignDetailsId);
if (currApprove != null)
{
this.drpAudit.SelectedValue = currApprove.ApproveMan;
//重新编制 编制人 可以 显示 提交 保存按钮
if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && designDetails.CompileMan == CurrUser.UserId)
{
this.btnSubmit.Hidden = false;
this.btnSave.Hidden = false;
}//审核状态 审核人 可以显示 提交 保存按钮
else if (currApprove.ApproveType == BLL.Const.Comprehensive_Audit && currApprove.ApproveMan == CurrUser.UserId)
{
//}
//var currApprove = DesignDetailsApproveService.GetCurrentApprove(designDetails.DesignDetailsId);
//if (currApprove != null)
//{
// this.drpAudit.SelectedValue = currApprove.ApproveMan;
// //重新编制 编制人 可以 显示 提交 保存按钮
// if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && designDetails.CompileMan == CurrUser.UserId)
// {
// this.btnSubmit.Hidden = false;
// this.btnSave.Hidden = false;
// }//审核状态 审核人 可以显示 提交 保存按钮
// else if (currApprove.ApproveType == BLL.Const.Comprehensive_Audit && currApprove.ApproveMan == CurrUser.UserId)
// {
//审核状态不可编辑
Readonly();
// //审核状态不可编辑
// Readonly();
this.agree.Hidden = false;
this.options.Hidden = false;
this.btnSubmit.Hidden = false;
this.btnSave.Hidden = false;
}
}//没有当前审核人，已完成状态 或者 待提交状态
else
{
if (designDetails.Status == BLL.Const.Comprehensive_Compile && designDetails.CompileMan == CurrUser.UserId)
{
this.btnSubmit.Hidden = false;
this.btnSave.Hidden = false;
}
}
// this.agree.Hidden = false;
// this.options.Hidden = false;
// this.btnSubmit.Hidden = false;
// this.btnSave.Hidden = false;
// }
//}//没有当前审核人，已完成状态 或者 待提交状态
//else
//{
// if (designDetails.Status == BLL.Const.Comprehensive_Compile && designDetails.CompileMan == CurrUser.UserId)
// {
// this.btnSubmit.Hidden = false;
// this.btnSave.Hidden = false;
// }
//}
}
@@ -115,7 +115,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
this.txtDetailsDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.btnSave.Hidden = false;
this.btnSubmit.Hidden = false;
//this.btnSubmit.Hidden = false;
}
}
}
@@ -133,7 +133,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.drpUnitIds.Readonly = true;
this.drpUnitWorks.Readonly = true;
this.drpAudit.Readonly = true;
//this.drpAudit.Readonly = true;
this.txtRemarkCode.Readonly = true;
//this.btnAttach.Enabled = false;
@@ -143,23 +143,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// <summary>
/// 加载专业工程师
/// </summary>
public void LoadAuditSelect()
{
//public void LoadAuditSelect()
//{
var db = Funs.DB;
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
join p in db.Project_ProjectUser
on x.UserId equals p.UserId
where y.UnitId == Const.UnitId_CWCEC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
where p.RoleId.Contains(Const.ZBCNEngineer)
select new { UserId = x.UserId, UserName = x.UserName };
drpAudit.DataValueField = "UserId";
drpAudit.DataTextField = "UserName";
this.drpAudit.DataSource = userList.ToList();
this.drpAudit.DataBind();
}
// var db = Funs.DB;
// var userList = from x in db.Sys_User
// join y in db.Project_ProjectUnit
// on x.UnitId equals y.UnitId
// join p in db.Project_ProjectUser
// on x.UserId equals p.UserId
// where y.UnitId == Const.UnitId_CWCEC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
// where p.RoleId.Contains(Const.ZBCNEngineer)
// select new { UserId = x.UserId, UserName = x.UserName };
// drpAudit.DataValueField = "UserId";
// drpAudit.DataTextField = "UserName";
// this.drpAudit.DataSource = userList.ToList();
// this.drpAudit.DataBind();
//}
#endregion
@@ -184,10 +184,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
Model.Comprehensive_DesignDetails designDetails = new Model.Comprehensive_DesignDetails();
designDetails.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
{
designDetails.AuditMan = drpAudit.SelectedValue;
} //审核人
//if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
//{
// designDetails.AuditMan = drpAudit.SelectedValue;
//} //审核人
if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
{
designDetails.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
@@ -256,190 +256,190 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
protected void btnSubmit_Click(object sender, EventArgs e)
{
if (drpCNProfessionalId.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning);
return;
}
var q = Funs.DB.Comprehensive_DesignDetails.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignDetailsId != this.DesignDetailsId || (this.DesignDetailsId == null && x.DesignDetailsId != null)));
if (q != null)
{
Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning);
return;
}
//protected void btnSubmit_Click(object sender, EventArgs e)
//{
// if (drpCNProfessionalId.SelectedValue == BLL.Const._Null)
// {
// Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning);
// return;
// }
// var q = Funs.DB.Comprehensive_DesignDetails.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignDetailsId != this.DesignDetailsId || (this.DesignDetailsId == null && x.DesignDetailsId != null)));
// if (q != null)
// {
// Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning);
// return;
// }
Model.Comprehensive_DesignDetails designDetails = new Model.Comprehensive_DesignDetails();
designDetails.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
{
designDetails.AuditMan = drpAudit.SelectedValue;
} //审核人
if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
{
designDetails.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
}
designDetails.DesignDetailsCode = this.txtDesignDetailsCode.Text.Trim();
designDetails.DetailsMan = this.txtDetailsMan.Text.Trim();
designDetails.JoinPersonNum = Funs.GetNewIntOrZero(this.txtJoinPersonNum.Text.Trim());
if (!string.IsNullOrEmpty(this.txtDetailsDate.Text))
{
designDetails.DetailsDate = Convert.ToDateTime(this.txtDetailsDate.Text);
}
string ids = string.Empty;
var lists = this.drpUnitWorks.SelectedValueArray;
foreach (var item in lists)
{
ids += item + ",";
}
if (!string.IsNullOrEmpty(ids))
{
ids = ids.Substring(0, ids.LastIndexOf(","));
}
designDetails.UnitWorkId = ids;
// Model.Comprehensive_DesignDetails designDetails = new Model.Comprehensive_DesignDetails();
// designDetails.ProjectId = this.CurrUser.LoginProjectId;
// if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
// {
// designDetails.AuditMan = drpAudit.SelectedValue;
// } //审核人
// if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
// {
// designDetails.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
// }
// designDetails.DesignDetailsCode = this.txtDesignDetailsCode.Text.Trim();
// designDetails.DetailsMan = this.txtDetailsMan.Text.Trim();
// designDetails.JoinPersonNum = Funs.GetNewIntOrZero(this.txtJoinPersonNum.Text.Trim());
// if (!string.IsNullOrEmpty(this.txtDetailsDate.Text))
// {
// designDetails.DetailsDate = Convert.ToDateTime(this.txtDetailsDate.Text);
// }
// string ids = string.Empty;
// var lists = this.drpUnitWorks.SelectedValueArray;
// foreach (var item in lists)
// {
// ids += item + ",";
// }
// if (!string.IsNullOrEmpty(ids))
// {
// ids = ids.Substring(0, ids.LastIndexOf(","));
// }
// designDetails.UnitWorkId = ids;
string unitIds = string.Empty;
var units = this.drpUnitIds.SelectedValueArray;
foreach (var item in units)
{
unitIds += item + ",";
}
if (!string.IsNullOrEmpty(unitIds))
{
unitIds = unitIds.Substring(0, unitIds.LastIndexOf(","));
}
designDetails.UnitName = unitIds;
designDetails.RemarCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
if (string.IsNullOrEmpty(this.DesignDetailsId))
{
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
{
designDetails.DesignDetailsId = this.hdAttachUrl.Text;
}
else
{
designDetails.DesignDetailsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails));
this.hdAttachUrl.Text = designDetails.DesignDetailsId;
}
// string unitIds = string.Empty;
// var units = this.drpUnitIds.SelectedValueArray;
// foreach (var item in units)
// {
// unitIds += item + ",";
// }
// if (!string.IsNullOrEmpty(unitIds))
// {
// unitIds = unitIds.Substring(0, unitIds.LastIndexOf(","));
// }
// designDetails.UnitName = unitIds;
// designDetails.RemarCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
// if (string.IsNullOrEmpty(this.DesignDetailsId))
// {
// if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
// {
// designDetails.DesignDetailsId = this.hdAttachUrl.Text;
// }
// else
// {
// designDetails.DesignDetailsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails));
// this.hdAttachUrl.Text = designDetails.DesignDetailsId;
// }
designDetails.CompileMan = this.CurrUser.UserId;
designDetails.CompileDate = DateTime.Now;
designDetails.Status = BLL.Const.Comprehensive_Audit;
BLL.DesignDetailsService.AddDesignDetails(designDetails);
}
else
{
designDetails.DesignDetailsId = this.DesignDetailsId;
// designDetails.CompileMan = this.CurrUser.UserId;
// designDetails.CompileDate = DateTime.Now;
// designDetails.Status = BLL.Const.Comprehensive_Audit;
// BLL.DesignDetailsService.AddDesignDetails(designDetails);
// }
// else
// {
// designDetails.DesignDetailsId = this.DesignDetailsId;
var oldDesignDetails = Funs.DB.Comprehensive_DesignDetails.Where(u => u.DesignDetailsId == this.DesignDetailsId).FirstOrDefault();
if (oldDesignDetails == null) //数据库没有记录 直接点提交 当前状态为 审核状态
{
designDetails.CompileMan = this.CurrUser.UserId;
designDetails.CompileDate = DateTime.Now;
designDetails.Status = BLL.Const.Comprehensive_Audit;
BLL.DesignDetailsService.AddDesignDetails(designDetails);
}
else
{
designDetails.CompileMan = oldDesignDetails.CompileMan;
designDetails.CompileDate = oldDesignDetails.CompileDate;
if (oldDesignDetails.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核
{
designDetails.Status = BLL.Const.Comprehensive_Audit;
}
else if (oldDesignDetails.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核
{
designDetails.Status = BLL.Const.Comprehensive_Audit;
}
else //审核状态 提交 变 完成 或者 重新编制
{
if (Convert.ToBoolean(rblIsAgree.SelectedValue))
{
designDetails.Status = BLL.Const.Comprehensive_Complete;
}
else
{
designDetails.Status = BLL.Const.Comprehensive_ReCompile;
}
}
// var oldDesignDetails = Funs.DB.Comprehensive_DesignDetails.Where(u => u.DesignDetailsId == this.DesignDetailsId).FirstOrDefault();
// if (oldDesignDetails == null) //数据库没有记录 直接点提交 当前状态为 审核状态
// {
// designDetails.CompileMan = this.CurrUser.UserId;
// designDetails.CompileDate = DateTime.Now;
// designDetails.Status = BLL.Const.Comprehensive_Audit;
// BLL.DesignDetailsService.AddDesignDetails(designDetails);
// }
// else
// {
// designDetails.CompileMan = oldDesignDetails.CompileMan;
// designDetails.CompileDate = oldDesignDetails.CompileDate;
// if (oldDesignDetails.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核
// {
// designDetails.Status = BLL.Const.Comprehensive_Audit;
// }
// else if (oldDesignDetails.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核
// {
// designDetails.Status = BLL.Const.Comprehensive_Audit;
// }
// else //审核状态 提交 变 完成 或者 重新编制
// {
// if (Convert.ToBoolean(rblIsAgree.SelectedValue))
// {
// designDetails.Status = BLL.Const.Comprehensive_Complete;
// }
// else
// {
// designDetails.Status = BLL.Const.Comprehensive_ReCompile;
// }
// }
BLL.DesignDetailsService.UpdateDesignDetails(designDetails);
// BLL.DesignDetailsService.UpdateDesignDetails(designDetails);
}
// }
}
#region 审核记录
// }
// #region 审核记录
var currApprove = DesignDetailsApproveService.GetCurrentApprove(designDetails.DesignDetailsId);
if (currApprove == null) //为获取到为 当前编制状态 直接提交
{
var approve = new Model.Comprehensive_DesignDetailsApprove();
approve.DesignDetailsId = designDetails.DesignDetailsId;
approve.ApproveMan = this.CurrUser.UserId;
approve.ApproveType = Const.Comprehensive_Compile;
approve.ApproveDate = DateTime.Now;
DesignDetailsApproveService.EditApprove(approve); //新增编制记录
// var currApprove = DesignDetailsApproveService.GetCurrentApprove(designDetails.DesignDetailsId);
// if (currApprove == null) //为获取到为 当前编制状态 直接提交
// {
// var approve = new Model.Comprehensive_DesignDetailsApprove();
// approve.DesignDetailsId = designDetails.DesignDetailsId;
// approve.ApproveMan = this.CurrUser.UserId;
// approve.ApproveType = Const.Comprehensive_Compile;
// approve.ApproveDate = DateTime.Now;
// DesignDetailsApproveService.EditApprove(approve); //新增编制记录
Model.Comprehensive_DesignDetailsApprove newApprove = new Model.Comprehensive_DesignDetailsApprove();
newApprove.DesignDetailsId = designDetails.DesignDetailsId;
newApprove.ApproveMan = this.drpAudit.SelectedValue;
newApprove.ApproveType = Const.InspectionManagement_Audit;
DesignDetailsApproveService.EditApprove(newApprove); //新增专业工程师审核记录
// Model.Comprehensive_DesignDetailsApprove newApprove = new Model.Comprehensive_DesignDetailsApprove();
// newApprove.DesignDetailsId = designDetails.DesignDetailsId;
// newApprove.ApproveMan = this.drpAudit.SelectedValue;
// newApprove.ApproveType = Const.InspectionManagement_Audit;
// DesignDetailsApproveService.EditApprove(newApprove); //新增专业工程师审核记录
}
else if (currApprove.ApproveMan == CurrUser.UserId)
{
if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile)
{
currApprove.ApproveDate = DateTime.Now;
//currApprove.IsAgree = true;
DesignDetailsApproveService.EditApprove(currApprove); //新增专业工程师审核记录
Model.Comprehensive_DesignDetailsApprove newApprove = new Model.Comprehensive_DesignDetailsApprove();
newApprove.DesignDetailsId = designDetails.DesignDetailsId;
newApprove.ApproveMan = this.drpAudit.SelectedValue;
newApprove.ApproveType = Const.InspectionManagement_Audit;
DesignDetailsApproveService.EditApprove(newApprove); //新增专业工程师审核记录
}
else
{
currApprove.ApproveDate = DateTime.Now; //更新审核时间
currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
currApprove.ApproveIdea = this.txtidea.Text;
DesignDetailsApproveService.EditApprove(currApprove);
// }
// else if (currApprove.ApproveMan == CurrUser.UserId)
// {
// if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile)
// {
// currApprove.ApproveDate = DateTime.Now;
// //currApprove.IsAgree = true;
// DesignDetailsApproveService.EditApprove(currApprove); //新增专业工程师审核记录
// Model.Comprehensive_DesignDetailsApprove newApprove = new Model.Comprehensive_DesignDetailsApprove();
// newApprove.DesignDetailsId = designDetails.DesignDetailsId;
// newApprove.ApproveMan = this.drpAudit.SelectedValue;
// newApprove.ApproveType = Const.InspectionManagement_Audit;
// DesignDetailsApproveService.EditApprove(newApprove); //新增专业工程师审核记录
// }
// else
// {
// currApprove.ApproveDate = DateTime.Now; //更新审核时间
// currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
// currApprove.ApproveIdea = this.txtidea.Text;
// DesignDetailsApproveService.EditApprove(currApprove);
if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成
{
Model.Comprehensive_DesignDetailsApprove reApprove = new Model.Comprehensive_DesignDetailsApprove();
reApprove.DesignDetailsId = currApprove.DesignDetailsId;
reApprove.ApproveDate = DateTime.Now.AddSeconds(10);
reApprove.ApproveMan = CurrUser.UserId;
reApprove.ApproveType = Const.Comprehensive_Complete;
// reApprove.ApproveIdea = txtidea.Text;
DesignDetailsApproveService.EditApprove(reApprove);
}
else
{
Model.Comprehensive_DesignDetailsApprove reApprove = new Model.Comprehensive_DesignDetailsApprove();
reApprove.DesignDetailsId = currApprove.DesignDetailsId;
reApprove.ApproveMan = designDetails.CompileMan;
reApprove.ApproveType = Const.Comprehensive_ReCompile;
DesignDetailsApproveService.EditApprove(reApprove);
}
}
}
// if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成
// {
// Model.Comprehensive_DesignDetailsApprove reApprove = new Model.Comprehensive_DesignDetailsApprove();
// reApprove.DesignDetailsId = currApprove.DesignDetailsId;
// reApprove.ApproveDate = DateTime.Now.AddSeconds(10);
// reApprove.ApproveMan = CurrUser.UserId;
// reApprove.ApproveType = Const.Comprehensive_Complete;
// // reApprove.ApproveIdea = txtidea.Text;
// DesignDetailsApproveService.EditApprove(reApprove);
// }
// else
// {
// Model.Comprehensive_DesignDetailsApprove reApprove = new Model.Comprehensive_DesignDetailsApprove();
// reApprove.DesignDetailsId = currApprove.DesignDetailsId;
// reApprove.ApproveMan = designDetails.CompileMan;
// reApprove.ApproveType = Const.Comprehensive_ReCompile;
// DesignDetailsApproveService.EditApprove(reApprove);
// }
// }
// }
#endregion
// #endregion
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
// ShowNotify("保存成功！", MessageBoxIcon.Success);
// PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
//}
#endregion