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

20241219

This commit is contained in:
毕文静 2024-12-19 10:34:50 +08:00
parent a4a6460b56
commit 1955a07538
5 changed files with 60 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,20 @@ namespace FineUIPro.Web.ContractorQuality
this.PunishmentId = Request.Params["punishmentId"];
if (!string.IsNullOrEmpty(this.PunishmentId))
{
var att1 = from x in Funs.DB.AttachFile where x.ToKeyId == this.PunishmentId + "#1" select x;
if (att1.Count() == 0)
{
lbtnViewAttach.Hidden = true;
}
var att2 = from x in Funs.DB.AttachFile where x.ToKeyId == this.PunishmentId + "#2" select x;
if (att2.Count() == 0)
{
lbtnViewAttach2.Hidden = true;
lbtnAttach3.Hidden = true;
}
Model.EMC_Punishment pun = BLL.PunishmentService.GetPunishmentById(this.PunishmentId);
if (pun != null)
{

10
FCL/FineUIPro.Web/Global.asax.cs
View File

@ -886,23 +886,17 @@
if (contractAdmin.Count() > 0)
{
userList.Add(contractAdmin.First());
}
var buyer = from x in Funs.DB.Sys_User where x.UserName == fo.Buyer && x.Email != null && x.Email != "" select x;
var buyer = from x in Funs.DB.Sys_User where x.UserId == fo.BuyerId && x.Email != null && x.Email != "" select x;
if (buyer.Count() > 0)
{
userList.Add(buyer.First());
userList.Add(buyer.First());
}
var mainCoor = from x in Funs.DB.Sys_User where x.UserId == fo.Main_Coordinator && x.Email != null && x.Email != "" select x;
if (mainCoor.Count() > 0)
{
userList.Add(mainCoor.First());
}
var userRepresentative = from x in Funs.DB.Sys_User where x.UserId == fo.User_Representative && x.Email != null && x.Email != "" select x;
if (userRepresentative.Count() > 0)
{

30
FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx
View File

@ -114,40 +114,42 @@
<f:FormRow>
<Items>
<f:NumberBox ID="txtNumExceedLimit" runat="server" Label="Exceed limit(day)" LabelWidth="160px" NoDecimal="true" NoNegative="true"></f:NumberBox>
<f:NumberBox ID="txtRemainingBudget" runat="server" Label="Remaining Budget" LabelWidth="160px" Readonly="true" EnableCommas="true"></f:NumberBox>
<f:NumberBox ID="txtRemainingBudgetRate" runat="server" Label="Remaining Budget%" LabelWidth="160px" Readonly="true" DecimalPrecision="2"></f:NumberBox>
<%--<f:NumberBox ID="txtRemainingBudget" runat="server" Label="Remaining Budget" LabelWidth="160px" Readonly="true" EnableCommas="true"></f:NumberBox>--%>
<%--<f:NumberBox ID="txtRemainingBudgetRate" runat="server" Label="Remaining Budget%" LabelWidth="160px" Readonly="true" DecimalPrecision="2"></f:NumberBox>--%>
<f:NumberBox ID="txtRemainingDurationRate" runat="server" Label="Remaining Duration%" LabelWidth="160px" Readonly="true" DecimalPrecision="2"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpIfExtend" runat="server" Label="If Extend" LabelAlign="Right" LabelWidth="160px" EnableEdit="false" AutoPostBack="true" OnSelectedIndexChanged="drpIfExtend_SelectedIndexChanged">
<f:ListItem Text="-请选择" Value="0" Selected="true" />
<f:ListItem Text="Y" Value="True" />
<f:ListItem Text="N" Value="False" />
</f:DropDownList>
<f:TextBox ID="txtPreviousFO" runat="server" Label="Previous FO" LabelWidth="160px" Enabled="false"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtInitialAllocation" runat="server" Label="Initial Allocation" LabelWidth="160px" NoNegative="true"></f:NumberBox>
<f:TextBox ID="txtEMial" runat="server" Label="EMail" LabelWidth="160px" ShowRedStar="true" Required="true"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtMainHead" runat="server" Label="主要负责人" LabelWidth="160px"></f:TextBox>
<f:TextBox ID="txtMainHeadContact" runat="server" Label="主要负责人联系方式" LabelWidth="160px"></f:TextBox>
<f:NumberBox ID="txtCheckedValue" runat="server" Label="Checked Value" LabelWidth="160px" EnableCommas="true"></f:NumberBox>
<f:TextBox ID="txtSafetyOfficer" runat="server" Label="安全经理" LabelWidth="160px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtCheckedValue" runat="server" Label="Checked Value" LabelWidth="160px" EnableCommas="true"></f:NumberBox>
<f:TextBox ID="txtSafetyOfficer" runat="server" Label="安全经理" LabelWidth="160px"></f:TextBox>
<f:TextBox ID="txtSafetyOfficerContact" runat="server" Label="安全经理联系方式" LabelWidth="160px"></f:TextBox>
<f:TextBox ID="txtProjectManager" runat="server" Label="项目经理" LabelWidth="160px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectManagerContact" runat="server" Label="项目经理联系方式" LabelWidth="160px"></f:TextBox>
<f:Label ID="Label1" runat="server"></f:Label>
<f:Label ID="Label2" runat="server"></f:Label>
<f:Label ID="Label3" runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>

20
FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs
View File

@ -212,13 +212,13 @@ namespace FineUIPro.Web.SES
this.drpConnectedTransaction.SelectedValue = data.ConnectedTransaction;
}
this.txtCheckedValue.Text = BLL.SESReportService.getSumSSRActualCostByFo(data.FO_NO).ToString();
this.txtRemainingBudget.Text = (Funs.GetNewDecimalOrZero(data.Actual_Budget.ToString()) - Funs.GetNewDecimalOrZero(this.txtCheckedValue.Text)).ToString();
//this.txtRemainingBudget.Text = (Funs.GetNewDecimalOrZero(data.Actual_Budget.ToString()) - Funs.GetNewDecimalOrZero(this.txtCheckedValue.Text)).ToString();
txtNumExceedLimit.Text = data.ExceedLimit != null ? data.ExceedLimit.Value.ToString() : "";
if (data.Actual_Budget > 0)
{
this.txtRemainingBudgetRate.Text = (Convert.ToDecimal(this.txtRemainingBudget.Text) / data.Actual_Budget * 100).ToString();
}
//if (data.Actual_Budget > 0)
//{
// this.txtRemainingBudgetRate.Text = (Convert.ToDecimal(this.txtRemainingBudget.Text) / data.Actual_Budget * 100).ToString();
//}
if (data.Validate_Date.HasValue && data.Expire_Date.HasValue)
{
decimal s1 = (data.Expire_Date - DateTime.Now).Value.Days;
@ -380,13 +380,13 @@ namespace FineUIPro.Web.SES
this.drpConnectedTransaction.SelectedValue = data.ConnectedTransaction;
}
this.txtCheckedValue.Text = BLL.SESReportService.getSumSSRActualCostByFo(data.FO_NO).ToString();
this.txtRemainingBudget.Text = (Funs.GetNewDecimalOrZero(data.Actual_Budget.ToString()) - Funs.GetNewDecimalOrZero(this.txtCheckedValue.Text)).ToString();
//this.txtRemainingBudget.Text = (Funs.GetNewDecimalOrZero(data.Actual_Budget.ToString()) - Funs.GetNewDecimalOrZero(this.txtCheckedValue.Text)).ToString();
txtNumExceedLimit.Text = data.ExceedLimit != null ? data.ExceedLimit.Value.ToString() : "";
if (data.Actual_Budget > 0)
{
this.txtRemainingBudgetRate.Text = (Convert.ToDecimal(this.txtRemainingBudget.Text) / data.Actual_Budget * 100).ToString();
}
//if (data.Actual_Budget > 0)
//{
// this.txtRemainingBudgetRate.Text = (Convert.ToDecimal(this.txtRemainingBudget.Text) / data.Actual_Budget * 100).ToString();
//}
if (data.Validate_Date.HasValue && data.Expire_Date.HasValue)
{
decimal s1 = (data.Expire_Date - DateTime.Now).Value.Days;

36
FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.designer.cs generated
View File

@ -356,24 +356,6 @@ namespace FineUIPro.Web.SES
/// </remarks>
protected global::FineUIPro.NumberBox txtNumExceedLimit;
/// <summary>
/// txtRemainingBudget 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtRemainingBudget;
/// <summary>
/// txtRemainingBudgetRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtRemainingBudgetRate;
/// <summary>
/// txtRemainingDurationRate 控件。
/// </summary>
@ -491,6 +473,24 @@ namespace FineUIPro.Web.SES
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label2;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// txtRemark 控件。
/// </summary>