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/DesignDrawingsEdit.aspx.cs
+213 -213
View File
@@ -38,12 +38,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, false);
BLL.UnitService.InitUnitDownList(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.DesignDrawingsId = Request.Params["DesignDrawingsId"];
Model.Comprehensive_DesignDrawings designDrawings = BLL.DesignDrawingsService.GetDesignDrawingsById(this.DesignDrawingsId);
if (designDrawings != null)
@@ -73,39 +73,39 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtRemarkCode.Text = designDrawings.RemarkCode.HasValue ? designDrawings.RemarkCode.ToString() : "";
var currApprove = DesignDrawingsApproveService.GetCurrentApprove(designDrawings.DesignDrawingsId);
if (currApprove != null)
{ //重新编制 编制人 可以 显示 提交 保存按钮
//var currApprove = DesignDrawingsApproveService.GetCurrentApprove(designDrawings.DesignDrawingsId);
//if (currApprove != null)
//{ //重新编制 编制人 可以 显示 提交 保存按钮
this.drpAudit.SelectedValue = currApprove.ApproveMan;
if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && designDrawings.CompileMan == CurrUser.UserId)
{
this.btnSubmit.Hidden = false;
this.btnSave.Hidden = false;
}//审核状态 审核人 可以显示 提交 保存按钮
else if (currApprove.ApproveType == BLL.Const.Comprehensive_Audit && currApprove.ApproveMan == CurrUser.UserId)
{
//审核状态不可编辑
Readonly();
this.agree.Hidden = false;
this.options.Hidden = false;
this.btnSubmit.Hidden = false;
this.btnSave.Hidden = false;
}
}//没有当前审核人，已完成状态 或者 待提交状态
else
{
if (designDrawings.Status == BLL.Const.Comprehensive_Compile && designDrawings.CompileMan == CurrUser.UserId)
{
this.btnSubmit.Hidden = false;
this.btnSave.Hidden = false;
}
}
// this.drpAudit.SelectedValue = currApprove.ApproveMan;
// if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && designDrawings.CompileMan == CurrUser.UserId)
// {
// this.btnSubmit.Hidden = false;
// this.btnSave.Hidden = false;
// }//审核状态 审核人 可以显示 提交 保存按钮
// else if (currApprove.ApproveType == BLL.Const.Comprehensive_Audit && currApprove.ApproveMan == CurrUser.UserId)
// {
// //审核状态不可编辑
// Readonly();
// this.agree.Hidden = false;
// this.options.Hidden = false;
// this.btnSubmit.Hidden = false;
// this.btnSave.Hidden = false;
// }
//}//没有当前审核人，已完成状态 或者 待提交状态
//else
//{
// if (designDrawings.Status == BLL.Const.Comprehensive_Compile && designDrawings.CompileMan == CurrUser.UserId)
// {
// this.btnSubmit.Hidden = false;
// this.btnSave.Hidden = false;
// }
//}
}
else
{
this.btnSave.Hidden = false;
this.btnSubmit.Hidden = false;
//this.btnSubmit.Hidden = false;
}
}
}
@@ -128,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtRemark.Readonly = true;
this.txtRemarkCode.Readonly = true;
this.txtSendDate.Readonly = true;
this.drpAudit.Readonly = true;
//this.drpAudit.Readonly = true;
//this.btnAttach.Enabled = false;
}
@@ -136,23 +136,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();
//}
@@ -191,10 +191,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
designDrawings.Remark = this.txtRemark.Text.Trim();
designDrawings.CompileMan = this.CurrUser.UserId;
designDrawings.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
{
designDrawings.AuditMan = drpAudit.SelectedValue;
} //审核人
//if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
//{
// designDrawings.AuditMan = drpAudit.SelectedValue;
//} //审核人
string ids = string.Empty;
var lists = this.drpUnitWorkIds.SelectedValueArray;
foreach (var item in lists)
@@ -250,185 +250,185 @@ 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_DesignDrawings.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignDrawingsId != this.DesignDrawingsId || (this.DesignDrawingsId == null && x.DesignDrawingsId != null)));
if (q != null)
{
Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning);
return;
}
Model.Comprehensive_DesignDrawings designDrawings = new Model.Comprehensive_DesignDrawings();
designDrawings.ProjectId = this.CurrUser.LoginProjectId;
designDrawings.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
designDrawings.DesignDrawingsCode = this.txtDesignDrawingsCode.Text.Trim();
designDrawings.DesignDrawingsContent = this.txtDesignDrawingsContent.Text.Trim();
designDrawings.Edition = this.txtEdition.Text.Trim();
designDrawings.PageNumber = Funs.GetNewInt(this.txtPageNumber.Text.Trim());
designDrawings.ReceiveDate = Funs.GetNewDateTime(this.txtReceiveDate.Text);
designDrawings.SendDate = Funs.GetNewDateTime(this.txtSendDate.Text);
designDrawings.ReceiveMan = this.txtReceiveMan.Text.Trim();
designDrawings.Remark = this.txtRemark.Text.Trim();
designDrawings.CompileMan = this.CurrUser.UserId;
designDrawings.RemarkCode =Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
{
designDrawings.AuditMan = drpAudit.SelectedValue;
} //审核人
string ids = string.Empty;
var lists = this.drpUnitWorkIds.SelectedValueArray;
foreach (var item in lists)
{
ids += item + ",";
}
if (!string.IsNullOrEmpty(ids))
{
ids = ids.Substring(0, ids.LastIndexOf(","));
}
designDrawings.UnitWorkId = ids;
//protected void btnSubmit_Click(object sender, EventArgs e)
//{
// if (drpCNProfessionalId.SelectedValue == BLL.Const._Null)
// {
// Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning);
// return;
// }
// var q = Funs.DB.Comprehensive_DesignDrawings.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignDrawingsId != this.DesignDrawingsId || (this.DesignDrawingsId == null && x.DesignDrawingsId != null)));
// if (q != null)
// {
// Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning);
// return;
// }
// Model.Comprehensive_DesignDrawings designDrawings = new Model.Comprehensive_DesignDrawings();
// designDrawings.ProjectId = this.CurrUser.LoginProjectId;
// designDrawings.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
// designDrawings.DesignDrawingsCode = this.txtDesignDrawingsCode.Text.Trim();
// designDrawings.DesignDrawingsContent = this.txtDesignDrawingsContent.Text.Trim();
// designDrawings.Edition = this.txtEdition.Text.Trim();
// designDrawings.PageNumber = Funs.GetNewInt(this.txtPageNumber.Text.Trim());
// designDrawings.ReceiveDate = Funs.GetNewDateTime(this.txtReceiveDate.Text);
// designDrawings.SendDate = Funs.GetNewDateTime(this.txtSendDate.Text);
// designDrawings.ReceiveMan = this.txtReceiveMan.Text.Trim();
// designDrawings.Remark = this.txtRemark.Text.Trim();
// designDrawings.CompileMan = this.CurrUser.UserId;
// designDrawings.RemarkCode =Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
// if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
// {
// designDrawings.AuditMan = drpAudit.SelectedValue;
// } //审核人
// string ids = string.Empty;
// var lists = this.drpUnitWorkIds.SelectedValueArray;
// foreach (var item in lists)
// {
// ids += item + ",";
// }
// if (!string.IsNullOrEmpty(ids))
// {
// ids = ids.Substring(0, ids.LastIndexOf(","));
// }
// designDrawings.UnitWorkId = ids;
string unitIds = string.Empty;
var unitLists = this.drpUnitIds.SelectedValueArray;
foreach (var item in unitLists)
{
unitIds += item + ",";
}
if (!string.IsNullOrEmpty(unitIds))
{
unitIds = unitIds.Substring(0, unitIds.LastIndexOf(","));
}
designDrawings.ReceiveUnits = unitIds;
if (!string.IsNullOrEmpty(this.DesignDrawingsId))
{
designDrawings.DesignDrawingsId = this.DesignDrawingsId;
//BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings);
var oldDesignDrawings = Funs.DB.Comprehensive_DesignDrawings.Where(u => u.DesignDrawingsId == this.DesignDrawingsId).FirstOrDefault();
if (oldDesignDrawings == null) //数据库没有记录 直接点提交 当前状态为 审核状态
{
designDrawings.CompileMan = this.CurrUser.UserId;
designDrawings.Status = BLL.Const.Comprehensive_Audit;
BLL.DesignDrawingsService.AddDesignDrawings(designDrawings);
}
else
{
designDrawings.CompileMan = oldDesignDrawings.CompileMan;
if (oldDesignDrawings.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核
{
designDrawings.Status = BLL.Const.Comprehensive_Audit;
}
else if (oldDesignDrawings.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核
{
designDrawings.Status = BLL.Const.Comprehensive_Audit;
}
else //审核状态 提交 变 完成 或者 重新编制
{
if (Convert.ToBoolean(rblIsAgree.SelectedValue))
{
designDrawings.Status = BLL.Const.Comprehensive_Complete;
}
else
{
designDrawings.Status = BLL.Const.Comprehensive_ReCompile;
}
}
// string unitIds = string.Empty;
// var unitLists = this.drpUnitIds.SelectedValueArray;
// foreach (var item in unitLists)
// {
// unitIds += item + ",";
// }
// if (!string.IsNullOrEmpty(unitIds))
// {
// unitIds = unitIds.Substring(0, unitIds.LastIndexOf(","));
// }
// designDrawings.ReceiveUnits = unitIds;
// if (!string.IsNullOrEmpty(this.DesignDrawingsId))
// {
// designDrawings.DesignDrawingsId = this.DesignDrawingsId;
// //BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings);
// var oldDesignDrawings = Funs.DB.Comprehensive_DesignDrawings.Where(u => u.DesignDrawingsId == this.DesignDrawingsId).FirstOrDefault();
// if (oldDesignDrawings == null) //数据库没有记录 直接点提交 当前状态为 审核状态
// {
// designDrawings.CompileMan = this.CurrUser.UserId;
// designDrawings.Status = BLL.Const.Comprehensive_Audit;
// BLL.DesignDrawingsService.AddDesignDrawings(designDrawings);
// }
// else
// {
// designDrawings.CompileMan = oldDesignDrawings.CompileMan;
// if (oldDesignDrawings.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核
// {
// designDrawings.Status = BLL.Const.Comprehensive_Audit;
// }
// else if (oldDesignDrawings.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核
// {
// designDrawings.Status = BLL.Const.Comprehensive_Audit;
// }
// else //审核状态 提交 变 完成 或者 重新编制
// {
// if (Convert.ToBoolean(rblIsAgree.SelectedValue))
// {
// designDrawings.Status = BLL.Const.Comprehensive_Complete;
// }
// else
// {
// designDrawings.Status = BLL.Const.Comprehensive_ReCompile;
// }
// }
BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings);
// BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings);
}
}
else
{
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
{
designDrawings.DesignDrawingsId = this.hdAttachUrl.Text;
}
else
{
designDrawings.DesignDrawingsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings));
this.hdAttachUrl.Text = designDrawings.DesignDrawingsId;
}
// }
// }
// else
// {
// if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
// {
// designDrawings.DesignDrawingsId = this.hdAttachUrl.Text;
// }
// else
// {
// designDrawings.DesignDrawingsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings));
// this.hdAttachUrl.Text = designDrawings.DesignDrawingsId;
// }
designDrawings.Status = BLL.Const.Comprehensive_Audit;
BLL.DesignDrawingsService.AddDesignDrawings(designDrawings);
}
// designDrawings.Status = BLL.Const.Comprehensive_Audit;
// BLL.DesignDrawingsService.AddDesignDrawings(designDrawings);
// }
#region 审核记录
// #region 审核记录
var currApprove =DesignDrawingsApproveService.GetCurrentApprove(designDrawings.DesignDrawingsId);
if (currApprove == null) //为获取到为 当前编制状态 直接提交
{
var approve = new Model.Comprehensive_DesignDrawingsApprove();
approve.DesignDrawingsId = designDrawings.DesignDrawingsId;
approve.ApproveMan = this.CurrUser.UserId;
approve.ApproveType = Const.Comprehensive_Compile;
approve.ApproveDate = DateTime.Now;
DesignDrawingsApproveService.EditApprove(approve); //新增编制记录
// var currApprove =DesignDrawingsApproveService.GetCurrentApprove(designDrawings.DesignDrawingsId);
// if (currApprove == null) //为获取到为 当前编制状态 直接提交
// {
// var approve = new Model.Comprehensive_DesignDrawingsApprove();
// approve.DesignDrawingsId = designDrawings.DesignDrawingsId;
// approve.ApproveMan = this.CurrUser.UserId;
// approve.ApproveType = Const.Comprehensive_Compile;
// approve.ApproveDate = DateTime.Now;
// DesignDrawingsApproveService.EditApprove(approve); //新增编制记录
Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove();
newApprove.DesignDrawingsId = designDrawings.DesignDrawingsId;
newApprove.ApproveMan = this.drpAudit.SelectedValue;
newApprove.ApproveType = Const.InspectionManagement_Audit;
DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录
// Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove();
// newApprove.DesignDrawingsId = designDrawings.DesignDrawingsId;
// newApprove.ApproveMan = this.drpAudit.SelectedValue;
// newApprove.ApproveType = Const.InspectionManagement_Audit;
// DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录
}
else if (currApprove.ApproveMan == CurrUser.UserId)
{
if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile)
{
currApprove.ApproveDate = DateTime.Now;
//currApprove.IsAgree = true;
DesignDrawingsApproveService.EditApprove(currApprove); //新增专业工程师审核记录
Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove();
newApprove.DesignDrawingsId = designDrawings.DesignDrawingsId;
newApprove.ApproveMan = this.drpAudit.SelectedValue;
newApprove.ApproveType = Const.InspectionManagement_Audit;
DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录
}
else
{
currApprove.ApproveDate = DateTime.Now; //更新审核时间
currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
currApprove.ApproveIdea = this.txtidea.Text;
DesignDrawingsApproveService.EditApprove(currApprove);
// }
// else if (currApprove.ApproveMan == CurrUser.UserId)
// {
// if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile)
// {
// currApprove.ApproveDate = DateTime.Now;
// //currApprove.IsAgree = true;
// DesignDrawingsApproveService.EditApprove(currApprove); //新增专业工程师审核记录
// Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove();
// newApprove.DesignDrawingsId = designDrawings.DesignDrawingsId;
// newApprove.ApproveMan = this.drpAudit.SelectedValue;
// newApprove.ApproveType = Const.InspectionManagement_Audit;
// DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录
// }
// else
// {
// currApprove.ApproveDate = DateTime.Now; //更新审核时间
// currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
// currApprove.ApproveIdea = this.txtidea.Text;
// DesignDrawingsApproveService.EditApprove(currApprove);
if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成
{
Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove();
reApprove.DesignDrawingsId = currApprove.DesignDrawingsId;
reApprove.ApproveDate = DateTime.Now.AddSeconds(10);
reApprove.ApproveMan = CurrUser.UserId;
reApprove.ApproveType = Const.Comprehensive_Complete;
// reApprove.ApproveIdea = txtidea.Text;
DesignDrawingsApproveService.EditApprove(reApprove);
}
else
{
Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove();
reApprove.DesignDrawingsId = currApprove.DesignDrawingsId;
reApprove.ApproveMan = designDrawings.CompileMan;
reApprove.ApproveType = Const.Comprehensive_ReCompile;
DesignDrawingsApproveService.EditApprove(reApprove);
}
}
}
// if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成
// {
// Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove();
// reApprove.DesignDrawingsId = currApprove.DesignDrawingsId;
// reApprove.ApproveDate = DateTime.Now.AddSeconds(10);
// reApprove.ApproveMan = CurrUser.UserId;
// reApprove.ApproveType = Const.Comprehensive_Complete;
// // reApprove.ApproveIdea = txtidea.Text;
// DesignDrawingsApproveService.EditApprove(reApprove);
// }
// else
// {
// Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove();
// reApprove.DesignDrawingsId = currApprove.DesignDrawingsId;
// reApprove.ApproveMan = designDrawings.CompileMan;
// reApprove.ApproveType = Const.Comprehensive_ReCompile;
// DesignDrawingsApproveService.EditApprove(reApprove);
// }
// }
// }
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
// PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
#endregion
// #endregion
}
//}
/// <summary>
/// 保存方法