修改特种设备菜单,和人员资质互通

This commit is contained in:
潘鸿锋 2024-07-15 16:49:33 +08:00
parent 0a8a11e445
commit 1a2eca2e8e
9 changed files with 166 additions and 107 deletions

View File

@ -0,0 +1,36 @@
--
alter table QualityAudit_SafePersonQuality
add CertificateId nvarchar(50) null;
update sys_menu set MenuName='施工机具和设备' where menuid='28C8EDB9-F1C2-4287-8013-28A976B093E2'
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('2556CFA6-63F7-4FC1-9B2B-5E43A84640EC','特种设备','',1,'28C8EDB9-F1C2-4287-8013-28A976B093E2','Menu_HSSE',0,0,1)
go
update sys_menu set menuname='入场验收记录',SuperMenu='2556CFA6-63F7-4FC1-9B2B-5E43A84640EC' ,SortIndex='20'
where menuid='9703D711-85DA-4A0B-B08B-70F791418696';
update sys_menu set menuname='资质报审及检验报告',SuperMenu='2556CFA6-63F7-4FC1-9B2B-5E43A84640EC' ,SortIndex='10'
where menuid='2DEDD752-8BAF-43CD-933D-932AF9AF2F58';
go
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('8E2FB782-66B3-46C4-8F71-8A5A37585785','普通机具设备','',2,'28C8EDB9-F1C2-4287-8013-28A976B093E2','Menu_HSSE',0,0,1)
go
update sys_menu set menuname='资质报审及检验记录',SuperMenu='8E2FB782-66B3-46C4-8F71-8A5A37585785',SortIndex='10'
where menuid='BFD62699-47F0-49FA-AD39-FAEE8A6C3313';
go
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('CE2687BF-7BBB-4FD5-8FFE-B3B26F712D34','入场验收记录','HSSE/License/EquipmentSafetyList.aspx',
20,'8E2FB782-66B3-46C4-8F71-8A5A37585785','Menu_HSSE',0,1,1)
go
update sys_menu set IsUsed=0 where menuid='3E167389-4775-4AC3-9D31-2E570682EDA1';
update sys_menu set IsUsed=0 where menuid='A4832598-E3D4-4906-88E5-A3886A85FC5A';
update sys_menu set IsUsed=0 where menuid='56F241A9-0AA3-4EDB-8C5C-999C487C06DA';
update sys_menu set IsUsed=0 where menuid='06EA1483-7397-46DD-818D-56911EA7B679';
update sys_menu set IsUsed=0 where menuid='42E7E869-67EA-446E-A910-BE7BF95EDC00';

View File

@ -46,6 +46,8 @@ namespace BLL
CompileDate = SafePersonQuality.CompileDate,
AuditDate = SafePersonQuality.AuditDate,
AuditorId = SafePersonQuality.AuditorId,
CertificateId= SafePersonQuality.CertificateId,
};
db.QualityAudit_SafePersonQuality.InsertOnSubmit(newSafePersonQuality);
db.SubmitChanges();
@ -74,6 +76,8 @@ namespace BLL
newSafePersonQuality.CompileDate = SafePersonQuality.CompileDate;
newSafePersonQuality.AuditDate = SafePersonQuality.AuditDate;
newSafePersonQuality.AuditorId = SafePersonQuality.AuditorId;
newSafePersonQuality.CertificateId = SafePersonQuality.CertificateId;
db.SubmitChanges();
}
}

View File

@ -302,3 +302,24 @@ IP地址:::1
出错时间:07/04/2024 09:53:49
错误信息开始=====>
错误类型:HttpCompileException
错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\QualityAudit\SafePersonQualityEdit.aspx(36): error CS1061: “ASP.hsse_qualityaudit_safepersonqualityedit_aspx”不包含“drpCertificate_TextChanged”的定义并且找不到可接受类型为“ASP.hsse_qualityaudit_safepersonqualityedit_aspx”的第一个参数的扩展方法“drpCertificate_TextChanged”(是否缺少 using 指令或程序集引用?)
错误堆栈:
在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
出错时间:07/11/2024 10:52:14
出错文件:http://localhost:8579/HSSE/QualityAudit/SafePersonQualityEdit.aspx?PersonId=21a0bfc7-516b-4bda-9f09-2f628b256541
IP地址:::1
出错时间:07/11/2024 10:52:14

View File

@ -203,6 +203,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit
BLL.PersonQualityService.AddPersonQuality(personQuality);
BLL.LogService.AddSys_Log(this.CurrUser, personQuality.CertificateNo, personQuality.PersonQualityId, BLL.Const.PersonQualityMenuId, BLL.Const.BtnAdd);
}
if (isClose)
{
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());

View File

