修改质量问题
This commit is contained in:
parent
ef05e5be29
commit
1099969de5
|
|
@ -547,13 +547,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
}
|
||||
var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault();
|
||||
|
||||
if (oldInspectionEquipment == null || ((oldInspectionEquipment.CompileMan == CurrUser.UserId && oldInspectionEquipment.Status == BLL.Const.Comprehensive_Compile) || (oldInspectionEquipment.CompileMan == CurrUser.UserId && oldInspectionEquipment.Status == BLL.Const.Comprehensive_ReCompile)))
|
||||
{
|
||||
//if (oldInspectionEquipment == null || ((oldInspectionEquipment.CompileMan == CurrUser.UserId && oldInspectionEquipment.Status == BLL.Const.Comprehensive_Compile) || (oldInspectionEquipment.CompileMan == CurrUser.UserId && oldInspectionEquipment.Status == BLL.Const.Comprehensive_ReCompile)))
|
||||
//{
|
||||
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/InspectionEquipment&menuId={1}", this.InspectionEquipmentId, BLL.Const.InspectionEquipmentMenuId)));
|
||||
}
|
||||
else
|
||||
{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/InspectionEquipment&menuId={1}", this.InspectionEquipmentId, BLL.Const.InspectionEquipmentMenuId)));
|
||||
}
|
||||
//}
|
||||
//else
|
||||
//{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/InspectionEquipment&menuId={1}", this.InspectionEquipmentId, BLL.Const.InspectionEquipmentMenuId)));
|
||||
//}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -454,14 +454,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionMachine));
|
||||
}
|
||||
Model.Comprehensive_InspectionMachine inspectionMachine = BLL.InspectionMachineService.GetInspectionMachineById(this.InspectionMachineId);
|
||||
if (inspectionMachine == null || ((inspectionMachine.CompileMan == CurrUser.UserId && inspectionMachine.Status == BLL.Const.Comprehensive_Compile) || (inspectionMachine.CompileMan == CurrUser.UserId && inspectionMachine.Status == BLL.Const.Comprehensive_ReCompile)))
|
||||
{
|
||||
//if (inspectionMachine == null || ((inspectionMachine.CompileMan == CurrUser.UserId && inspectionMachine.Status == BLL.Const.Comprehensive_Compile) || (inspectionMachine.CompileMan == CurrUser.UserId && inspectionMachine.Status == BLL.Const.Comprehensive_ReCompile)))
|
||||
//{
|
||||
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/inspectionMachone&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionMachineMenuId)));
|
||||
}
|
||||
else
|
||||
{
|
||||
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/inspectionMachone&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionMachineMenuId)));
|
||||
}
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/inspectionMachone&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionMachineMenuId)));
|
||||
//}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -680,14 +680,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
|
||||
}
|
||||
Model.Comprehensive_InspectionPerson inspectionPerson = BLL.InspectionPersonService.GetInspectionPersonById(this.InspectionPersonId);
|
||||
if (inspectionPerson == null || ((inspectionPerson.CompileMan == CurrUser.UserId && inspectionPerson.Status == BLL.Const.Comprehensive_Compile) || (inspectionPerson.CompileMan == CurrUser.UserId && inspectionPerson.Status == BLL.Const.Comprehensive_ReCompile)))
|
||||
{
|
||||
//if (inspectionPerson == null || ((inspectionPerson.CompileMan == CurrUser.UserId && inspectionPerson.Status == BLL.Const.Comprehensive_Compile) || (inspectionPerson.CompileMan == CurrUser.UserId && inspectionPerson.Status == BLL.Const.Comprehensive_ReCompile)))
|
||||
//{
|
||||
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/inspectionPerson&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionPersonMenuId)));
|
||||
}
|
||||
else
|
||||
{
|
||||
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/inspectionPerson&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionPersonMenuId)));
|
||||
}
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/inspectionPerson&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionPersonMenuId)));
|
||||
//}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -158,5 +158,10 @@
|
|||
Height="500px">
|
||||
</f:Window>
|
||||
</form>
|
||||
<script type="text/javascript">
|
||||
function reloadGrid(param) {
|
||||
__doPostBack(null, 'ReloadGrid$' + param);
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -44,6 +44,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl
|
|||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
string requestArg = GetRequestEventArgument(); // 此函数所在文件：PageBase.cs
|
||||
if (requestArg.StartsWith("ReloadGrid$"))
|
||||
{
|
||||
this.hdItemsString.Text = requestArg.Substring("ReloadGrid$".Length);
|
||||
Window1_Close(null,null);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -325,8 +325,12 @@ namespace FineUIPro.Web.CQMS.ProcessControl
|
|||
{
|
||||
ids = ids.Substring(0, ids.LastIndexOf(","));
|
||||
}
|
||||
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(ids)
|
||||
+ ActiveWindow.GetHidePostBackReference());
|
||||
|
||||
string scripts = String.Format("F.getActiveWindow().window.reloadGrid('{0}');", ids);
|
||||
PageContext.RegisterStartupScript(scripts + ActiveWindow.GetHidePostBackReference());
|
||||
|
||||
//PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(ids)
|
||||
// + ActiveWindow.GetHidePostBackReference());
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divEV"/>
|
||||
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divEV" />
|
||||
<f:RegionPanel ID="RegionPanel1" ShowBorder="false" runat="server" Margin="5px">
|
||||
<Regions>
|
||||
<f:Region ID="Region2" ShowBorder="false" ShowHeader="false" Position="Center" Layout="VBox"
|
||||
|
|
@ -59,15 +59,69 @@
|
|||
<f:GroupPanel runat="server" Title="二、项目总体施工进度情况" BodyPadding="5px" ID="GroupPanel2" EnableCollapse="True"
|
||||
Collapsed="false">
|
||||
<Items>
|
||||
<f:Form ID="Form3" ShowBorder="false" ShowHeader="false" runat="server">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextArea ID="txt2" runat="server"></f:TextArea>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
</f:Form>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="工程量清单设置" EnableCollapse="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="QuantityCompletionId,QuantityListId" AllowCellEditing="true" ForceFit="true"
|
||||
ClicksToEdit="1" DataIDField="QuantityCompletionId" AllowSorting="true" SortField="SortIndex,Name"
|
||||
SortDirection="ASC" EnableColumnLines="true"
|
||||
AllowPaging="true" IsDatabasePaging="true" PageSize="1000"
|
||||
AllowFilters="true" EnableTextSelection="True">
|
||||
<Columns>
|
||||
<%--<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
|
||||
EnableLock="true" Locked="False">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>--%>
|
||||
<f:RenderField Width="120px" ColumnID="Name" DataField="Name"
|
||||
SortField="Name" FieldType="String" HeaderText="类型" TextAlign="center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="Unit" DataField="Unit"
|
||||
SortField="Unit" FieldType="String" HeaderText="单位" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="DesignNum" DataField="DesignNum"
|
||||
SortField="DesignNum" FieldType="Float" HeaderText="设计数量" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:GroupField EnableLock="true" HeaderText="本期" TextAlign="Center">
|
||||
<Columns>
|
||||
<f:RenderField Width="70px" ColumnID="PlanNum" DataField="PlanNum" FieldType="Float"
|
||||
HeaderText="计划完成" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="90px" ColumnID="RealNum" DataField="RealNum"
|
||||
FieldType="Float" HeaderText="实际完成" HeaderTextAlign="Center" TextAlign="Left"
|
||||
EnableColumnEdit="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="Rate" DataField="Rate"
|
||||
FieldType="String" HeaderText="完成率" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
<f:GroupField EnableLock="true" HeaderText="累计" TextAlign="Center">
|
||||
<Columns>
|
||||
<f:RenderField Width="70px" ColumnID="TotalPlanNum" DataField="TotalPlanNum" FieldType="Float"
|
||||
HeaderText="计划完成" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="90px" ColumnID="TotalRealNum" DataField="TotalRealNum"
|
||||
FieldType="Float" HeaderText="实际完成" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="TotalRate" DataField="TotalRate"
|
||||
FieldType="String" HeaderText="完成率" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
<f:RenderField Width="100px" ColumnID="SumRate" DataField="SumRate"
|
||||
FieldType="String" HeaderText="完成率" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="LastTotalPlanNum" DataField="LastTotalPlanNum"
|
||||
FieldType="Float" HeaderText="之前累计计划完成" HeaderTextAlign="Center" TextAlign="Left" Hidden="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="LastTotalRealNum" DataField="LastTotalRealNum"
|
||||
FieldType="Float" HeaderText="之前累计实际完成" HeaderTextAlign="Center" TextAlign="Left" Hidden="true">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
</f:Grid>
|
||||
</Items>
|
||||
</f:GroupPanel>
|
||||
<f:GroupPanel runat="server" Title="三、本月施工进度情况" BodyPadding="5px" ID="GroupPanel3" EnableCollapse="True"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
|
|||
private void SetEmpty()
|
||||
{
|
||||
this.SimpleForm1.Title = string.Empty;
|
||||
txt2.Text = string.Empty;
|
||||
txt3.Text = string.Empty;
|
||||
txt4.Text = string.Empty;
|
||||
txt5.Text = string.Empty;
|
||||
|
|
@ -156,15 +155,39 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
|
|||
decimal BCWP = Funs.GetNewDecimalOrZero(dt.Rows[dt.Rows.Count - 1]["累计已完工作预算费用-BCWP"].ToString());
|
||||
decimal BCWS = Funs.GetNewDecimalOrZero(dt.Rows[dt.Rows.Count - 1]["累计计划工作预算费用-BCWS"].ToString());
|
||||
decimal ACWP = Funs.GetNewDecimalOrZero(dt.Rows[dt.Rows.Count - 1]["累计已完工作实际费用-ACWP"].ToString());
|
||||
decimal mBCWP = Funs.GetNewDecimalOrZero(dt.Rows[dt.Rows.Count - 1]["本月已完工作预算费用-BCWP"].ToString());
|
||||
decimal mBCWS = Funs.GetNewDecimalOrZero(dt.Rows[dt.Rows.Count - 1]["本月计划工作预算费用-BCWS"].ToString());
|
||||
decimal mACWP = Funs.GetNewDecimalOrZero(dt.Rows[dt.Rows.Count - 1]["本月已完工作实际费用-ACWP"].ToString());
|
||||
decimal CV = BCWP - ACWP;
|
||||
decimal SV = BCWP - BCWS;
|
||||
decimal CPI = BCWP / ACWP;
|
||||
decimal SPI = BCWP / BCWS;
|
||||
this.txt2.Text = "总体施工进度赢得值参数:\r\nBCWP:" + BCWP.ToString("0.####") + "\r\nBCWS:" + BCWS.ToString("0.####") + "\r\nACWP:" + ACWP.ToString("0.####") + "\r\nCV:" + CV.ToString("0.####") + "\r\nSV:" + SV.ToString("0.####") + "\r\nCPI:" + CPI.ToString("0.####") + "\r\nSPI:" + SPI.ToString("0.####");
|
||||
decimal CPI = 0;
|
||||
if (ACWP > 0)
|
||||
{
|
||||
CPI = BCWP / ACWP;
|
||||
}
|
||||
decimal SPI = 0;
|
||||
if (BCWS > 0)
|
||||
{
|
||||
SPI = BCWP / BCWS;
|
||||
}
|
||||
decimal mCV = mBCWP - mACWP;
|
||||
decimal mSV = mBCWP - mBCWS;
|
||||
decimal mCPI = 0;
|
||||
if (mACWP > 0)
|
||||
{
|
||||
mCPI = mBCWP / mACWP;
|
||||
}
|
||||
decimal mSPI = 0;
|
||||
if (mBCWS > 0)
|
||||
{
|
||||
mSPI = mBCWP / mBCWS;
|
||||
}
|
||||
DataTable table2 = new DataTable();
|
||||
|
||||
//this.txt2.Text = "总体施工进度赢得值参数 BCWP：" + BCWP.ToString("0.####") + " BCWS：" + BCWS.ToString("0.####") + " ACWP：" + ACWP.ToString("0.####") + "\r\n赢得值四个评价指标 CV：" + CV.ToString("0.####") + " SV：" + SV.ToString("0.####") + " CPI：" + CPI.ToString("0.####") + " SPI：" + SPI.ToString("0.####");
|
||||
this.txt3.Text = "施工进度赢得值参数 BCWP：" + mBCWP.ToString("0.####") + " BCWS：" + mBCWS.ToString("0.####") + " ACWP：" + mACWP.ToString("0.####") + "\r\n赢得值四个评价指标 CV：" + mCV.ToString("0.####") + " SV：" + mSV.ToString("0.####") + " CPI：" + mCPI.ToString("0.####") + " SPI：" + mSPI.ToString("0.####");
|
||||
|
||||
|
||||
|
||||
//BCWP、BCWS、ACWP
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
|
|
|||
|
|
@ -148,22 +148,13 @@ namespace FineUIPro.Web.JDGL.CostAnalysis {
|
|||
protected global::FineUIPro.GroupPanel GroupPanel2;
|
||||
|
||||
/// <summary>
|
||||
/// Form3 控件。
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form Form3;
|
||||
|
||||
/// <summary>
|
||||
/// txt2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextArea txt2;
|
||||
protected global::FineUIPro.Grid Grid1;
|
||||
|
||||
/// <summary>
|
||||
/// GroupPanel3 控件。
|
||||
|
|
|
|||
Loading…
Reference in New Issue