diff --git a/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx b/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx index 2733606..ce4d93e 100644 --- a/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx +++ b/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx @@ -172,7 +172,8 @@ - + + @@ -244,13 +245,6 @@ - <%-- - - - - - - --%> - + + diff --git a/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.cs b/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.cs index 33aa7f1..b08dc81 100644 --- a/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.cs +++ b/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.cs @@ -515,6 +515,7 @@ namespace FineUIPro.Web.ContractorQuality txtIndividualPerson.Enabled = false; txtIndividual.Enabled = false; drpUserDep.Enabled = false; + Label9.Enabled = false; Label2.Enabled = false; btnAttach2.Enabled = false; Label6.Enabled = false; @@ -533,6 +534,7 @@ namespace FineUIPro.Web.ContractorQuality Label7.Enabled = false; btnAttach3.Enabled = false; Label8.Enabled = false; + Label10.Enabled = false; } #endregion @@ -722,6 +724,16 @@ namespace FineUIPro.Web.ContractorQuality pun.Individual = Funs.GetNewDecimal(this.txtIndividual.Text.Trim()); if (pun.IsFrame == true)//框架合同 { + var att2 = from x in Funs.DB.AttachFile where x.ToKeyId == this.PunishmentId + "#2" select x; + if (att2.Count() > 0) + { + //punishment.AttachUrl = att.First().AttachUrl; + } + else + { + Alert.ShowInTop("请上传质量调查相关附件!", MessageBoxIcon.Warning); + return; + } if (this.drpUserDep.SelectedValue != BLL.Const._Null) { pun.UserDep = this.drpUserDep.SelectedValue; @@ -859,6 +871,16 @@ namespace FineUIPro.Web.ContractorQuality } else { + var att2 = from x in Funs.DB.AttachFile where x.ToKeyId == this.PunishmentId + "#2" select x; + if (att2.Count() > 0) + { + //punishment.AttachUrl = att.First().AttachUrl; + } + else + { + Alert.ShowInTop("请上传质量调查相关附件!", MessageBoxIcon.Warning); + return; + } if (this.drpBuyer2.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpBuyer2.SelectedValue)) { pun.Buyer = this.drpBuyer2.SelectedValue; @@ -889,7 +911,6 @@ namespace FineUIPro.Web.ContractorQuality audit.AuditMan = pun.Buyer; BLL.PunishmentAuditService.AddPunishmentAudit(audit); - #region PVT小组组长/请购人填写完成后邮件:发送给采购员,抄送流程经办人 Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId); if (pops == null) diff --git a/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.designer.cs b/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.designer.cs index 40c65a0..50b947b 100644 --- a/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.designer.cs +++ b/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.designer.cs @@ -473,6 +473,15 @@ namespace FineUIPro.Web.ContractorQuality /// protected global::FineUIPro.Panel Panel1; + /// + /// Label9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label9; + /// /// Label2 控件。 /// @@ -653,6 +662,15 @@ namespace FineUIPro.Web.ContractorQuality /// protected global::FineUIPro.Panel Panel2; + /// + /// Label10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label10; + /// /// Label7 控件。 ///