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

2022-09-08 合同基本修改，焊接数据分析修改

Browse Source
This commit is contained in:
李鹏飞
2022-09-08 20:14:51 +08:00
parent e0f256688a
commit 6881455e9d
22 changed files with 2744 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ErrLog.txt
+114
View File
@@ -0,0 +1,114 @@
错误信息开始=====>
错误类型:SqlException
错误信息:列名 'Sex' 无效。
列名 'IsUsed' 无效。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/08/2022 19:56:26
出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx
IP地址:::1
操作人员:JT
出错时间:09/08/2022 19:56:26
错误信息开始=====>
错误类型:SqlException
错误信息:列名 'Sex' 无效。
列名 'IsUsed' 无效。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/08/2022 19:57:31
出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx
IP地址:::1
操作人员:JT
出错时间:09/08/2022 19:57:31
错误信息开始=====>
错误类型:SqlException
错误信息:列名 'Sex' 无效。
列名 'IsUsed' 无效。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/08/2022 19:57:53
出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx
IP地址:::1
操作人员:JT
出错时间:09/08/2022 19:57:53
SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx
+49 -3
View File
@@ -18,12 +18,57 @@
SortField="UnitWorkCode" SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True">
<Toolbars>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
<f:DropDownList ID="drpUnitId" runat="server" Label="单位名称"
LabelAlign="Right" Width="240px" LabelWidth="80px" >
</f:DropDownList>
<f:DropDownList ID="drpUnitWorkId" Label="单位工程" AutoPostBack="true"
runat="server" Required="true" Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:DropDownList>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtMaterialCode" runat="server" Label="材质类别"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtSingleName" runat="server" Label="口径"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtThickness" runat="server" Label="壁厚"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtSpecification" runat="server" Label="规格"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtWeldTypeCode" runat="server" Label="焊缝类型"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtPersonName" runat="server" Label="焊工名称"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:DropDownList ID="drpJointAttribute" Label="焊口属性" AutoPostBack="true"
runat="server" Required="true" LabelWidth="80px"
Width="240px" LabelAlign="Right">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie"
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie"
runat="server" OnClick="BtnAnalyse_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出"
@@ -32,6 +77,7 @@
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField HeaderText="单位工程" ColumnID="UnitWorkName" DataField="UnitWorkName"
SortField="UnitWorkName" FieldType="String" HeaderTextAlign="Center" Width="100px">
SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.cs
+97
View File
@@ -15,13 +15,110 @@ namespace FineUIPro.Web.HJGL.WeldingReport
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.drpJointAttribute.DataTextField = "Text";
this.drpJointAttribute.DataValueField = "Value";
this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute();
this.drpJointAttribute.DataBind();
Funs.FineUIPleaseSelect(drpJointAttribute);
BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
}
}
private void BindGrid()
{
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
listStr.Add(new SqlParameter("@unitcode", this.drpUnitId.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@unitcode", null));
}
if (drpUnitWorkId.SelectedValue != Const._Null)
{
listStr.Add(new SqlParameter("@UnitWork", drpUnitWorkId.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@UnitWork", null));
}
if (!string.IsNullOrEmpty(this.txtMaterialCode.Text))
{
listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@MaterialCode", null));
}
if (!string.IsNullOrEmpty(this.txtSingleName.Text))
{
listStr.Add(new SqlParameter("@SingleName ", "%" + this.txtSingleName.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@SingleName ", null));
}
if (!string.IsNullOrEmpty(this.txtThickness.Text))
{
listStr.Add(new SqlParameter("@Thickness", "%" + this.txtThickness.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@Thickness", null));
}
if (!string.IsNullOrEmpty(this.txtSpecification.Text))
{
listStr.Add(new SqlParameter("@Specification", "%" + this.txtSpecification.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@Specification", null));
}
if (!string.IsNullOrEmpty(this.txtWeldTypeCode.Text))
{
listStr.Add(new SqlParameter("@WeldTypeCode", "%" + this.txtWeldTypeCode.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@WeldTypeCode", null));
}
if (drpJointAttribute.SelectedValue != Const._Null)
{
listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@JointAttribute", null));
}
if (!string.IsNullOrEmpty(this.txtPersonName.Text))
{
listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@PersonName", null));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_rpt_CheckDefects", parameter);
SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.designer.cs
Generated
+116 -15
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingReport {
public partial class DefectStatistics {
namespace FineUIPro.Web.HJGL.WeldingReport
{
public partial class DefectStatistics
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -56,7 +58,106 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpUnitId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// drpUnitWorkId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWorkId;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtMaterialCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMaterialCode;
/// <summary>
/// txtSingleName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSingleName;
/// <summary>
/// txtThickness 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtThickness;
/// <summary>
/// txtSpecification 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSpecification;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// txtWeldTypeCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldTypeCode;
/// <summary>
/// txtPersonName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPersonName;
/// <summary>
/// drpJointAttribute 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJointAttribute;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -65,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
@@ -74,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// btnOut 控件。
/// </summary>
@@ -83,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -92,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -101,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx
+50 -8
View File
@@ -23,22 +23,65 @@
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnitId" runat="server" Label="单位名称"
LabelAlign="Right" Width="280px" >
LabelAlign="Right" Width="240px" LabelWidth="80px" >
</f:DropDownList>
<f:DropDownList ID="drpUnitWorkId" Label="单位工程" AutoPostBack="true"
runat="server" Required="true" Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:DropDownList>
<f:DropDownList ID="drpDetectionType" runat="server" Label="探伤类型"
LabelAlign="Right" Width="280px" >
LabelAlign="Right" Width="240px" LabelWidth="80px">
</f:DropDownList>
<f:DatePicker runat="server" Label="日期" ID="txtStarTime" LabelAlign="Right"
LabelWidth="100px" Width="220px">
Width="180px" LabelWidth="80px">
</f:DatePicker>
<f:Label ID="Label1" runat="server" Text="至">
</f:Label>
<f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" LabelWidth="80px"
Width="110px">
<f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="180px" LabelWidth="80px">
</f:DatePicker>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtMaterialCode" runat="server" Label="材质类别"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtSingleName" runat="server" Label="口径"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtThickness" runat="server" Label="壁厚"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtSpecification" runat="server" Label="规格"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtWeldTypeCode" runat="server" Label="焊缝类型"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtPersonName" runat="server" Label="焊工名称"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:DropDownList ID="drpJointAttribute" Label="焊口属性" AutoPostBack="true"
runat="server" Required="true" LabelWidth="80px"
Width="240px" LabelAlign="Right">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie"
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie"
runat="server" OnClick="BtnAnalyse_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出"
@@ -46,7 +89,6 @@
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.cs
+85
View File
@@ -15,7 +15,13 @@ namespace FineUIPro.Web.HJGL.WeldingReport
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.drpJointAttribute.DataTextField = "Text";
this.drpJointAttribute.DataValueField = "Value";
this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute();
this.drpJointAttribute.DataBind();
Funs.FineUIPleaseSelect(drpJointAttribute);
BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
BLL.Base_DetectionTypeService.InitDetectionTypeDropDownList(drpDetectionType, true, string.Empty);
@@ -64,6 +70,85 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
listStr.Add(new SqlParameter("@date2", null));
}
if (drpUnitWorkId.SelectedValue != Const._Null)
{
listStr.Add(new SqlParameter("@UnitWork", drpUnitWorkId.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@UnitWork", null));
}
if (!string.IsNullOrEmpty(this.txtMaterialCode.Text))
{
listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@MaterialCode", null));
}
if (!string.IsNullOrEmpty(this.txtSingleName.Text))
{
listStr.Add(new SqlParameter("@SingleName ", "%" + this.txtSingleName.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@SingleName ", null));
}
if (!string.IsNullOrEmpty(this.txtThickness.Text))
{
listStr.Add(new SqlParameter("@Thickness", "%" + this.txtThickness.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@Thickness", null));
}
if (!string.IsNullOrEmpty(this.txtSpecification.Text))
{
listStr.Add(new SqlParameter("@Specification", "%" + this.txtSpecification.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@Specification", null));
}
if (!string.IsNullOrEmpty(this.txtWeldTypeCode.Text))
{
listStr.Add(new SqlParameter("@WeldTypeCode", "%" + this.txtWeldTypeCode.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@WeldTypeCode", null));
}
if (drpJointAttribute.SelectedValue != Const._Null)
{
listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@JointAttribute", null));
}
if (!string.IsNullOrEmpty(this.txtPersonName.Text))
{
listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@PersonName", null));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("sp_rpt_WelderFirstPassRate", parameter);
SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.designer.cs
Generated
+112 -20
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingReport {
public partial class FirstPassRate {
namespace FineUIPro.Web.HJGL.WeldingReport
{
public partial class FirstPassRate
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpUnitId 控件。
/// </summary>
@@ -65,7 +67,16 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// drpUnitWorkId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWorkId;
/// <summary>
/// drpDetectionType 控件。
/// </summary>
@@ -74,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDetectionType;
/// <summary>
/// txtStarTime 控件。
/// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStarTime;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtEndTime 控件。
/// </summary>
@@ -101,7 +112,88 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtMaterialCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMaterialCode;
/// <summary>
/// txtSingleName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSingleName;
/// <summary>
/// txtThickness 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtThickness;
/// <summary>
/// txtSpecification 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSpecification;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// txtWeldTypeCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldTypeCode;
/// <summary>
/// txtPersonName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPersonName;
/// <summary>
/// drpJointAttribute 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJointAttribute;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -110,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
@@ -119,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// btnOut 控件。
/// </summary>
@@ -128,7 +220,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -137,7 +229,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -146,7 +238,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx
+119 -59
View File
@@ -25,21 +25,21 @@
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Form4" />
<f:Form ID="Form4" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="审批信息"
<f:Form ID="Form4" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="审批信息"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Items>
<f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" AutoScroll="true" MarginRight="5px" BoxConfigPadding="10px">
<f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" AutoScroll="true" MarginRight="5px" BoxConfigPadding="10px">
<Items>
<f:Panel ID="Panel16" runat="server" CssStyle="text-align: right;" ShowBorder="false" ShowHeader="false" AutoScroll="true" >
<f:Panel ID="Panel16" runat="server" CssStyle="text-align: right;" ShowBorder="false" ShowHeader="false" AutoScroll="true">
<Items>
<f:Button runat="server" Text="提交" ValidateForms="SimpleForm1" Size="Medium" ConfirmText="是否提交"
<f:Button runat="server" Text="提交" ValidateForms="SimpleForm1" Size="Medium" ConfirmText="是否提交"
ID="btnSubmitForm1" OnClick="btnSubmitForm1_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" Size="Medium">
</f:Button>
</Items>
</f:Panel>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="700" ShowBorder="true" AutoScroll="true"
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="700" ShowBorder="true" AutoScroll="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server" BoxConfigPadding="5px"
ActiveTabIndex="0">
<Tabs>
@@ -50,10 +50,26 @@
<Rows>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="DropContractAttribute" Label="合同属性" OnSelectedIndexChanged="DropContractAttribute_SelectedIndexChanged" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
<f:DropDownList runat="server" ID="DropContractAttribute" Label="合同属性" OnSelectedIndexChanged="DropContractAttribute_SelectedIndexChanged" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
<f:ListItem Text="主合同" Value="0" />
<f:ListItem Text="补充合同" Value="1"/>
</f:DropDownList>
<f:ListItem Text="补充合同" Value="1" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="DropStatus" Label="合同状态" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
<f:ListItem Text="已签订" Value="0" />
<f:ListItem Text="已完毕" Value="1" />
</f:DropDownList>
<f:DatePicker runat="server" ID="txtSignedOnDate" Label="签订日期" LabelAlign="Right" MaxLength="200" LabelWidth="140px"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker runat="server" ID="txtContractStartDate" Label="合同起始日期" LabelAlign="Right" MaxLength="200" LabelWidth="140px"></f:DatePicker>
<f:DatePicker runat="server" ID="txtContractEndDate" Label="合同终止日期" LabelAlign="Right" MaxLength="200" LabelWidth="140px"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
@@ -68,8 +84,11 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="DropConfirmWay" runat="server" Label="确认方式" ShowRedStar="true" Required="true" AutoSelectFirstItem="false" LabelAlign="Right" OnSelectedIndexChanged="DropConfirmWay_SelectedIndexChanged" AutoPostBack="true" LabelWidth="140px"></f:DropDownList>
<f:Label runat="server"></f:Label>
<f:DropDownList ID="DropConfirmWay" runat="server" Label="确认方式" ShowRedStar="true" Required="true" AutoSelectFirstItem="false" LabelAlign="Right" OnSelectedIndexChanged="DropConfirmWay_SelectedIndexChanged" AutoPostBack="true" LabelWidth="140px"></f:DropDownList>
<f:DropDownList runat="server" ID="dropSubcontractingMethod" Label="分包模式" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
<f:ListItem Text="内部分包" Value="1" />
<f:ListItem Text="外部分包" Value="2" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
@@ -82,85 +101,126 @@
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="DropSetSubReviewCode" runat="server" Label="确定中标人审批编号" LabelAlign="Right" AutoPostBack="true" ShowRedStar="true" Required="true" AutoSelectFirstItem="false" LabelWidth="140px" Hidden="true" OnSelectedIndexChanged="DropSetSubReviewCode_SelectedIndexChanged"></f:DropDownList>
<f:DropDownList ID="DropActionPlanCode" runat="server" Label="实施计划编号" LabelAlign="Right" AutoPostBack="true" ShowRedStar="true" Required="true" AutoSelectFirstItem="false" LabelWidth="140px" Hidden="true" OnSelectedIndexChanged="DropActionPlanCode_SelectedIndexChanged"></f:DropDownList>
<f:DropDownList ID="DropSetSubReviewCode" runat="server" Label="确定中标人审批编号" LabelAlign="Right" AutoPostBack="true" ShowRedStar="true" Required="true" AutoSelectFirstItem="false" LabelWidth="140px" Hidden="true" OnSelectedIndexChanged="DropSetSubReviewCode_SelectedIndexChanged"></f:DropDownList>
<f:DropDownList ID="DropActionPlanCode" runat="server" Label="实施计划编号" LabelAlign="Right" AutoPostBack="true" ShowRedStar="true" Required="true" AutoSelectFirstItem="false" LabelWidth="140px" Hidden="true" OnSelectedIndexChanged="DropActionPlanCode_SelectedIndexChanged"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="DropMainContractCode" runat="server" Label="主合同编号" Hidden="true" AutoPostBack="true" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="140px" OnSelectedIndexChanged="DropMainContractCode_SelectedIndexChanged"></f:DropDownList>
</Items>
<f:DropDownList ID="DropMainContractCode" runat="server" Label="主合同编号" Hidden="true" AutoPostBack="true" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="140px" OnSelectedIndexChanged="DropMainContractCode_SelectedIndexChanged"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="tab1_txtEPCCode" runat="server" Label="总承包合同编号" ShowRedStar="true" Required="true" LabelAlign="Right" AutoPostBack="true" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="tab1_txtProjectName" runat="server" Label="项目名称" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="tab1_txtEPCCode" runat="server" Label="总承包合同编号" ShowRedStar="true" Required="true" LabelAlign="Right" AutoPostBack="true" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="tab1_txtProjectName" runat="server" Label="项目名称" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="tab1_txtContractName" runat="server" Label="合同名称" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="200" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="tab1_txtContractNum" runat="server" Label="合同编号" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="30" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="tab1_txtContractName" runat="server" Label="合同名称" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="200" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="tab1_txtContractNum" runat="server" Label="合同编号" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="30" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="50% 30% 20%">
<f:FormRow>
<Items>
<f:TextBox ID="tab1_txtParties" runat="server" Label="签约方" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:DropDownList ID="drpCurrency" runat="server" Label="（预计）合同金额" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:NumberBox ID="tab1_txtContractAmount" runat="server" LabelAlign="Right" ShowRedStar="true" Required="true" NoNegative="true"></f:NumberBox>
<f:DropDownList ID="drpContractType" runat="server" Label="合同类型" ShowRedStar="true" Required="true" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:TextBox ID="tab1_BuildUnit" runat="server" Label="建设单位" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="50% 50%">
<Items>
<f:TextBox ID="txtPriceMethod" runat="server" Label="计价方式" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtPricingBasis" runat="server" Label="计价依据" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="25% 25% 50%">
<Items>
<f:DropDownList ID="drpCurrency" runat="server" Label="（预计）合同金额" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:NumberBox ID="tab1_txtContractAmount" runat="server" LabelAlign="Right" ShowRedStar="true" Required="true" NoNegative="true"></f:NumberBox>
<f:NumberBox ID="txtContractAmountExcludingTax" runat="server" Label="合同不含税金额" LabelWidth="140px" LabelAlign="Right" ShowRedStar="true" Required="true" NoNegative="true"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpDepartId" runat="server" Label="主办部门" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:DropDownList ID="drpAgent" runat="server" Label="经办人" ShowRedStar="true" Required="true" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpAgent" runat="server" Label="经办人" ShowRedStar="true" Required="true" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true" EnableEdit="true"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpContractType" runat="server" Label="合同类型" ShowRedStar="true" Required="true" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:TextBox ID="tab1_BuildUnit" runat="server" Label="建设单位" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtContactUnitOfPartyA" runat="server" Label="甲方联系单位" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtContactPersonOfPartyA" runat="server" Label="甲方联系人" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtOpeningBank_TT" runat="server" Label="开户行-电汇" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtBankAccount_TT" runat="server" Label="银行账号-电汇" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="tab1_txtParties" runat="server" Label="签约方" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:DropDownList runat="server" ID="dropIsItACentralizedPurchaseSupplier" Label="乙方是否为集采供应商" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
<f:ListItem Text="否" Value="0" />
<f:ListItem Text="是" Value="1" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtOpeningBank_Electrophore" runat="server" Label="开户行-电承" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtBankAccount_Electrophore" runat="server" Label="银行账号-电承" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtContactPersonOfPartyB" runat="server" Label="乙方联系人" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtContactPersonPhoneOfPartyB" runat="server" Label="乙方联系人电话" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtContactPersonEmailOfPartyB" runat="server" Label="乙方联系人邮箱" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtRetentionmoney" runat="server" Label="质保金" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtLineNumber_Electrophore" runat="server" Label="行号-电承" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtOpeningBank_TT" runat="server" Label="开户行-电汇" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtBankAccount_TT" runat="server" Label="银行账号-电汇" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="tab1_txtRemark" runat="server" Label="合同摘要" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="1000" LabelWidth="140px" AutoGrowHeightMax="150px" AutoGrowHeight="true"></f:TextArea>
<f:TextBox ID="txtOpeningBank_Electrophore" runat="server" Label="开户行-电承" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtBankAccount_Electrophore" runat="server" Label="银行账号-电承" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<Items>
<f:TextBox ID="txtRetentionmoney" runat="server" Label="质保金" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtLineNumber_Electrophore" runat="server" Label="行号-电承" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="tab1_txtRemark" runat="server" Label="合同摘要" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="1000" LabelWidth="140px" AutoGrowHeightMax="150px" AutoGrowHeight="true"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Panel ID="Panel15" Layout="Column" ShowHeader="false" ShowBorder="false" runat="server">
<Items>
<f:TextArea ID="SituationRemark" runat="server" Label="情况说明" LabelAlign="Right" LabelWidth="140px" ColumnWidth="100%" ShowRedStar="true" Required="true" AutoGrowHeightMax="50px" AutoGrowHeight="true" ></f:TextArea>
<f:Button ID="btnAttachUrl_Remark" Text="上传说明附件" ToolTip="附件" Icon="TableCell" runat="server"
<f:TextArea ID="SituationRemark" runat="server" Label="情况说明" LabelAlign="Right" LabelWidth="140px" ColumnWidth="100%" ShowRedStar="true" Required="true" AutoGrowHeightMax="50px" AutoGrowHeight="true"></f:TextArea>
<f:Button ID="btnAttachUrl_Remark" Text="上传说明附件" ToolTip="附件" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Remark_Click" ValidateForms="SimpleForm1">
</f:Button>
</Items>
</f:Panel>
</Items>
</Items>
</f:FormRow>
<%-- <f:FormRow>
<%-- <f:FormRow>
<Items>
<f:TextArea ID="NoUseStandardtxtRemark" runat="server" Label="合同文本" LabelAlign="Right" LabelWidth="140px" ColumnWidth="100%" ShowRedStar="true" Required="true" Hidden="true" AutoGrowHeightMax="50px" AutoGrowHeight="true"></f:TextArea>
</Items>
@@ -169,8 +229,8 @@
<Items>
<f:Panel ID="Panel17" Layout="Column" ShowHeader="false" ShowBorder="false" runat="server">
<Items>
<f:Label runat="server" ID="Label" Text=" " LabelAlign="Right" Width ="140px"></f:Label>
<f:Button ID="btnAttachUrl" Text="上传合同文件" ToolTip="附件" Icon="TableCell" runat="server"
<f:Label runat="server" ID="Label" Text=" " LabelAlign="Right" Width="140px"></f:Label>
<f:Button ID="btnAttachUrl" Text="上传合同文件" ToolTip="附件" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
</Items>
@@ -279,7 +339,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="tab2_txtSubProjectContent" runat="server" Label="分包工程内容" LabelWidth="160px" AutoGrowHeight="true" AutoGrowHeightMin="50" AutoGrowHeightMax="600"></f:TextArea>
<f:TextArea ID="tab2_txtSubProjectContent" runat="server" Label="分包工程内容" LabelWidth="160px" AutoGrowHeight="true" AutoGrowHeightMin="50" AutoGrowHeightMax="600"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
@@ -1379,7 +1439,7 @@
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="总承包商向施工分包商提供图纸的数量" LabelWidth="300" ID="DrawingCount" AutoPostBack="true" OnTextChanged="TextBoxChanged"
Width="120px" LabelAlign="right" >
Width="120px" LabelAlign="right">
</f:TextBox>
</Items>
</f:FormRow>
@@ -1410,7 +1470,7 @@
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="施工分包商向总承包商提供施工文件的数量" LabelWidth="300" ID="ConstructionSubFileCount" AutoPostBack="true" OnTextChanged="TextBoxChanged"
Width="120px" LabelAlign="right" >
Width="120px" LabelAlign="right">
</f:TextBox>
</Items>
</f:FormRow>
@@ -1625,7 +1685,7 @@
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="3.2.2施工分包商项目经理每月在施工现场时间不得少于" LabelWidth="300" ID="DaysNum" AutoPostBack="true" OnTextChanged="TextBoxChanged"
Width="120px" LabelAlign="left" >
Width="120px" LabelAlign="left">
</f:TextBox>
<f:Label runat="server" ID="Label97" Text=" 天 "></f:Label>
</Items>
@@ -1646,9 +1706,9 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="ChangeManagerResponsibility" EmptyText="" LabelWidth="300" LabelAlign="Right" Label="3.2.4施工分包商擅自更换施工分包商项目经理或其他主要项目管理人员的违约责任"
<f:TextArea runat="server" ID="ChangeManagerResponsibility" EmptyText="" LabelWidth="300" LabelAlign="Right" Label="3.2.4施工分包商擅自更换施工分包商项目经理或其他主要项目管理人员的违约责任"
AutoGrowHeight="true" AutoGrowHeightMin="50" AutoGrowHeightMax="600">
</f:TextArea>
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
@@ -1704,7 +1764,7 @@
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="履约担保的金额" LabelWidth="300" ID="PerformanceMoney" AutoPostBack="true" OnTextChanged="TextBoxChanged"
Width="120px" LabelAlign="right" >
Width="120px" LabelAlign="right">
</f:TextBox>
</Items>
</f:FormRow>
@@ -2193,7 +2253,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="关于预付款扣回的约定：" LabelWidth="300" ID="PaymentAgreement" AutoPostBack="true" OnTextChanged="TextBoxChanged"
<f:TextBox runat="server" Label="关于预付款扣回的约定：" LabelWidth="300" ID="PaymentAgreement" AutoPostBack="true" OnTextChanged="TextBoxChanged"
Width="120px" LabelAlign="left">
</f:TextBox>
</Items>
@@ -2213,7 +2273,7 @@
<f:FormRow>
<Items>
<f:Label runat="server" ID="Label53" Text="14.3.3进度款审核与支付"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
@@ -2225,13 +2285,13 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Label runat="server" ID="Label180" Text="16试车" CssClass="lab"></f:Label>
<f:Label runat="server" ID="Label180" Text="16试车" CssClass="lab"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label runat="server" ID="Label54" Text="16.1试车的组织和配合" CssClass="lab"></f:Label>
</Items>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
@@ -2343,7 +2403,7 @@
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="19.3.1分包工程最终结清申请单需要的份数" LabelWidth="300" ID="FinalSettlementNum" AutoPostBack="true" OnTextChanged="TextBoxChanged"
Width="120px" LabelAlign="left" >
Width="120px" LabelAlign="left">
</f:TextBox>
</Items>
</f:FormRow>
@@ -2379,7 +2439,7 @@
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="20.2.1保修期的起算日" LabelWidth="300" ID="WarrantyPeriodDate" AutoPostBack="true" OnTextChanged="TextBoxChanged"
Width="120px" LabelAlign="left" >
Width="120px" LabelAlign="left">
</f:TextBox>
</Items>
</f:FormRow>
@@ -2491,8 +2551,8 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Label runat="server" ID="Label1" Text="22.5因不可抗力解除合同" Width="120px" LabelAlign="left"></f:Label>
</Items>
<f:Label runat="server" ID="Label1" Text="22.5因不可抗力解除合同" Width="120px" LabelAlign="left"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
@@ -2524,7 +2584,7 @@
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="（3）施工机具保险的保险金额" LabelWidth="300" ID="InsuredAmount" AutoPostBack="true" OnTextChanged="TextBoxChanged"
Width="120px" LabelAlign="right" >
Width="120px" LabelAlign="right">
</f:TextBox>
</Items>
</f:FormRow>
@@ -2558,7 +2618,7 @@
<f:FormRow>
<Items>
<f:Label runat="server" ID="Label57" Text="（1）向"></f:Label>
<f:TextBox runat="server" Label="" ID="ArbitrationCommission" AutoPostBack="true" OnTextChanged="TextBoxChanged"
<f:TextBox runat="server" Label="" ID="ArbitrationCommission" AutoPostBack="true" OnTextChanged="TextBoxChanged"
Width="120px" LabelAlign="right">
</f:TextBox>
<f:Label runat="server" ID="Label235" Text="仲裁委员会申请仲裁。"></f:Label>
@@ -2567,7 +2627,7 @@
<f:FormRow>
<Items>
<f:Label runat="server" ID="Label55" Text="（2）向"></f:Label>
<f:TextBox runat="server" Label="" ID="PeopleCourt" AutoPostBack="true" OnTextChanged="TextBoxChanged"
<f:TextBox runat="server" Label="" ID="PeopleCourt" AutoPostBack="true" OnTextChanged="TextBoxChanged"
Width="120px" LabelAlign="right">
</f:TextBox>
<f:Label runat="server" ID="Label237" Text="人民法院起诉。"></f:Label>
@@ -2616,7 +2676,7 @@
</f:Tab>
</Tabs>
</f:TabStrip>
</Items>
</f:Panel>
</Items>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.cs
+40
View File
@@ -205,6 +205,31 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
txtBankAccount_Electrophore.Text = contract.BankAccount_Electrophore;
txtLineNumber_Electrophore.Text = contract.LineNumber_Electrophore;
txtRetentionmoney.Text = contract.Retentionmoney;
txtContactUnitOfPartyA.Text = contract.ContactUnitOfPartyA;
txtContactPersonOfPartyA.Text = contract.ContactPersonOfPartyA;
txtContactPersonOfPartyB.Text = contract.ContactPersonOfPartyB;
txtContactPersonPhoneOfPartyB.Text = contract.ContactPersonPhoneOfPartyB;
txtContactPersonEmailOfPartyB.Text = contract.ContactPersonEmailOfPartyB;
txtContractAmountExcludingTax.Text = contract.ContractAmountExcludingTax.ToString();
txtPriceMethod.Text = contract.PriceMethod;
txtSignedOnDate.SelectedDate = contract.SignedOnDate;
txtContractStartDate.SelectedDate = contract.ContractStartDate;
txtContractEndDate.SelectedDate = contract.ContractEndDate;
txtPricingBasis.Text = contract.PricingBasis;
if (contract.Status != null)
{
DropStatus.SelectedValue = contract.Status.ToString();
}
if (!string.IsNullOrEmpty(contract.SubcontractingMethod))
{
dropSubcontractingMethod.SelectedValue = contract.SubcontractingMethod;
}
if (contract.IsItACentralizedPurchaseSupplier != null)
{
dropIsItACentralizedPurchaseSupplier.SelectedValue = contract.IsItACentralizedPurchaseSupplier.ToString();
}
if (!string.IsNullOrEmpty(contract.Currency))
{
this.drpCurrency.SelectedValue = contract.Currency;
@@ -480,6 +505,21 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
newContract.BankAccount_Electrophore = this.txtBankAccount_Electrophore.Text;
newContract.LineNumber_Electrophore = this.txtLineNumber_Electrophore.Text;
newContract.Retentionmoney = this.txtRetentionmoney.Text;
newContract.ContactUnitOfPartyA = txtContactUnitOfPartyA.Text;
newContract.ContactPersonOfPartyA = txtContactPersonOfPartyA.Text;
newContract.ContactPersonOfPartyB = txtContactPersonOfPartyB.Text;
newContract.ContactPersonPhoneOfPartyB = txtContactPersonPhoneOfPartyB.Text;
newContract.ContactPersonEmailOfPartyB = txtContactPersonEmailOfPartyB.Text;
newContract.ContractAmountExcludingTax = Funs.GetNewDecimal(txtContractAmountExcludingTax.Text.Trim());
newContract.PriceMethod = txtPriceMethod.Text;
newContract.SignedOnDate = txtSignedOnDate.SelectedDate;
newContract.ContractStartDate = txtContractStartDate.SelectedDate;
newContract.ContractEndDate = txtContractEndDate.SelectedDate;
newContract.PricingBasis = txtPricingBasis.Text;
newContract.Status = Funs.GetNewInt(DropStatus.SelectedValue);
newContract.SubcontractingMethod = dropSubcontractingMethod.SelectedValue;
newContract.IsItACentralizedPurchaseSupplier = Funs.GetNewInt(dropIsItACentralizedPurchaseSupplier.SelectedValue);
if (this.drpCurrency.SelectedValue != BLL.Const._Null)
{
newContract.Currency = this.drpCurrency.SelectedValue;
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.designer.cs
Generated
+132 -6
View File
@@ -113,6 +113,42 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.DropDownList DropContractAttribute;
/// <summary>
/// DropStatus 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropStatus;
/// <summary>
/// txtSignedOnDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtSignedOnDate;
/// <summary>
/// txtContractStartDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtContractStartDate;
/// <summary>
/// txtContractEndDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtContractEndDate;
/// <summary>
/// DropConfirmWay 控件。
/// </summary>
@@ -122,6 +158,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.DropDownList DropConfirmWay;
/// <summary>
/// dropSubcontractingMethod 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList dropSubcontractingMethod;
/// <summary>
/// IsUseStandardtxt 控件。
/// </summary>
@@ -195,13 +240,40 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
protected global::FineUIPro.TextBox tab1_txtContractNum;
/// <summary>
/// tab1_txtParties 控件。
/// drpContractType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tab1_txtParties;
protected global::FineUIPro.DropDownList drpContractType;
/// <summary>
/// tab1_BuildUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tab1_BuildUnit;
/// <summary>
/// txtPriceMethod 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPriceMethod;
/// <summary>
/// txtPricingBasis 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPricingBasis;
/// <summary>
/// drpCurrency 控件。
@@ -221,6 +293,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.NumberBox tab1_txtContractAmount;
/// <summary>
/// txtContractAmountExcludingTax 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtContractAmountExcludingTax;
/// <summary>
/// drpDepartId 控件。
/// </summary>
@@ -240,22 +321,67 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
protected global::FineUIPro.DropDownList drpAgent;
/// <summary>
/// drpContractType 控件。
/// txtContactUnitOfPartyA 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpContractType;
protected global::FineUIPro.TextBox txtContactUnitOfPartyA;
/// <summary>
/// tab1_BuildUnit 控件。
/// txtContactPersonOfPartyA 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tab1_BuildUnit;
protected global::FineUIPro.TextBox txtContactPersonOfPartyA;
/// <summary>
/// tab1_txtParties 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tab1_txtParties;
/// <summary>
/// dropIsItACentralizedPurchaseSupplier 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList dropIsItACentralizedPurchaseSupplier;
/// <summary>
/// txtContactPersonOfPartyB 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtContactPersonOfPartyB;
/// <summary>
/// txtContactPersonPhoneOfPartyB 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtContactPersonPhoneOfPartyB;
/// <summary>
/// txtContactPersonEmailOfPartyB 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtContactPersonEmailOfPartyB;
/// <summary>
/// txtOpeningBank_TT 控件。
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx
+42 -1
View File
@@ -95,7 +95,48 @@
<f:RenderField ColumnID="Account1" DataField="Account1" Width="150px" FieldType="String" HeaderText="开户行账号" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="Status" DataField="Status" Width="150px" FieldType="String" HeaderText="合同状态" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactUnitOfPartyA" DataField="ContactUnitOfPartyA" Width="150px" FieldType="String" HeaderText="甲方联系单位" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonOfPartyA" DataField="ContactPersonOfPartyA" Width="150px" FieldType="String" HeaderText="甲方联系人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonOfPartyB" DataField="ContactPersonOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonPhoneOfPartyB" DataField="ContactPersonPhoneOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人电话" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonEmailOfPartyB" DataField="ContactPersonEmailOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人邮箱" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractAmountExcludingTax" DataField="ContractAmountExcludingTax" Width="150px" FieldType="String" HeaderText="合同不含税金额" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="PriceMethod" DataField="PriceMethod" Width="150px" FieldType="String" HeaderText="计价方式" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SignedOnDate" DataField="SignedOnDate" Width="150px" FieldType="String" HeaderText="签订日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractStartDate" DataField="ContractStartDate" Width="150px" FieldType="String" HeaderText="合同起始日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractEndDate" DataField="ContractEndDate" Width="150px" FieldType="String" HeaderText="合同终止日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="PricingBasis" DataField="PricingBasis" Width="150px" FieldType="String" HeaderText="计价依据" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SubcontractingMethod" DataField="SubcontractingMethod" Width="150px" FieldType="String" HeaderText="分包模式" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="IsItACentralizedPurchaseSupplier" DataField="IsItACentralizedPurchaseSupplier" Width="150px" FieldType="String" HeaderText="乙方是否为集采供应商/分包商" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<%-- <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx.cs
+17
View File
@@ -72,6 +72,23 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
Con.EPCCode,
con.ProjectShortName,
(convert(varchar(20), Sub.SignedYear) + '年' + convert(varchar(20), Sub.SignedMonth) + '月') as DepartName,
(CASE Con.Status WHEN '0' THEN '已签订'
WHEN '1' THEN '已完毕' END) as Status,
Con.ContactUnitOfPartyA,
Con.ContactPersonOfPartyA,
Con.ContactPersonOfPartyB,
Con.ContactPersonPhoneOfPartyB,
Con.ContactPersonEmailOfPartyB,
Con.ContractAmountExcludingTax,
Con.PriceMethod,
CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate,
CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate,
CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate,
Con.PricingBasis,
(CASE Con.SubcontractingMethod WHEN '1' then '内部分包'
WHEN '2' THEN '外部分包' END ) as SubcontractingMethod,
(CASE Con.IsItACentralizedPurchaseSupplier WHEN '0' then '否'
WHEN '1' THEN '是' END ) as IsItACentralizedPurchaseSupplier,
Sub.Bank1,
Sub.SubcontractPriceForm,
Sub.Account1"
SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx
+43 -1
View File
@@ -94,6 +94,48 @@
<f:RenderField ColumnID="LineNumber_Electrophore" DataField="LineNumber_Electrophore" Width="150px" FieldType="String" HeaderText="行号-电承" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="Status" DataField="Status" Width="150px" FieldType="String" HeaderText="合同状态" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactUnitOfPartyA" DataField="ContactUnitOfPartyA" Width="150px" FieldType="String" HeaderText="甲方联系单位" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonOfPartyA" DataField="ContactPersonOfPartyA" Width="150px" FieldType="String" HeaderText="甲方联系人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonOfPartyB" DataField="ContactPersonOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonPhoneOfPartyB" DataField="ContactPersonPhoneOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人电话" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonEmailOfPartyB" DataField="ContactPersonEmailOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人邮箱" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractAmountExcludingTax" DataField="ContractAmountExcludingTax" Width="150px" FieldType="String" HeaderText="合同不含税金额" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="PriceMethod" DataField="PriceMethod" Width="150px" FieldType="String" HeaderText="计价方式" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SignedOnDate" DataField="SignedOnDate" Width="150px" FieldType="String" HeaderText="签订日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractStartDate" DataField="ContractStartDate" Width="150px" FieldType="String" HeaderText="合同起始日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractEndDate" DataField="ContractEndDate" Width="150px" FieldType="String" HeaderText="合同终止日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="PricingBasis" DataField="PricingBasis" Width="150px" FieldType="String" HeaderText="计价依据" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SubcontractingMethod" DataField="SubcontractingMethod" Width="150px" FieldType="String" HeaderText="分包模式" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="IsItACentralizedPurchaseSupplier" DataField="IsItACentralizedPurchaseSupplier" Width="150px" FieldType="String" HeaderText="乙方是否为集采供应商/分包商" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
@@ -130,6 +172,6 @@
</f:Window>
</form>
<script type="text/javascript">
</script>
</script>
</body>
</html>
SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.cs
+21 -4
View File
@@ -46,11 +46,11 @@ namespace FineUIPro.Web.PHTGL.Filing
WHEN '5' THEN 'ds' END) AS ContractType,
( CASE Rev.State
WHEN @ContractCreating THEN '编制中'
WHEN @Contract_countersign THEN '会签中'
WHEN @Contract_countersign THEN '会签中'
WHEN @ContractReviewing THEN '审批中'
WHEN @ContractReview_Complete THEN '审批成功'
WHEN @ContractReview_Refuse THEN '审批被拒' END) AS State ,
Con.Remarks,
Con.Remarks,
Con.EPCCode,
Con.ProjectShortName,
Con.[OpeningBank-TT] as OpeningBank_TT ,
@@ -58,11 +58,28 @@ namespace FineUIPro.Web.PHTGL.Filing
Con.[BankAccount-TT] as BankAccount_TT,
Con.[BankAccount-electrophore] as BankAccount_electrophore,
Con.[LineNumber-electrophore] as LineNumber_electrophore,
Con.Retentionmoney,
Con.Retentionmoney,
(CASE Con.Status WHEN '0' THEN '已签订'
WHEN '1' THEN '已完毕' END) as Status,
Con.ContactUnitOfPartyA,
Con.ContactPersonOfPartyA,
Con.ContactPersonOfPartyB,
Con.ContactPersonPhoneOfPartyB,
Con.ContactPersonEmailOfPartyB,
Con.ContractAmountExcludingTax,
Con.PriceMethod,
CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate,
CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate,
CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate,
Con.PricingBasis,
(CASE Con.SubcontractingMethod WHEN '1' then '内部分包'
WHEN '2' THEN '外部分包' END ) as SubcontractingMethod,
(CASE Con.IsItACentralizedPurchaseSupplier WHEN '0' then '否'
WHEN '1' THEN '是' END ) as IsItACentralizedPurchaseSupplier,
Pro.ProjectCode,
Pro.ProjectName,
Dep.DepartName,
U.PersonName AS AgentName"
U.PersonName AS AgentName "
+ @" from PHTGL_ContractReview AS Rev"
+ @" LEFT JOIN PHTGL_Contract AS Con ON Con.ContractId=Rev.ContractId"
//+ @" left join PHTGL_ActionPlanFormation as Act on Act.EPCCode=Con.EPCCode"