20240424 质量综合管理导入

This commit is contained in:
2024-04-24 17:11:15 +08:00
parent b58beb2472
commit 0e66fec516
60 changed files with 2964 additions and 1289 deletions
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
LoadAuditSelect();
this.agree.Hidden = true;
this.options.Hidden = true;
this.btnSave.Hidden = true;
this.btnSubmit.Hidden = true;
this.DesignDetailsId = Request.Params["DesignDetailsId"];
@@ -72,7 +72,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtJoinPersonNum.Text = designDetails.JoinPersonNum.ToString();
}
var auditApprove = DesignDetailsApproveService.GetAuditApprove(designDetails.DesignDetailsId, BLL.Const.Comprehensive_Audit);
if (auditApprove!=null)
if (auditApprove != null)
{
drpAudit.SelectedValue = auditApprove.ApproveMan;
@@ -89,7 +89,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}//审核状态 审核人 可以显示 提交 保存按钮
else if (currApprove.ApproveType == BLL.Const.Comprehensive_Audit && currApprove.ApproveMan == CurrUser.UserId)
{
//审核状态不可编辑
Readonly();
@@ -131,11 +131,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtDetailsMan.Readonly = true;
this.drpUnitIds.Readonly = true;
this.drpUnitWorks.Readonly = true;
this.drpAudit.Readonly = true;
//this.btnAttach.Enabled = false;
}
/// <summary>
@@ -237,11 +237,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
designDetails.DesignDetailsId = this.DesignDetailsId;
var model = Funs.DB.Comprehensive_DesignDetails.Where(u => u.DesignDetailsId == this.DesignDetailsId).FirstOrDefault();
if (model != null)
{
{
designDetails.Status = model.Status;
}
BLL.DesignDetailsService.UpdateDesignDetails(designDetails);
}
}
ShowNotify("保存成功!", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
@@ -399,7 +399,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
reApprove.ApproveDate = DateTime.Now.AddSeconds(10);
reApprove.ApproveMan = CurrUser.UserId;
reApprove.ApproveType = Const.Comprehensive_Complete;
// reApprove.ApproveIdea = txtidea.Text;
// reApprove.ApproveIdea = txtidea.Text;
DesignDetailsApproveService.EditApprove(reApprove);
}
else
@@ -439,14 +439,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails));
}
Model.Comprehensive_DesignDetails designDetails = BLL.DesignDetailsService.GetDesignDetailsById(this.DesignDetailsId);
if (designDetails == null || ((designDetails.CompileMan == CurrUser.UserId && designDetails.Status == BLL.Const.Comprehensive_Compile) || (designDetails.CompileMan == CurrUser.UserId && designDetails.Status == BLL.Const.Comprehensive_ReCompile)))
if (designDetails.Status == BLL.Const.Comprehensive_Complete)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/designDetails&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignDetailsMenuId)));
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/designDetails&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignDetailsMenuId)));
}
else
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/designDetails&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignDetailsMenuId)));
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/designDetails&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignDetailsMenuId)));
}
}
#endregion