lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

Browse Source
This commit is contained in:
高飞
2024-07-16 09:04:07 +08:00
parent d529f66c2a d7606e94cd
commit e3286e45d8
14 changed files with 1275 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx
+1 -1
View File
@@ -17,7 +17,7 @@
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" ShowHeader="false" Layout="VBox" AutoScroll="true" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" IsFluid="true" ShowBorder="true" ShowHeader="true" Title="现场控制点裁剪"
runat="server" EnableCollapse="true" DataKeyNames="ControlId,ParentId,ControlLevel,States" EnableTree="true"
runat="server" EnableCollapse="true" DataKeyNames="ControlId,ParentId,ControlLevel,States,MaxLevel" EnableTree="true"
TreeColumn="DetectionItems" DataIDField="ControlId" AllowPaging="false" DataParentIDField="ParentId" OnRowDataBound="Grid1_RowDataBound"
AllowCellEditing="false" ClicksToEdit="1" OnRowCommand="Grid1_RowCommand" ExpandAllTreeNodes="true" EnableMultiSelect="false">
<Toolbars>
SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx.cs
+4 -3
View File
@@ -30,8 +30,8 @@ namespace FineUIPro.Web.CQMS.WBS.Control
/// </summary>
public void DataBrid()
{
string strSql = @"select * from(select a.ControlId,a.ProjectId,a.ParentId,a.ControlCode,a.ControlLevel,a.PlanId,a.PlanTypeId,a.SubItemsId,a.DetectionItems,a.BasedCriterion,a.QualityRecordName,a.RecordNumber,a.Subcontractors,a.OperateTime,a.Sort,a.States,a.Partition from Control_PointCropping as a where isnull(a.ProjectId,'')='' ";
string strSql1 = "select a.ControlId,a.ProjectId,a.ParentId,a.ControlCode,a.ControlLevel,a.PlanId,a.PlanTypeId,a.SubItemsId,a.DetectionItems,a.BasedCriterion,a.QualityRecordName,a.RecordNumber,a.Subcontractors,a.OperateTime,a.Sort,a.States,a.Partition from Control_PointCropping as a where a.ProjectId=@ProjectId ";
string strSql = @"select * from(select a.ControlId,a.ProjectId,a.ParentId,a.ControlCode,a.ControlLevel,a.PlanId,a.PlanTypeId,a.SubItemsId,a.DetectionItems,a.BasedCriterion,a.QualityRecordName,a.RecordNumber,a.Subcontractors,a.OperateTime,a.Sort,a.States,a.Partition,a.MaxLevel from Control_PointCropping as a where isnull(a.ProjectId,'')='' ";
string strSql1 = "select a.ControlId,a.ProjectId,a.ParentId,a.ControlCode,a.ControlLevel,a.PlanId,a.PlanTypeId,a.SubItemsId,a.DetectionItems,a.BasedCriterion,a.QualityRecordName,a.RecordNumber,a.Subcontractors,a.OperateTime,a.Sort,a.States,a.Partition,a.MaxLevel from Control_PointCropping as a where a.ProjectId=@ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (!string.IsNullOrEmpty(sDetectionItems.Text.Trim()))
@@ -143,8 +143,9 @@ namespace FineUIPro.Web.CQMS.WBS.Control
var rowIndex = Grid1.SelectedRowIndex;
var rowId = Grid1.DataKeys[rowIndex][0].ToString();
var maxLevel = Grid1.DataKeys[rowIndex][4] == null ? 3 : int.Parse(Grid1.DataKeys[rowIndex][4].ToString());
var controlLevel = Grid1.DataKeys[rowIndex][2] != null ? Convert.ToInt32(Grid1.DataKeys[rowIndex][2]) : 1;
if (controlLevel > 2)
if (controlLevel >= maxLevel)
{
ShowNotify("最小节点无子节点!", MessageBoxIcon.Warning);
return;
SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx
+12 -1
View File
@@ -44,7 +44,18 @@
</f:Label>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="three" Hidden="true">
<Items>
<f:Label ID="lblThreeDetectionItems" runat="server" Label="三级质量控制点检查、检测项" LabelAlign="Right" LabelWidth="200px">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="four" Hidden="true">
<Items>
<f:Label ID="lblFourDetectionItems" runat="server" Label="四级质量控制点检查、检测项" LabelAlign="Right" LabelWidth="200px">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDetectionItems" runat="server" Label="质量控制点检查、检测项" LabelAlign="Right" Required="true" LabelWidth="200px">
SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx.cs
+97
View File
@@ -110,6 +110,64 @@ namespace FineUIPro.Web.CQMS.WBS.Control
txtSort.Text = num.ToString();
}
}
else if (itemModel.ControlLevel == 3)
{
one.Hidden = false;
two.Hidden = false;
three.Hidden = false;
var oneModel = parenLs.FirstOrDefault(p => p.ControlLevel == 1);
if (oneModel != null)
{
lblOneDetectionItems.Text = oneModel.DetectionItems;
}
var twoModel = parenLs.FirstOrDefault(p => p.ControlLevel == 2);
if (twoModel != null)
{
lblTwoDetectionItems.Text = twoModel.DetectionItems;
}
var threeModel = parenLs.FirstOrDefault(p => p.ControlLevel == 3);
if (threeModel != null)
{
lblThreeDetectionItems.Text = threeModel.DetectionItems;
}
if (string.IsNullOrWhiteSpace(this.ControlId))
{
num = Funs.DB.Control_PointCropping.Count() + 1;
txtSort.Text = num.ToString();
}
}
else if (itemModel.ControlLevel == 4)
{
one.Hidden = false;
two.Hidden = false;
three.Hidden = false;
four.Hidden = false;
var oneModel = parenLs.FirstOrDefault(p => p.ControlLevel == 1);
if (oneModel != null)
{
lblOneDetectionItems.Text = oneModel.DetectionItems;
}
var twoModel = parenLs.FirstOrDefault(p => p.ControlLevel == 2);
if (twoModel != null)
{
lblTwoDetectionItems.Text = twoModel.DetectionItems;
}
var threeModel = parenLs.FirstOrDefault(p => p.ControlLevel == 3);
if (threeModel != null)
{
lblThreeDetectionItems.Text = threeModel.DetectionItems;
}
var fourModel = parenLs.FirstOrDefault(p => p.ControlLevel == 4);
if (fourModel != null)
{
lblFourDetectionItems.Text = fourModel.DetectionItems;
}
if (string.IsNullOrWhiteSpace(this.ControlId))
{
num = Funs.DB.Control_PointCropping.Count() + 1;
txtSort.Text = num.ToString();
}
}
}
}
}
@@ -144,6 +202,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
/// </summary>
protected void btnSave_Click(object sender, EventArgs e)
{
int maxlevel = 3;
var model = new Control_PointCropping();
model.ControlId = this.FId;
var oneControlId = string.Empty;
@@ -174,6 +233,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
model.ParentId = oneModel.ControlId;
model.PlanTypeId = model.ControlId;
model.ControlLevel = 2;
maxlevel = model.MaxLevel.Value;
}
var twoModel = parenLs.FirstOrDefault(p => p.ControlLevel == 2);
if (twoModel != null)
@@ -183,7 +243,31 @@ namespace FineUIPro.Web.CQMS.WBS.Control
model.PlanTypeId = twoModel.ControlId;
model.SubItemsId = model.ControlId;
model.ControlLevel = 3;
maxlevel = model.MaxLevel.Value;
}
var threeModel = parenLs.FirstOrDefault(p => p.ControlLevel == 3);
if (threeModel != null)
{
model.PlanId = threeModel.PlanId;
model.ParentId = threeModel.ControlId;
model.PlanTypeId = threeModel.ControlId;
model.SubItemsId = model.ControlId;
model.ControlLevel = 4;
maxlevel = model.MaxLevel.Value;
}
var fourModel = parenLs.FirstOrDefault(p => p.ControlLevel == 4);
if (fourModel != null)
{
model.PlanId = fourModel.PlanId;
model.ParentId = fourModel.ControlId;
model.PlanTypeId = fourModel.ControlId;
model.SubItemsId = model.ControlId;
model.ControlLevel = 5;
maxlevel = model.MaxLevel.Value;
}
}
}
else
@@ -200,6 +284,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
model.Partition = txtPartition.Text;
model.ControlCode = txtControlCode.Text;
model.Remark = txtRemark.Text;
model.MaxLevel = maxlevel;
if (string.IsNullOrWhiteSpace(this.ControlId)) Funs.DB.Control_PointCropping.InsertOnSubmit(model);
Funs.DB.SubmitChanges();
ShowNotify("保存成功!", MessageBoxIcon.Success);
@@ -229,6 +314,18 @@ namespace FineUIPro.Web.CQMS.WBS.Control
var itemCropping = Funs.DB.Control_PointCropping.FirstOrDefault(p => p.ControlId == parentId);
if (itemCropping != null)
{
//仅土建为5级 其余的都是三级，此处特殊处理
if (itemCropping.MaxLevel > 3)
{
var tsCropping = Funs.DB.Control_PointCropping.FirstOrDefault(p => p.ControlId == itemCropping.ParentId);
if (tsCropping != null)
{
ids.Add(tsCropping.ControlId);
ids.Add(tsCropping.ParentId);
ids.Add(tsCropping.PlanId);
ids.Add(tsCropping.PlanTypeId);
}
}
ids.Add(itemCropping.ControlId);
if (!string.IsNullOrWhiteSpace(itemCropping.PlanId))
{
SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx.designer.cs
Generated
+36
View File
@@ -122,6 +122,42 @@ namespace FineUIPro.Web.CQMS.WBS.Control
/// </remarks>
protected global::FineUIPro.Label lblTwoDetectionItems;
/// <summary>
/// three 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow three;
/// <summary>
/// lblThreeDetectionItems 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblThreeDetectionItems;
/// <summary>
/// four 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow four;
/// <summary>
/// lblFourDetectionItems 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblFourDetectionItems;
/// <summary>
/// txtDetectionItems 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs
+2
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());
SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx
+8 -5
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>
SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.cs
+26 -1
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()),
SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.designer.cs
Generated
+34 -32
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.QualityAudit {
public partial class SafePersonQualityEdit {
namespace FineUIPro.Web.HSSE.QualityAudit
{
public partial class SafePersonQualityEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtUnitCode 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUnitCode;
/// <summary>
/// txtUnitName 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUnitName;
/// <summary>
/// txtPersonName 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPersonName;
/// <summary>
/// txtWorkPostName 控件。
/// </summary>
@@ -74,16 +76,16 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkPostName;
/// <summary>
/// txtCertificateName 控件。
/// drpCertificate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCertificateName;
protected global::FineUIPro.DropDownList drpCertificate;
/// <summary>
/// txtCertificateNo 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCertificateNo;
/// <summary>
/// txtGrade 控件。
/// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtGrade;
/// <summary>
/// txtSendUnit 控件。
/// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSendUnit;
/// <summary>
/// txtSendDate 控件。
/// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtSendDate;
/// <summary>
/// txtLimitDate 控件。
/// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtLimitDate;
/// <summary>
/// drpAuditor 控件。
/// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpAuditor;
/// <summary>
/// txtAuditDate 控件。
/// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtAuditDate;
/// <summary>
/// txtLateCheckDate 控件。
/// </summary>
@@ -155,16 +157,16 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtLateCheckDate;
/// <summary>
/// Label1 控件。
/// txtCertificateName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
protected global::FineUIPro.TextBox txtCertificateName;
/// <summary>
/// txtRemark 控件。
/// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnAttachUrl 控件。
/// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// WindowAtt 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
+11
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();