lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-09-01

Browse Source
This commit is contained in:
李鹏飞
2023-09-01 15:29:53 +08:00
parent d9f8be1463
commit 773cd0e1b7
14 changed files with 473 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs
+2 -2
View File
@@ -113,7 +113,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
private void SaveGrid1()
{
PhtglContracttrackprogressService.DeleteModleByContractTrackId(ID);
/*PhtglContracttrackprogressService.DeleteModleByContractTrackId(ID);
JArray EditorArr = Grid1.GetMergedData();
if (EditorArr.Count > 0)
{
@@ -133,7 +133,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
model.Date = objects["values"]["Date"].ToString();
BLL.PhtglContracttrackprogressService.AddPHTGL_ContractTrackProgress(model);
}
}
}*/
}
private string GetDeleteScript()
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
+41 -22
View File
@@ -36,7 +36,7 @@
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
ClicksToEdit="1" DataIDField="Id" AllowSorting="true" SortField="Id"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"
AllowPaging="False" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
AllowPaging="False" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" OnRowClick="Grid1_OnRowClick" EnableRowClickEvent="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
@@ -45,8 +45,8 @@
LabelWidth="140px" OnSelectedIndexChanged="DropMainContractCode_SelectedIndexChanged">
</f:DropDownList>
<f:Label ID="txtContractName" runat="server" Label="合同名称" LabelAlign="Right" LabelWidth="140px"></f:Label>
<f:ToolbarFill runat="server" />
<f:Button ID="btnNew" ToolTip="新增" Text="新增" Hidden="true" Icon="Add" runat="server"
OnClick="btnNew_Click">
</f:Button>
@@ -58,6 +58,21 @@
</f:Button>
<f:Button ID="btnSave" ToolTip="保存" Icon="PageSave" EnablePostBack="true" Text="保存" runat="server" OnClick="btnSave_OnClick">
</f:Button>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:TextBox runat="server" ID="txtProjectCode" Label="项目编码" LabelWidth="90" Width="200px" />
<f:TextBox runat="server" ID="txtProjectName" Label="项目名称" LabelWidth="90" Width="200px" />
<f:ToolbarFill runat="server" />
<f:Button ID="btnQuery" ToolTip="查询" Text="查询" Icon="SystemSearch" runat="server" EnablePostBack="true"
OnClick="btnQuery_OnClick">
</f:Button>
<f:Button ID="btnGetChart" ToolTip="图表" Icon="ChartPie" Text="统计图表"
EnablePostBack="true" OnClick="btnGetChart_Click" runat="server">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
@@ -193,7 +208,7 @@
</Editor>
</f:RenderField>
<f:RenderCheckField Width="100px" ColumnID="IsWithinGeneralContractScope" DataField="IsWithinGeneralContractScope" HeaderText="是否总包合同范围内" />
<f:RenderField Width="150px" ColumnID="EstimatedQuantity" DataField="EstimatedQuantity" SortField="EstimatedQuantity"
FieldType="String" HeaderText="概算工程量" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
@@ -262,7 +277,7 @@
</f:Button>
<f:Button ID="btnMatchWBS_Delete" ToolTip="删除" Icon="Delete" EnablePostBack="true" ConfirmText="是否删除？" runat="server" OnClick="btnMatchWBS_Delete_OnClick">
</f:Button>
<f:Button ID="btnMatchWBS_Save" ToolTip="保存" Icon="PageSave" EnablePostBack="true" runat="server" OnClick="btnMatchWBS_Save_OnClick">
<f:Button ID="btnMatchWBS_Save" ToolTip="保存" Icon="PageSave" EnablePostBack="true" runat="server" OnClick="btnMatchWBS_Save_OnClick">
</f:Button>
</Items>
</f:Toolbar>
@@ -318,46 +333,50 @@
</f:RenderField>
<f:GroupField HeaderText="BCWS" TextAlign="Center">
<Columns>
<f:RenderField ColumnID="BCWS_Quantity" DataField="BCWS_Quantity" FieldType="String"
<f:RenderField ColumnID="BCWS_Quantity" DataField="BCWS_Quantity" FieldType="Double"
HeaderText="工程量" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="txtBCWS_Quantity" runat="server" Required="true"></f:TextBox>
<f:NumberBox ID="NumberBox4" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField ColumnID="BCWS_OutputValue" DataField="BCWS_OutputValue" FieldType="String"
<f:RenderField ColumnID="BCWS_OutputValue" DataField="BCWS_OutputValue" FieldType="Double"
HeaderText="产值" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="txtBCWS_OutputValue" runat="server" Required="true"></f:TextBox>
<f:NumberBox ID="NumberBox5" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField ColumnID="BCWS_Percentage" DataField="BCWS_Percentage" FieldType="String"
<f:RenderField ColumnID="BCWS_Percentage" DataField="BCWS_Percentage" FieldType="Double"
HeaderText="百分比" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="txtBCWS_Percentage" runat="server" Required="true">
</f:TextBox>
<f:NumberBox ID="NumberBox6" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
</f:NumberBox>
</Editor>
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="ACWP" TextAlign="Center">
<Columns>
<f:RenderField ColumnID="ACWP_Quantity" DataField="ACWP_Quantity" FieldType="String"
<f:RenderField ColumnID="ACWP_Quantity" DataField="ACWP_Quantity" FieldType="Double"
HeaderText="工程量" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="txtACWP_Quantity" runat="server" Required="true"></f:TextBox>
<f:NumberBox ID="NumberBox7" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField ColumnID="ACWP_OutputValue" DataField="ACWP_OutputValue" FieldType="String"
<f:RenderField ColumnID="ACWP_OutputValue" DataField="ACWP_OutputValue" FieldType="Double"
HeaderText="产值" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="txtACWP_OutputValue" runat="server" Required="true"></f:TextBox>
<f:NumberBox ID="NumberBox8" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField ColumnID="ACWP_Percentage" DataField="ACWP_Percentage" FieldType="String"
<f:RenderField ColumnID="ACWP_Percentage" DataField="ACWP_Percentage" FieldType="Double"
HeaderText="百分比" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="txtACWP_Percentage" runat="server" Required="true">
</f:TextBox>
<f:NumberBox ID="NumberBox9" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
</f:NumberBox>
</Editor>
</f:RenderField>
</Columns>
@@ -378,12 +397,12 @@
</f:Window>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="700px" Height="240px">
Width="1200px" Height="650px">
</f:Window>
<f:Window ID="Window3" runat="server" Hidden="true" ShowHeader="true"
IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window3_OnClose"
Title="匹配WBS" EnableIFrame="true" Height="650px"
Width="1200px">
IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window3_OnClose"
Title="匹配WBS" EnableIFrame="true" Height="650px"
Width="1200px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnEdit_Click" EnablePostBack="true"
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs
+41 -21
View File
@@ -43,22 +43,18 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </summary>
private void BindGrid()
{
if (!string.IsNullOrEmpty(ContractId))
Model.PHTGL_ContractTrack table = new Model.PHTGL_ContractTrack();
table.ProjectId = this.CurrUser.LoginProjectId;
table.ContractId = this.ContractId;
table.ProjectCode = this.txtProjectCode.Text.Trim();
table.ProjectName = this.txtProjectName.Text.Trim();
var tb = BLL.PhtglContractTrackService.GetListData(table, Grid1);
Grid1.RecordCount = PhtglContractTrackService.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb;
Grid1.DataBind();
if (string.IsNullOrEmpty(ContractId))
{
Model.PHTGL_ContractTrack table = new Model.PHTGL_ContractTrack();
table.ProjectId = this.CurrUser.LoginProjectId;
table.ContractId = this.ContractId;
var tb = BLL.PhtglContractTrackService.GetListData(table, Grid1);
Grid1.RecordCount = PhtglContractTrackService.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb;
Grid1.DataBind();
}
else
{
Grid1.DataSource = null;
Grid1.DataBind();
Grid2.DataSource = null;
Grid2.DataBind();
@@ -300,12 +296,12 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
model = new Model.PHTGL_ContractTrackProgress();
model.ContractTrackProgressId = SQLHelper.GetNewID(typeof(Model.PHTGL_ContractTrackProgress));
model.ContractTrackId = Grid1.SelectedRowID;
model.BCWS_Quantity = objects["values"]["BCWS_Quantity"].ToString();
model.BCWS_OutputValue = objects["values"]["BCWS_OutputValue"].ToString();
model.BCWS_Percentage = objects["values"]["BCWS_Percentage"].ToString();
model.ACWP_Quantity = objects["values"]["ACWP_Quantity"].ToString();
model.ACWP_OutputValue = objects["values"]["ACWP_OutputValue"].ToString();
model.ACWP_Percentage = objects["values"]["ACWP_Percentage"].ToString();
model.BCWS_Quantity = Funs.GetNewDecimal(objects["values"]["BCWS_Quantity"].ToString());
model.BCWS_OutputValue = Funs.GetNewDecimal(objects["values"]["BCWS_OutputValue"].ToString());
model.BCWS_Percentage = Funs.GetNewDecimal(objects["values"]["BCWS_Percentage"].ToString());
model.ACWP_Quantity = Funs.GetNewDecimal(objects["values"]["ACWP_Quantity"].ToString());
model.ACWP_OutputValue = Funs.GetNewDecimal(objects["values"]["ACWP_OutputValue"].ToString());
model.ACWP_Percentage = Funs.GetNewDecimal(objects["values"]["ACWP_Percentage"].ToString());
model.Date = objects["values"]["Date"].ToString();
BLL.PhtglContracttrackprogressService.AddPHTGL_ContractTrackProgress(model);
}
@@ -377,6 +373,28 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
}
BindGrid();
}
protected void btnQuery_OnClick(object sender, EventArgs e)
{
BindGrid();
}
protected void btnGetChart_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(ContractId))
{
var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue);
if (model != null)
{
PageContext.RegisterStartupScript(
Window2.GetShowReference(string.Format("ContractTrackProgressChart.aspx?ContractId={0}", model.ContractId, "图表 - ")));
}
}
else
{
ShowNotify("请选择施工分包合同", MessageBoxIcon.Question);
}
}
#endregion
#region 关闭弹出窗
@@ -516,5 +534,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
{
BindGrid2();
}
}
}
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs
Generated
+57 -12
View File
@@ -122,6 +122,51 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// Toolbar4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar4;
/// <summary>
/// txtProjectCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectCode;
/// <summary>
/// txtProjectName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectName;
/// <summary>
/// btnQuery 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// btnGetChart 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnGetChart;
/// <summary>
/// lblNumber 控件。
/// </summary>
@@ -519,58 +564,58 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
protected global::FineUIPro.TextBox TextBox1;
/// <summary>
/// txtBCWS_Quantity 控件。
/// NumberBox4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtBCWS_Quantity;
protected global::FineUIPro.NumberBox NumberBox4;
/// <summary>
/// txtBCWS_OutputValue 控件。
/// NumberBox5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtBCWS_OutputValue;
protected global::FineUIPro.NumberBox NumberBox5;
/// <summary>
/// txtBCWS_Percentage 控件。
/// NumberBox6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtBCWS_Percentage;
protected global::FineUIPro.NumberBox NumberBox6;
/// <summary>
/// txtACWP_Quantity 控件。
/// NumberBox7 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtACWP_Quantity;
protected global::FineUIPro.NumberBox NumberBox7;
/// <summary>
/// txtACWP_OutputValue 控件。
/// NumberBox8 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtACWP_OutputValue;
protected global::FineUIPro.NumberBox NumberBox8;
/// <summary>
/// txtACWP_Percentage 控件。
/// NumberBox9 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtACWP_Percentage;
protected global::FineUIPro.NumberBox NumberBox9;
/// <summary>
/// Window1 控件。
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressChart.aspx
+43
View File
@@ -0,0 +1,43 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractTrackProgressChart.aspx.cs" Inherits="FineUIPro.Web.PHTGL.ContractCompile.ContractTrackProgressChart" %>
<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>赢得值曲线</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style>
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.f-grid-colheader-text {
white-space: normal;
word-break: break-all;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" AjaxAspnetControls="divEV" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="false"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle"
TitleToolTip="" AutoScroll="true">
<Items>
<f:ContentPanel ShowHeader="false" runat="server" ID="cpEV" Margin="0 0 0 0">
<div id="divEV">
<uc1:ChartControl ID="ChartEV" runat="server" />
</div>
</f:ContentPanel>
</Items>
</f:Panel>
</Items>
</f:Panel>
</form>
</body>
</html>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressChart.aspx.cs
+55
View File
@@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
namespace FineUIPro.Web.PHTGL.ContractCompile
{
public partial class ContractTrackProgressChart : PageBase
{
public string ContractId
{
get => (string)ViewState["ContractId"];
set => ViewState["ContractId"] = value;
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
ContractId = Request.Params["ContractId"];
BindChart();
}
}
void BindChart()
{
if (!string.IsNullOrEmpty(ContractId))
{
var db = Funs.DB;
var result = (from x in db.PHTGL_ContractTrackProgress
join y in db.PHTGL_ContractTrack on x.ContractTrackId equals y.Id
where y.ContractId == ContractId
group x by x.Date into g
select new
{
月份 = g.Key,
BCWS工程量 = g.Sum(x => x.BCWS_Quantity),
BCWS产值 = g.Sum(x => x.BCWS_OutputValue),
BCWS百分比 = g.Sum(x => x.BCWS_Percentage),
ACWP工程量 = g.Sum(x => x.ACWP_Quantity),
ACWP产值 = g.Sum(x => x.ACWP_OutputValue),
ACWP百分比 = g.Sum(x => x.ACWP_Percentage)
}).ToList();
this.ChartEV.CreateMaryChartHTGL(LINQToDataTable(result), 1020, 420, null);
}
}
}
}
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressChart.aspx.designer.cs
Generated
+71
View File
@@ -0,0 +1,71 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.PHTGL.ContractCompile
{
public partial class ContractTrackProgressChart
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// cpEV 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel cpEV;
/// <summary>
/// ChartEV 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::Web.Controls.ChartControl ChartEV;
}
}