shecs
/
Basf_FCL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

质量事件报告附件必填

This commit is contained in:
毕文静 2024-12-03 11:23:18 +08:00
parent f242f21537
commit 4cb04a16f4
3 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx
View File

@ -172,7 +172,8 @@
<Items>
<f:Panel ID="Panel1" Width="500px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label2" runat="server" Label="质量调查相关附件" LabelAlign="Right" LabelWidth="150px">
<f:Label ID="Label9" runat="server" Text="*" CssClass="customlabel" Width="5px"></f:Label>
<f:Label ID="Label2" runat="server" Label="质量调查相关附件" LabelAlign="Right" LabelWidth="140px">
</f:Label>
<f:Button ID="btnAttach2" Icon="TableCell" EnablePostBack="true" Text="上传" runat="server" OnClick="btnAttach2_Click">
</f:Button>
@ -244,13 +245,6 @@
<Items>
<f:Form ShowBorder="false" ShowHeader="false" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<%--<f:FormRow>
<Items>
<f:TextBox ID="txtContractor3" runat="server" Label="涉及承包商" LabelAlign="Right" LabelWidth="150px"></f:TextBox>
<f:DropDownList ID="drpPVTRequester2" runat="server" Label="PVT小组组长/请购人" LabelAlign="Right" LabelWidth="150px" EnableEdit="true"></f:DropDownList>
</Items>
</f:FormRow>--%>
<f:FormRow>
<Items><f:DropDownList ID="drpBuyer2" runat="server" Label="采购员" LabelAlign="Right" LabelWidth="150px" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpViolationClause2" runat="server" Label="违章条款" EnableEdit="true" LabelAlign="Right" LabelWidth="150px" EnableGroup="true"
@ -274,7 +268,8 @@
<f:TextBox ID="txtFo" runat="server" Label="合同号" LabelAlign="Right" LabelWidth="150px"></f:TextBox>
<f:Panel ID="Panel2" Width="500px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label7" runat="server" Label="质量调查相关附件" LabelAlign="Right" LabelWidth="150px">
<f:Label ID="Label10" runat="server" Text="*" CssClass="customlabel" Width="5px"></f:Label>
<f:Label ID="Label7" runat="server" Label="质量调查相关附件" LabelAlign="Right" LabelWidth="140px">
</f:Label>
<f:Button ID="btnAttach3" Icon="TableCell" EnablePostBack="true" Text="上传" runat="server" OnClick="btnAttach2_Click">
</f:Button>

23
FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.cs
View File

@ -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)

18
FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.designer.cs generated
View File

@ -473,6 +473,15 @@ namespace FineUIPro.Web.ContractorQuality
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Label9 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label9;
/// <summary>
/// Label2 控件。
/// </summary>
@ -653,6 +662,15 @@ namespace FineUIPro.Web.ContractorQuality
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label10 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label10;
/// <summary>
/// Label7 控件。
/// </summary>