1、单位数据清理合并功能;

2、单位新增编辑功能调整,补充英文名称等;
3、建筑企业单位资质字典;
This commit is contained in:
2025-09-02 10:48:28 +08:00
parent ce304ec7d9
commit 6ccc14a8be
54 changed files with 3964 additions and 2471 deletions
@@ -153,9 +153,10 @@ namespace FineUIPro.Web.HSSE.QualityAudit
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.UnitId = Request.Params["UnitId"];
if (!string.IsNullOrEmpty(this.UnitId))
{
InitDropDownList();
var unit = BLL.UnitService.GetUnitByUnitId(this.UnitId);
if (unit != null)
{
@@ -166,8 +167,13 @@ namespace FineUIPro.Web.HSSE.QualityAudit
var subUnitQuality = BLL.SubUnitQualityService.GetSubUnitQualityByUnitId(this.UnitId);
if (subUnitQuality != null)
{
this.SubUnitQualityId = subUnitQuality.SubUnitQualityId;
this.SubUnitQualityId = subUnitQuality.SubUnitQualityId;
this.txtSubUnitQualityName.Text = subUnitQuality.SubUnitQualityName;
if (!string.IsNullOrWhiteSpace(subUnitQuality.QualityId))
{
this.drpUnitQualityBox.Value = subUnitQuality.QualityId;
}
this.txtBusinessLicense.Text = subUnitQuality.SubUnitQualityName;
this.txtBL_EnableDate.Text = string.Format("{0:yyyy-MM-dd}", subUnitQuality.BL_EnableDate);
this.BL_ScanUrl = subUnitQuality.BL_ScanUrl;
@@ -184,7 +190,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
this.txtQL_EnableDate.Text = string.Format("{0:yyyy-MM-dd}", subUnitQuality.QL_EnableDate);
this.QL_ScanUrl = subUnitQuality.QL_ScanUrl;
this.divQL_ScanUrl.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", this.QL_ScanUrl);
this.txtHSELicense.Text = subUnitQuality.HSELicense;
this.txtH_EnableDate.Text = string.Format("{0:yyyy-MM-dd}", subUnitQuality.H_EnableDate);
this.H_ScanUrl = subUnitQuality.H_ScanUrl;
@@ -194,17 +200,31 @@ namespace FineUIPro.Web.HSSE.QualityAudit
this.txtH_EnableDate2.Text = string.Format("{0:yyyy-MM-dd}", subUnitQuality.H_EnableDate2);
this.H_ScanUrl2 = subUnitQuality.H_ScanUrl2;
this.divH_ScanUrl2.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", this.H_ScanUrl2);
this.txtSecurityLicense.Text = subUnitQuality.SecurityLicense;
this.txtSL_EnableDate.Text = string.Format("{0:yyyy-MM-dd}", subUnitQuality.SL_EnableDate);
this.SL_ScanUrl = subUnitQuality.SL_ScanUrl;
this.divSL_ScanUrl.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", this.SL_ScanUrl);
}
this.GetButtonPower();
}
}
}
/// <summary>
/// 初始化下拉框
/// </summary>
private void InitDropDownList()
{
var qualifications = Funs.DB.Base_Qualification.OrderBy(x => x.QualificationCode);
this.radUnitQuality.DataTextField = "QualificationName";
this.radUnitQuality.DataValueField = "QualificationId";
this.radUnitQuality.DataSource = qualifications;
this.radUnitQuality.DataBind();
}
#endregion
#region
@@ -344,7 +364,6 @@ namespace FineUIPro.Web.HSSE.QualityAudit
Model.QualityAudit_SubUnitQuality subUnitQuality = new Model.QualityAudit_SubUnitQuality
{
UnitId = this.UnitId,
SubUnitQualityName = this.txtSubUnitQualityName.Text.Trim(),
BusinessLicense = this.txtBusinessLicense.Text.Trim(),
BL_EnableDate = Funs.GetNewDateTime(this.txtBL_EnableDate.Text.Trim()),
BL_ScanUrl = this.BL_ScanUrl,
@@ -369,6 +388,21 @@ namespace FineUIPro.Web.HSSE.QualityAudit
CompileMan = this.CurrUser.UserId,
CompileDate = DateTime.Now
};
subUnitQuality.SubUnitQualityName = this.txtSubUnitQualityName.Text.Trim();
if (this.radUnitQuality.SelectedItemArray.Count() > 0)
{
string qids = string.Empty;
foreach (var item in this.radUnitQuality.SelectedItemArray)
{
qids += item.Value + ",";
}
if (!string.IsNullOrEmpty(qids))
{
qids = qids.Substring(0, qids.LastIndexOf(","));
}
subUnitQuality.QualityId = qids;
}
if (!string.IsNullOrEmpty(this.SubUnitQualityId))
{
subUnitQuality.SubUnitQualityId = this.SubUnitQualityId;