xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

升级

Browse Source
This commit is contained in:
geh
2026-04-09 15:26:39 +08:00
parent 1066f6ae6f
commit ad4f329930
32 changed files with 1556 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs
+5
View File
@@ -83,6 +83,11 @@ namespace FineUIPro.Web.CQMS.Check
}
btnNew.OnClientClick = Window1.GetShowReference("ChecklistEdit.aspx") + "return false;";
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
var getProject = ProjectService.GetProjectByProjectId(ProjectId);
if (getProject != null && getProject.IsAutoFetch == true)
{
APICheckControlSyncService.getCheckControlLists(this.ProjectId);
}
// 绑定表格
BindGrid();
}
SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/CqmsPersonEdit.aspx.cs
+34
View File
@@ -127,6 +127,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
this.rblIsTrain.SelectedValue = person.IsTrain.HasValue && person.IsTrain == true ? "true" : "false";
}
var personQuality = PersonQualityService.GetPersonQualityByPersonId(this.PersonId);
if (personQuality != null)
{
this.txtCertificateCode.Text = personQuality.CertificateNo;
this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", personQuality.LimitDate);
}
}
else
@@ -376,6 +382,34 @@ namespace FineUIPro.Web.CQMS.Comprehensive
BLL.LogService.AddSys_Log(this.CurrUser, person.PersonName, person.PersonId, BLL.Const.PersonListMenuId,
BLL.Const.BtnModify);
}
if (!string.IsNullOrEmpty(person.PersonId))
{
////更新特岗人员资质
var personQuality = BLL.PersonQualityService.GetPersonQualityByPersonId(person.PersonId);
if (personQuality != null)
{
personQuality.CertificateNo = this.txtCertificateCode.Text.Trim();
personQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text);
personQuality.CompileMan = this.CurrUser.UserId;
personQuality.CompileDate = DateTime.Now;
BLL.PersonQualityService.UpdatePersonQuality(personQuality);
}
else
{
Model.QualityAudit_PersonQuality newPersonQuality = new Model.QualityAudit_PersonQuality
{
PersonQualityId = SQLHelper.GetNewID(typeof(Model.QualityAudit_PersonQuality)),
PersonId = person.PersonId,
CompileMan = this.CurrUser.UserId,
CompileDate = DateTime.Now
};
newPersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim();
newPersonQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text);
BLL.PersonQualityService.AddPersonQuality(newPersonQuality);
}
}
///上传人脸库
var getProject = ProjectService.GetProjectByProjectId(person.ProjectId);
if (!string.IsNullOrEmpty(person.PhotoUrl) && getProject != null && getProject.IsFace == true)
SUBQHSE/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistration.aspx
+6 -3
View File
@@ -73,9 +73,12 @@
FieldType="String" HeaderText="课题" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="Process" DataField="Process"
FieldType="String" HeaderText="颁奖年份" TextAlign="Center"
HeaderTextAlign="Center">
<%-- <f:RenderField Width="180px" ColumnID="Process" DataField="Process" --%>
<%-- FieldType="String" HeaderText="颁奖年份" TextAlign="Center" --%>
<%-- HeaderTextAlign="Center"> --%>
<%-- </f:RenderField> --%>
<f:RenderField Width="120px" ColumnID="AwardYear" DataField="AwardYear" SortField="AwardYear"
FieldType="Date" Renderer="Date" RendererArgument="yyyy" HeaderText="颁奖年份" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Achievement" DataField="Achievement"
FieldType="String" HeaderText="成果" TextAlign="Center"
SUBQHSE/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationEdit.aspx
+6 -3
View File
@@ -51,9 +51,12 @@
<Items>
<%-- <f:TextBox ID="txtProcess" runat="server" LabelWidth="100px" Label="过程" LabelAlign="Right"> --%>
<%-- </f:TextBox> --%>
<f:NumberBox ID="txtProcess" runat="server" Label="颁奖年份" NoDecimal="true" NoNegative="true"
LabelAlign="Right" LabelWidth="100px">
</f:NumberBox>
<%-- <f:NumberBox ID="txtProcess" runat="server" Label="颁奖年份" NoDecimal="true" NoNegative="true" --%>
<%-- LabelAlign="Right" LabelWidth="100px"> --%>
<%-- </f:NumberBox> --%>
<f:DatePicker runat="server" Required="true" DateFormatString="yyyy" Label="颁奖年份" EmptyText="请选择颁奖年份"
ID="txtAwardYear" ShowRedStar="true" DisplayType="Year" ShowTodayButton="false">
</f:DatePicker>
<f:TextBox ID="txtAchievement" runat="server" LabelWidth="120px" Label="成果" LabelAlign="Right">
</f:TextBox>
</Items>
SUBQHSE/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationEdit.aspx.cs
+8 -2
View File
@@ -53,7 +53,8 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
this.drpUnitId.SelectedValue = QCGroupRegistration.UnitId;
}
txtSubjects.Text = QCGroupRegistration.Subjects;
txtProcess.Text = QCGroupRegistration.Process;
// txtProcess.Text = QCGroupRegistration.Process;
txtAwardYear.Text = string.Format("{0:yyyy}", QCGroupRegistration.AwardYear);
txtAchievement.Text = QCGroupRegistration.Achievement;
txtAwardName.Text = QCGroupRegistration.AwardName;
if (!string.IsNullOrEmpty(QCGroupRegistration.AwardType))
@@ -125,7 +126,12 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
QCGroupRegistration.UnitId = this.drpUnitId.SelectedValue;
}
QCGroupRegistration.Subjects = txtSubjects.Text.Trim();
QCGroupRegistration.Process = txtProcess.Text.Trim();
// QCGroupRegistration.Process = txtProcess.Text.Trim();
var awardYearText = this.txtAwardYear.Text.Trim();
if (!string.IsNullOrEmpty(awardYearText))
{
QCGroupRegistration.AwardYear = DateTime.ParseExact(awardYearText, "yyyy", null);
}
QCGroupRegistration.Achievement = txtAchievement.Text.Trim();
QCGroupRegistration.AwardName = txtAwardName.Text.Trim();
if (!string.IsNullOrEmpty(this.drpAwardType.SelectedValue))
SUBQHSE/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationEdit.aspx.designer.cs
Generated
+2 -2
View File
@@ -96,13 +96,13 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
protected global::FineUIPro.TextBox txtSubjects;
/// <summary>
/// txtProcess 控件。
/// txtAwardYear 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtProcess;
protected global::FineUIPro.DatePicker txtAwardYear;
/// <summary>
/// txtAchievement 控件。