diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index b8f64064..e69de29b 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -1,77 +0,0 @@
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
- 在 FineUIPro.Web.ProjectData.UnitWork.getWBSSet() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\ProjectData\UnitWork.aspx.cs:行号 461
- 在 FineUIPro.Web.ProjectData.UnitWork.Window2_Close(Object sender, WindowCloseEventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\ProjectData\UnitWork.aspx.cs:行号 221
- 在 FineUIPro.Window.OnClose(WindowCloseEventArgs e)
- 在 (Window , WindowCloseEventArgs )
- 在 FineUIPro.Window.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)
-出错时间:08/13/2024 14:44:02
-出错文件:http://localhost:8579/ProjectData/UnitWork.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:08/13/2024 14:44:02
-
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
- 在 FineUIPro.Web.ProjectData.UnitWork.getWBSSet() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\ProjectData\UnitWork.aspx.cs:行号 461
- 在 FineUIPro.Web.ProjectData.UnitWork.Window2_Close(Object sender, WindowCloseEventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\ProjectData\UnitWork.aspx.cs:行号 221
- 在 FineUIPro.Window.OnClose(WindowCloseEventArgs e)
- 在 (Window , WindowCloseEventArgs )
- 在 FineUIPro.Window.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)
-出错时间:08/13/2024 15:04:20
-出错文件:http://localhost:8579/ProjectData/UnitWork.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:08/13/2024 15:04:20
-
-
-错误信息开始=====>
-错误类型:SqlException
-错误信息:参数化查询 '(@projectId nvarchar(4000))SELECT p.QualityManagementSysId,
- ' 需要参数 '@projectId'，但未提供该参数。
-错误堆栈:
- 在 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.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311
- 在 FineUIPro.Web.CQMS.QualityPlanning.QualityManagementSys.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\QualityPlanning\QualityManagementSys.aspx.cs:行号 59
- 在 FineUIPro.Web.CQMS.QualityPlanning.QualityManagementSys.Page_Load(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\QualityPlanning\QualityManagementSys.aspx.cs:行号 24
- 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
- 在 System.EventHandler.Invoke(Object sender, EventArgs e)
- 在 System.Web.UI.Control.OnLoad(EventArgs e)
- 在 System.Web.UI.Control.LoadRecursive()
- 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:08/14/2024 09:45:39
-出错文件:http://localhost:8579/CQMS/QualityPlanning/QualityManagementSys.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:08/14/2024 09:45:39
-
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx
index 0d25607e..1840c01a 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx
@@ -48,7 +48,7 @@
-
+
-
-
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs
index 084a506a..aea0f5db 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs
@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
+using System.IO;
using System.Linq;
namespace FineUIPro.Web.ProjectData
@@ -102,6 +103,7 @@ namespace FineUIPro.Web.ProjectData
}
#endregion
+ #region 双击行事件
///
/// 双击事件
///
@@ -116,7 +118,9 @@ namespace FineUIPro.Web.ProjectData
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectSetView.aspx?ProjectId={0}", Grid1.SelectedRowID, "查看 - ")));
}
+ #endregion
+ #region 查看
///
/// 查看
///
@@ -126,6 +130,7 @@ namespace FineUIPro.Web.ProjectData
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectSetView.aspx?ProjectId={0}", Grid1.SelectedRowID, "查看 - ")));
}
+ #endregion
#region 获取按钮权限
///
@@ -204,12 +209,9 @@ namespace FineUIPro.Web.ProjectData
protected void btnOut_Click(object sender, EventArgs e)
{
Response.ClearContent();
- string filename = Funs.GetNewFileName();
- Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("项目信息" + filename, System.Text.Encoding.UTF8) + ".xls");
- Response.ContentType = "application/excel";
+ Response.AddHeader("content-disposition", "attachment; filename=项目信息.xls");
+ Response.ContentType = "application/vnd.ms-excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
- this.Grid1.PageSize = this.Grid1.RecordCount;
- this.BindGrid();
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.designer.cs
index e5b836ab..8664a4c1 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.designer.cs
@@ -85,13 +85,13 @@ namespace FineUIPro.Web.ProjectData {
protected global::FineUIPro.Button btnOut;
///
- /// lblNumber 控件。
+ /// labNumber 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::System.Web.UI.WebControls.Label lblNumber;
+ protected global::System.Web.UI.WebControls.Label labNumber;
///
/// lblCM 控件。
@@ -103,22 +103,22 @@ namespace FineUIPro.Web.ProjectData {
protected global::System.Web.UI.WebControls.Label lblCM;
///
- /// Label1 控件。
+ /// lblSubcontractor 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::System.Web.UI.WebControls.Label Label1;
+ protected global::System.Web.UI.WebControls.Label lblSubcontractor;
///
- /// Label2 控件。
+ /// lblOwn 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::System.Web.UI.WebControls.Label Label2;
+ protected global::System.Web.UI.WebControls.Label lblOwn;
///
/// ToolbarSeparator1 控件。
diff --git a/SGGL/FineUIPro.Web/common/PageBase.cs b/SGGL/FineUIPro.Web/common/PageBase.cs
index 5d708de9..420feb8d 100644
--- a/SGGL/FineUIPro.Web/common/PageBase.cs
+++ b/SGGL/FineUIPro.Web/common/PageBase.cs
@@ -1012,6 +1012,18 @@ namespace FineUIPro.Web
{
html = (row.FindControl("lbCheckManNames") as AspNet.Label).Text;
}
+ if (column.ColumnID== "tfCM")
+ {
+ html = (row.FindControl("lblCM") as AspNet.Label).Text;
+ }
+ if (column.ColumnID == "tfSubcontractor")
+ {
+ html = (row.FindControl("lblSubcontractor") as AspNet.Label).Text;
+ }
+ if (column.ColumnID == "tfOwn")
+ {
+ html = (row.FindControl("lblOwn") as AspNet.Label).Text;
+ }
// 处理CheckBox
if (html.Contains("f-grid-static-checkbox"))
{