@ -33,9 +33,10 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCertificateName" runat="server" Label="证书名称" LabelAlign="Right"
MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="120px">
</f:TextBox>
<f:DropDownList ID="drpCertificate" runat="server" Label="特岗证书" AutoPostBack="true" OnSelectedIndexChanged="drpCertificate_TextChanged"
LabelAlign="Right" LabelWidth="120px" EnableEdit="true" Required="true" ShowRedStar="true" >
</f:DropDownList>
<f:TextBox ID="txtCertificateNo" runat="server" Label="证书编号" LabelAlign="Right"
MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="120px">
</f:TextBox>
@ -76,8 +77,10 @@
<f:DatePicker ID="txtLateCheckDate" Label="最近复查日期" runat="server" LabelAlign="Right"
EnableEdit="true" LabelWidth="120px">
</f:DatePicker>
<f:Label ID="Label1" runat="server">
</f:Label>
<f:TextBox ID="txtCertificateName" runat="server" Label="证书名称" LabelAlign="Right"
MaxLength="50" LabelWidth="120px" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>

View File

@ -1,5 +1,6 @@
using BLL;
using System;
using System.Linq;
namespace FineUIPro.Web.HSSE.QualityAudit
{
@ -61,6 +62,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit
{
if (!IsPostBack)
{
CertificateService.InitCertificateDropDownList(this.drpCertificate, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.PersonId = Request.Params["PersonId"];
this.ProjectId = this.CurrUser.LoginProjectId;
@ -102,6 +105,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit
}
this.txtRemark.Text = SafePersonQuality.Remark;
this.txtAuditDate.Text = string.Format("{0:yyyy-MM-dd}", SafePersonQuality.AuditDate);
this.drpCertificate.SelectedValue = SafePersonQuality.CertificateId;
}
}
else
@ -135,6 +140,12 @@ namespace FineUIPro.Web.HSSE.QualityAudit
{
if (string.IsNullOrEmpty(this.SafePersonQualityId))
{
if (this.drpCertificate.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpCertificate.SelectedValue))
{
Alert.ShowInTop("请选择特岗证书!", MessageBoxIcon.Warning);
return;
}
SaveData(false);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SafePersonQualityAttachUrl&menuId={1}", SafePersonQualityId, BLL.Const.SafePersonQualityMenuId)));
@ -150,9 +161,22 @@ namespace FineUIPro.Web.HSSE.QualityAudit
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (this.drpCertificate.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpCertificate.SelectedValue))
{
Alert.ShowInTop("请选择特岗证书!", MessageBoxIcon.Warning);
return;
}
SaveData(true);
}
protected void drpCertificate_TextChanged(object sender, EventArgs e) {
if (this.drpCertificate.SelectedValue!=Const._Null)
{
this.txtCertificateName.Text = this.drpCertificate.SelectedItem.Text;
}
}
/// <summary>
/// 保存数据
/// </summary>
@ -165,7 +189,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit
{
PersonId = this.PersonId,
CertificateNo = this.txtCertificateNo.Text.Trim(),
CertificateName = this.txtCertificateName.Text.Trim(),
CertificateId = this.drpCertificate.SelectedValue,
CertificateName = this.drpCertificate.SelectedItem.Text,
Grade = this.txtGrade.Text.Trim(),
SendUnit = this.txtSendUnit.Text.Trim(),
SendDate = Funs.GetNewDateTime(this.txtSendDate.Text.Trim()),

View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.QualityAudit {
namespace FineUIPro.Web.HSSE.QualityAudit
{
public partial class SafePersonQualityEdit {
public partial class SafePersonQualityEdit
{
/// <summary>
/// form1 控件。
@ -76,13 +78,13 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
protected global::FineUIPro.TextBox txtWorkPostName;
/// <summary>
/// txtCertificateName 控件。
/// drpCertificate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCertificateName;
protected global::FineUIPro.DropDownList drpCertificate;
/// <summary>
/// txtCertificateNo 控件。
@ -157,13 +159,13 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
protected global::FineUIPro.DatePicker txtLateCheckDate;
/// <summary>
/// Label1 控件。
/// txtCertificateName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
protected global::FineUIPro.TextBox txtCertificateName;
/// <summary>
/// txtRemark 控件。

View File

@ -244,6 +244,14 @@ namespace FineUIPro.Web.HSSE.SitePerson
this.txtCertificateCode.Text = personQuality.CertificateNo;
this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", personQuality.LimitDate);
}
var safePersonQuality = BLL.SafePersonQualityService.GetSafePersonQualityByPersonId(person.PersonId);
if (safePersonQuality!=null)
{
this.drpCertificate.SelectedValue = safePersonQuality.CertificateId;
this.txtCertificateCode.Text = safePersonQuality.CertificateNo;
this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", safePersonQuality.LimitDate);
}
}
else
{
@ -625,8 +633,10 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
if (this.drpCertificate.SelectedValue != BLL.Const._Null)
{
safePersonQuality.CertificateId = this.drpCertificate.SelectedValue;
safePersonQuality.CertificateName = this.drpCertificate.SelectedItem.Text;
}
safePersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim();
safePersonQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text);
safePersonQuality.CompileMan = this.CurrUser.UserId;
@ -644,6 +654,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
};
if (this.drpCertificate.SelectedValue != BLL.Const._Null)
{
newSafePersonQuality.CertificateId = drpCertificate.SelectedValue;
newSafePersonQuality.CertificateName = this.drpCertificate.SelectedItem.Text;
}
newSafePersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim();

View File

@ -61968,8 +61968,6 @@ namespace Model
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet;
#region
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -62021,7 +62019,6 @@ namespace Model
public Check_CheckSpecial()
{
this._Base_Project = default(EntityRef<Base_Project>);
this._Technique_CheckItemSet = default(EntityRef<Technique_CheckItemSet>);
OnCreated();
}
@ -62340,10 +62337,6 @@ namespace Model
{
if ((this._CheckItemSetId != value))
{
if (this._Technique_CheckItemSet.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnCheckItemSetIdChanging(value);
this.SendPropertyChanging();
this._CheckItemSetId = value;
@ -62487,40 +62480,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Technique_CheckItemSet", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", IsForeignKey=true)]
public Technique_CheckItemSet Technique_CheckItemSet
{
get
{
return this._Technique_CheckItemSet.Entity;
}
set
{
Technique_CheckItemSet previousValue = this._Technique_CheckItemSet.Entity;
if (((previousValue != value)
|| (this._Technique_CheckItemSet.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Technique_CheckItemSet.Entity = null;
previousValue.Check_CheckSpecial.Remove(this);
}
this._Technique_CheckItemSet.Entity = value;
if ((value != null))
{
value.Check_CheckSpecial.Add(this);
this._CheckItemSetId = value.CheckItemSetId;
}
else
{
this._CheckItemSetId = default(string);
}
this.SendPropertyChanged("Technique_CheckItemSet");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -312343,6 +312302,8 @@ namespace Model
private string _States;
private string _CertificateId;
private EntityRef<SitePerson_Person> _SitePerson_Person;
private EntityRef<Sys_User> _Sys_User;
@ -312387,6 +312348,8 @@ namespace Model
partial void OnAuditOpinionChanged();
partial void OnStatesChanging(string value);
partial void OnStatesChanged();
partial void OnCertificateIdChanging(string value);
partial void OnCertificateIdChanged();
#endregion
public QualityAudit_SafePersonQuality()
@ -312749,6 +312712,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateId", DbType="NVarChar(50)")]
public string CertificateId
{
get
{
return this._CertificateId;
}
set
{
if ((this._CertificateId != value))
{
this.OnCertificateIdChanging(value);
this.SendPropertyChanging();
this._CertificateId = value;
this.SendPropertyChanged("CertificateId");
this.OnCertificateIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_QualityAudit_SafePersonQuality_SitePerson_Person", Storage="_SitePerson_Person", ThisKey="PersonId", OtherKey="PersonId", IsForeignKey=true)]
public SitePerson_Person SitePerson_Person
{
@ -370337,8 +370320,6 @@ namespace Model
private System.Nullable<bool> _IsBuiltIn;
private EntitySet<Check_CheckSpecial> _Check_CheckSpecial;
private EntitySet<Technique_CheckItemDetail> _Technique_CheckItemDetail;
#region
@ -370365,7 +370346,6 @@ namespace Model
public Technique_CheckItemSet()
{
this._Check_CheckSpecial = new EntitySet<Check_CheckSpecial>(new Action<Check_CheckSpecial>(this.attach_Check_CheckSpecial), new Action<Check_CheckSpecial>(this.detach_Check_CheckSpecial));
this._Technique_CheckItemDetail = new EntitySet<Technique_CheckItemDetail>(new Action<Technique_CheckItemDetail>(this.attach_Technique_CheckItemDetail), new Action<Technique_CheckItemDetail>(this.detach_Technique_CheckItemDetail));
OnCreated();
}
@ -370530,19 +370510,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Check_CheckSpecial", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
public EntitySet<Check_CheckSpecial> Check_CheckSpecial
{
get
{
return this._Check_CheckSpecial;
}
set
{
this._Check_CheckSpecial.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Technique_CheckItemDetail_Technique_CheckItemSet", Storage="_Technique_CheckItemDetail", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
public EntitySet<Technique_CheckItemDetail> Technique_CheckItemDetail
{
@ -370576,18 +370543,6 @@ namespace Model
}
}
private void attach_Check_CheckSpecial(Check_CheckSpecial entity)
{
this.SendPropertyChanging();
entity.Technique_CheckItemSet = this;
}
private void detach_Check_CheckSpecial(Check_CheckSpecial entity)
{
this.SendPropertyChanging();
entity.Technique_CheckItemSet = null;
}
private void attach_Technique_CheckItemDetail(Technique_CheckItemDetail entity)
{
this.SendPropertyChanging();