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

20241010

Browse Source
This commit is contained in:
毕文静
2024-10-10 15:14:29 +08:00
parent d6c2b68ebc
commit 41b2e9f0ca
212 changed files with 396785 additions and 12795 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EProject/FineUIPro.Web/BaseInfo/ProjectPlannerJobStatus.aspx
+12 -3
View File
@@ -21,9 +21,12 @@
<f:RenderField Width="250px" ColumnID="ConstValue" DataField="ConstValue"
FieldType="String" HeaderText="Value" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="400px" ColumnID="ConstText" DataField="ConstText"
<f:RenderField Width="250px" ColumnID="ConstText" DataField="ConstText"
FieldType="String" HeaderText="Name" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="GroupType" DataField="GroupType"
FieldType="String" HeaderText="适用项目" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -48,11 +51,17 @@
<f:HiddenField ID="hfFormID" runat="server">
</f:HiddenField>
<f:TextBox ID="txtConstValue" Label="Value" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right" >
runat="server" LabelAlign="right" LabelWidth="100px">
</f:TextBox>
<f:TextBox ID="txtConstText" Label="Name" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right">
runat="server" LabelAlign="right" LabelWidth="100px">
</f:TextBox>
<f:DropDownList ID="drpGroupType" Label="适用项目" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right" LabelWidth="100px">
<f:ListItem Text="通用" Value="1" Selected="true"/>
<f:ListItem Text="非Other类" Value="2" />
<f:ListItem Text="Other类" Value="3" />
</f:DropDownList>
</Items>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" runat="server">
EProject/FineUIPro.Web/BaseInfo/ProjectPlannerJobStatus.aspx.cs
+12 -5
View File
@@ -1,6 +1,8 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.BaseInfo
@@ -29,10 +31,14 @@ namespace FineUIPro.Web.BaseInfo
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT const.ConstId,const.ConstValue,const.ConstText,const.GroupId"
+ @" FROM dbo.Base_Const AS const"
+ @" WHERE const.GroupId = '" + BLL.Const.ProjectPlanner_JobStatus + "'";
DataTable tb = SQLHelper.GetDataTableRunText(strSql, null);
string strSql = @"SELECT ConstId,ConstValue,ConstText,GroupId,
(CASE WHEN GroupType='1' THEN '通用' WHEN GroupType='2' THEN '非Other类' WHEN GroupType='3' THEN 'Other类' ELSE '' END) AS GroupType
FROM dbo.Base_Const
WHERE GroupId = @GroupId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@GroupId", Const.ProjectPlanner_JobStatus));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
@@ -157,7 +163,8 @@ namespace FineUIPro.Web.BaseInfo
Model.Base_Const cons = new Model.Base_Const
{
ConstValue = this.txtConstValue.Text.Trim(),
ConstText = this.txtConstText.Text.Trim()
ConstText = this.txtConstText.Text.Trim(),
GroupType=drpGroupType.SelectedValue
};
if (string.IsNullOrEmpty(strRowID))
{
EProject/FineUIPro.Web/BaseInfo/ProjectPlannerJobStatus.aspx.designer.cs
Generated
+34 -23
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.BaseInfo {
public partial class ProjectPlannerJobStatus {
namespace FineUIPro.Web.BaseInfo
{
public partial class ProjectPlannerJobStatus
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.SimpleForm SimpleForm1;
/// <summary>
/// hfFormID 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hfFormID;
/// <summary>
/// txtConstValue 控件。
/// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtConstValue;
/// <summary>
/// txtConstText 控件。
/// </summary>
@@ -110,7 +112,16 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtConstText;
/// <summary>
/// drpGroupType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpGroupType;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnDelete 控件。
/// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
EProject/FineUIPro.Web/Design/DesignInput.aspx
+1 -1
View File
@@ -47,7 +47,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
EProject/FineUIPro.Web/Design/DesignInput.aspx.cs
+14 -1
View File
@@ -62,7 +62,7 @@ namespace FineUIPro.Web.Design
strSql += " AND e.ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND e.ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -326,6 +326,19 @@ namespace FineUIPro.Web.Design
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/EditorManage/AreaConcernEditor.aspx
+1 -1
View File
@@ -22,7 +22,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
EProject/FineUIPro.Web/EditorManage/AreaConcernEditor.aspx.cs
+13 -1
View File
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -319,6 +319,18 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/EditorManage/CMEditor.aspx
+1 -1
View File
@@ -24,7 +24,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch">
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch">
</f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch">
</f:DropDownList>
EProject/FineUIPro.Web/EditorManage/CMEditor.aspx.cs
+15 -1
View File
@@ -62,7 +62,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -314,6 +314,20 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
///查询
protected void btnSearch_Click(object sender, EventArgs e)
{
EProject/FineUIPro.Web/EditorManage/CMEditorEdit.aspx.cs
+9 -8
View File
@@ -365,15 +365,11 @@ namespace FineUIPro.Web.EditorManage
var epro = BLL.EProjectService.GeteProjectById(eproject.EProjectId);
if (epro != null)
{
//当PM中Milestone(Actual)的Project Approval不为空，同时CM中Const.-Civil的Revised Start和Const.-Mech,E&I的Revised Start小于当前时间,状态为In Construction
//if (epro.PM_MA_ProjectApproval.HasValue && Funs.GetNewDateTime(DateTime.Now.ToShortDateString()) > Funs.GetNewDateTime(epro.CM_CC_RevisedStart.ToString()) && Funs.GetNewDateTime(DateTime.Now.ToShortDateString()) > Funs.GetNewDateTime(epro.CM_CM_RevisedStart.ToString()))
//{
// epro.ProjectControl_JobStatus = "In Construction";
//}
if (epro.CM_KickOffMetting.HasValue)
// CM中Kick-off meeting不为空 ,CM中Actual MC Date为空,PM中Final Approval Date不为空 修改于2024.07.03
if (epro.ProjectControl_JobType != "Other" && epro.CM_KickOffMetting.HasValue && !epro.CM_MA_MC.HasValue && epro.PM_MA_ProjectApproval.HasValue)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "In Procurement"
|| eproject.ProjectControl_JobStatus == "Detail Design" || eproject.ProjectControl_JobStatus == "On Going"
|| eproject.ProjectControl_JobStatus == "Detailed Design" || eproject.ProjectControl_JobStatus == "On Going"
|| eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
eproject.ProjectControl_JobStatus = "In Construction";
@@ -384,12 +380,17 @@ namespace FineUIPro.Web.EditorManage
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == ""
|| eproject.ProjectControl_JobStatus == "In Procurement" || eproject.ProjectControl_JobStatus == "In Construction"
|| eproject.ProjectControl_JobStatus == "Detail Design" || eproject.ProjectControl_JobStatus == "On Going"
|| eproject.ProjectControl_JobStatus == "Detailed Design" || eproject.ProjectControl_JobStatus == "On Going"
|| eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
eproject.ProjectControl_JobStatus = "MC";
}
}
// 增加于2024.07.03
if (epro.ProjectControl_JobType == "Other" && epro.PM_MA_ProjectApproval.HasValue && !epro.CM_MA_MC.HasValue)
{
eproject.ProjectControl_JobStatus = "On Going";
}
//当Project_Control Manager中Business Closure-Close Date、CM中、Milestones(Actual)-MC、FC、Punch-C Killed Date都不为空时，状态为Closed
//if (epro.ProjectControl_BC_CloseDate.HasValue && epro.CM_MA_MC.HasValue && epro.CM_FC.HasValue && epro.CM_Punch_CKilledDate.HasValue)
EProject/FineUIPro.Web/EditorManage/FCRLogEditor.aspx
+1 -1
View File
@@ -22,7 +22,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." AutoPostBack="true" NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
EProject/FineUIPro.Web/EditorManage/FCRLogEditor.aspx.cs
+13 -1
View File
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -318,6 +318,18 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/EditorManage/LessonsLearnedEditor.aspx
+1 -1
View File
@@ -23,7 +23,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
EProject/FineUIPro.Web/EditorManage/LessonsLearnedEditor.aspx.cs
+14 -1
View File
@@ -181,7 +181,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -320,6 +320,19 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/EditorManage/PMEditor.aspx
+1 -1
View File
@@ -23,7 +23,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch">
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch">
</f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch">
</f:DropDownList>
EProject/FineUIPro.Web/EditorManage/PMEditor.aspx.cs
+13 -1
View File
@@ -264,6 +264,18 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
///查询
protected void btnSearch_Click(object sender, EventArgs e)
{
@@ -294,7 +306,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs
+21 -13
View File
@@ -603,7 +603,7 @@ namespace FineUIPro.Web.EditorManage
//}
//当PM中Milestone(Actual)的Project Approval不为空，并且Resource_Plan有记录时，状态为Not Approved
//当项目类型为projects或moc时PM中Milestone(Actual)的Project Approval不为空，并且Resource_Plan有记录时，状态为Not Approved 修改于2024.07.04
var resourcePlans = BLL.ResourcePlanService.GetResourcePlanByEProjectId(epro.EProjectId);
if ((epro.PM_MA_ProjectApproval == null || epro.PM_MA_ProjectApproval.ToString() == "") && resourcePlans.Count() > 0)
{
@@ -612,33 +612,41 @@ namespace FineUIPro.Web.EditorManage
epro.ProjectControl_JobStatus = "Study";
}
}
if (epro.PM_MA_ProjectApproval.HasValue && resourcePlans.Count()>1)
// 增加于2024.07.03
if (epro.ProjectControl_JobType == "Other" && epro.PM_MA_ProjectApproval.HasValue && !epro.CM_MA_MC.HasValue)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
epro.ProjectControl_JobStatus = "On Going";
}
eproject.ProjectControl_JobStatus = "On Going";
}
// 去除于2024.07.03
//if (epro.PM_MA_ProjectApproval.HasValue && resourcePlans.Count()>1)
//{
// if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
// {
// epro.ProjectControl_JobStatus = "On Going";
// }
//}
//去掉 同时满足Today小于Design Civil_Revised End Date和Design Mech.E&I_Revised End Date的最大值时，
//var civilRevisedEnd = BLL.PMService.GetCivil(eproject.EProjectId);
//var mechEIRevisedEnd = BLL.PMService.GetMechEI(eproject.EProjectId);
// 后加条件 //当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC为空，状态为Detail Design
var all = from x in Funs.DB.Editor_TDC where x.EProjectId== epro.EProjectId && x.Type == "D01_IFC" && x.Disc == "00_ALL" && !x.ReceiveHC.HasValue select x;
if (epro.PM_MA_ProjectApproval.HasValue && all.Count() > 0)
// 后加条件 //当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC为空，状态为Detailed Design
var all = from x in Funs.DB.Editor_TDC where x.EProjectId== epro.EProjectId && x.Type == "D01_IFC" && x.Disc == "00_ALL" && x.ReceiveHC.HasValue select x;
if (epro.ProjectControl_JobType != "Other" && epro.PM_MA_ProjectApproval.HasValue && all.Count() == 0)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "On Going" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
epro.ProjectControl_JobStatus = "Detail Design";
epro.ProjectControl_JobStatus = "Detailed Design";
}
}
// 后加：当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC不为空，状态为In Procurement
var con_all = from x in Funs.DB.Editor_TDC where x.EProjectId == epro.EProjectId && x.Type == "D01_IFC" && x.Disc == "00_ALL" && x.ReceiveHC.HasValue select x;
if (epro.PM_MA_ProjectApproval.HasValue && con_all.Count() > 0)
if (epro.ProjectControl_JobType != "Other" && epro.PM_MA_ProjectApproval.HasValue && con_all.Count() > 0)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Detail Design" || eproject.ProjectControl_JobStatus == "On Going" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Detailed Design" || eproject.ProjectControl_JobStatus == "On Going" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
epro.ProjectControl_JobStatus = "In Procurement";
}
@@ -648,7 +656,7 @@ namespace FineUIPro.Web.EditorManage
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == ""
|| eproject.ProjectControl_JobStatus == "In Procurement" || eproject.ProjectControl_JobStatus == "In Construction"
|| eproject.ProjectControl_JobStatus == "Detail Design" || eproject.ProjectControl_JobStatus == "On Going"
|| eproject.ProjectControl_JobStatus == "Detailed Design" || eproject.ProjectControl_JobStatus == "On Going"
|| eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
epro.ProjectControl_JobStatus = "MC";
EProject/FineUIPro.Web/EditorManage/PermitEditor.aspx
+1 -1
View File
@@ -24,7 +24,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch">
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch">
</f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch">
</f:DropDownList>
EProject/FineUIPro.Web/EditorManage/PermitEditor.aspx.cs
+13 -1
View File
@@ -245,6 +245,18 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
///查询
protected void btnSearch_Click(object sender, EventArgs e)
{
@@ -272,7 +284,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
EProject/FineUIPro.Web/EditorManage/ProjectControlEditor.aspx
+1 -1
View File
@@ -36,7 +36,7 @@
</f:Toolbar>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
EProject/FineUIPro.Web/EditorManage/ProjectControlEditor.aspx.cs
+14 -1
View File
@@ -89,7 +89,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -453,6 +453,19 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx
+14 -3
View File
@@ -28,14 +28,19 @@
<f:FormRow ColumnWidths="25% 24% 27% 24%">
<Items>
<f:DropDownList ID="drpJobType" runat="server" Label="Job Type" ShowRedStar="true" LabelWidth="110px" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" EnableEdit="true"></f:DropDownList>
<f:TextBox ID="txtFilesLink" runat="server" Label="Files Link" LabelWidth="120px"></f:TextBox>
<f:DropDownList ID="drpProjType" runat="server" Label="Proj.Type" LabelWidth="120px">
<f:ListItem Value="0" Text="N/A" Selected="true" />
<f:ListItem Value="Temp" Text="Temp" />
<f:ListItem Value="Perm" Text="Perm" />
</f:DropDownList>
<f:DropDownList ID="drpEMManager" runat="server" Label="Engineering Manager" LabelWidth="160px" EnableGroup="true" EnableEdit="true"></f:DropDownList>
<f:TextBox ID="txtNetworkNo" runat="server" Label="Network No." LabelWidth="130px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="25% 24% 27% 24%">
<Items>
<f:DropDownList ID="drpJobStatus" runat="server" Label="Job Status" LabelWidth="110px" ShowRedStar="true" Required="true" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" Label="Job Status" LabelWidth="110px" ShowRedStar="true" Required="true" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpJobStatus_SelectedIndexChanged"></f:DropDownList>
<f:NumberBox ID="txtOrginalBudget" runat="server" Label="Orginal Budget" NoDecimal="true" NoNegative="true" LabelWidth="120px" AutoPostBack="true" OnTextChanged="txtOrginalBudget_TextChanged" EnableCommas="true"></f:NumberBox>
<f:DropDownList ID="drpConstManager" runat="server" Label="Const Manager" LabelWidth="160px" EnableGroup="true" EnableEdit="true"></f:DropDownList>
<f:TextBox ID="txtMOCFormNO" runat="server" Label="MOC Form No." LabelWidth="130px"></f:TextBox>
@@ -67,7 +72,13 @@
<f:DatePicker ID="txtRevisedMCDate" runat="server" Label="Revised MC Date" LabelWidth="120px" EnableEdit="true" AutoPostBack="true" OnTextChanged="txtRevisedMCDate_OnTextChanged"></f:DatePicker>
<f:DropDownList ID="drpPM_General_Priority" runat="server" Label="Priority" LabelWidth="140px" EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtRemark" runat="server" Label="Remarks" LabelWidth="160px"></f:TextBox>
<f:TextBox ID="txtFilesLink" runat="server" Label="Files Link" LabelWidth="130px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="49% 51%">
<Items>
<f:TextBox ID="txtRemark" runat="server" Label="Remarks" LabelWidth="110px"></f:TextBox>
</Items>
</f:FormRow>
</Rows>
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.cs
+51 -3
View File
@@ -1,4 +1,6 @@
using BLL;
using FineUIPro.Web.Report;
using Microsoft.IdentityModel.Tokens;
using Model;
using System;
using System.Collections.Generic;
@@ -28,7 +30,7 @@ namespace FineUIPro.Web.EditorManage
#region 加载下拉框
BLL.ConstService.InitConstValueDropDownList(this.drpJobType, BLL.Const.ProjectPlanner_JobType, true);//项目类型
BLL.ConstService.InitConstValueDropDownList(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, false); //项目状态
//BLL.ConstService.InitConstValueDropDownList(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, false); //项目状态
BLL.DepartService.InitDepartDropDownList(this.drpBuCode, true);//部门
BLL.Sys_UserService.InitUserDrpNA(this.drpProjectManager, true); //项目经理
BLL.Sys_UserService.InitUserDrpNA(this.drpEMManager, true); //EM
@@ -75,7 +77,14 @@ namespace FineUIPro.Web.EditorManage
this.drpOpre.SelectedIndex = 0;
//this.drpLeadBy.SelectedIndex = 0;
this.drpEMManager.SelectedIndex = 0;
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", false);
}
else
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", false);
}
this.txtJobNo.Text = eproject.ProjectControl_JobNo;
if (!string.IsNullOrEmpty(eproject.ProjectControl_BUCode))
{
@@ -91,6 +100,10 @@ namespace FineUIPro.Web.EditorManage
{
this.drpJobType.SelectedValue = BLL.ConstService.GetConstListByTextAndGroupId(eproject.ProjectControl_JobType.Trim(), BLL.Const.ProjectPlanner_JobType).ConstValue;
}
if (!string.IsNullOrEmpty(eproject.ProjectControl_ProjectType))
{
this.drpProjType.SelectedValue = eproject.ProjectControl_ProjectType;
}
this.txtOrginalBudget.Text = eproject.ProjectControl_OrginalBudget == null ? "" : Convert.ToInt32(eproject.ProjectControl_OrginalBudget).ToString();
if (!string.IsNullOrEmpty(eproject.ProjectControl_EMManagerId) && eproject.ProjectControl_EMManagerId != null)
@@ -240,6 +253,10 @@ namespace FineUIPro.Web.EditorManage
eProject.ProjectControl_ConstManager = this.drpConstManager.SelectedItem.Text;
}
eProject.ProjectControl_JobType = this.drpJobType.SelectedItem.Text;
if (this.drpProjType.SelectedValue != "0")
{
eProject.ProjectControl_ProjectType = this.drpProjType.SelectedValue;
}
eProject.ProjectControl_OrginalBudget = Funs.GetNewIntOrZero(this.txtOrginalBudget.Text.Trim());
if (this.drpEMManager.SelectedValue != BLL.Const._Null)
{
@@ -579,6 +596,10 @@ namespace FineUIPro.Web.EditorManage
{
operationLog += "Job Type 由" + pro.ProjectControl_JobType + "修改为" + drpJobType.SelectedItem.Text + "，";
}
if ((pro.ProjectControl_ProjectType != null || drpProjType.SelectedValue != "0") && pro.ProjectControl_ProjectType != drpProjType.SelectedValue)
{
operationLog += "Proj.Type 由" + pro.ProjectControl_ProjectType + "修改为" + drpProjType.SelectedValue + "，";
}
if ((pro.ProjectControl_JobStatus != null || drpJobStatus.SelectedValue != Const._Null) && pro.ProjectControl_JobStatus != drpJobStatus.SelectedItem.Text)
{
operationLog += "Job Status 由" + pro.ProjectControl_JobStatus + "修改为" + drpJobStatus.SelectedItem.Text + "，";
@@ -1032,12 +1053,13 @@ namespace FineUIPro.Web.EditorManage
#endregion
}
if (!string.IsNullOrEmpty(this.txtCancelDate.Text))//当Cancel Date有输入时,状态为Cancelled
if (eproject.ProjectControl_PC_CancelDate.HasValue)//当Cancel Date有输入时,状态为Cancelled
{
eproject.ProjectControl_JobStatus = "Cancelled";
}
if (!string.IsNullOrEmpty(this.txtHold.Text))//Hold Date有输入时,状态为Hold
// 修改于2024.07.04 非other类型的项目hold不为空并且cancelDate为空
if (eproject.Job_Hold.HasValue && !eproject.ProjectControl_PC_CancelDate.HasValue)//Hold Date有输入时,状态为Hold
{
eproject.ProjectControl_JobStatus = "Hold";
}
@@ -1285,6 +1307,16 @@ namespace FineUIPro.Web.EditorManage
/// <param name="e"></param>
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (this.drpJobType.SelectedItem.Text == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", false);
}
else
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", false);
}
if (string.IsNullOrEmpty(Request.Params["eProjectId"]))
{
if (this.drpJobType.SelectedItem.Text == "Projects" && Funs.GetNewDecimal(this.txtOrginalBudget.Text) > 1000000)
@@ -1342,6 +1374,22 @@ namespace FineUIPro.Web.EditorManage
}
}
}
protected void drpJobStatus_SelectedIndexChanged(object sender, EventArgs e)
{
if (drpJobStatus.SelectedValue != "Hold")
{
this.txtHold.Text = string.Empty;
}
else
{
var eproject = BLL.EProjectService.GeteProjectById(Request.Params["eProjectId"]);
if (eproject != null)
{
this.txtHold.Text = eproject.Job_Hold == null ? "" : string.Format("{0:yyyy-MM-dd}", eproject.Job_Hold);
}
}
}
protected void txtOrginalBudget_TextChanged(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(Request.Params["eProjectId"]))
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.designer.cs
Generated
+11 -2
View File
@@ -105,13 +105,13 @@ namespace FineUIPro.Web.EditorManage
protected global::FineUIPro.DropDownList drpJobType;
/// <summary>
/// txtFilesLink 控件。
/// drpProjType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtFilesLink;
protected global::FineUIPro.DropDownList drpProjType;
/// <summary>
/// drpEMManager 控件。
@@ -266,6 +266,15 @@ namespace FineUIPro.Web.EditorManage
/// </remarks>
protected global::FineUIPro.DropDownList drpPM_General_Priority;
/// <summary>
/// txtFilesLink 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtFilesLink;
/// <summary>
/// txtRemark 控件。
/// </summary>
EProject/FineUIPro.Web/EditorManage/PunchEditor.aspx
+1 -1
View File
@@ -35,7 +35,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
EProject/FineUIPro.Web/EditorManage/PunchEditor.aspx.cs
+14 -1
View File
@@ -80,7 +80,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -431,6 +431,19 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/EditorManage/SQIBEditor.aspx
+1 -1
View File
@@ -24,7 +24,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch">
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch">
</f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch">
</f:DropDownList>
EProject/FineUIPro.Web/EditorManage/SQIBEditor.aspx.cs
+13 -1
View File
@@ -245,6 +245,18 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
///查询
protected void btnSearch_Click(object sender, EventArgs e)
{
@@ -272,7 +284,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
EProject/FineUIPro.Web/EditorManage/TDCEditor.aspx
+1 -1
View File
@@ -23,7 +23,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click" ></f:Button>
EProject/FineUIPro.Web/EditorManage/TDCEditor.aspx.cs
+14 -1
View File
@@ -181,7 +181,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -338,6 +338,19 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/EditorManage/TDCEditorEdit.aspx.cs
+8 -8
View File
@@ -203,29 +203,29 @@ namespace FineUIPro.Web.EditorManage
var eproject = BLL.EProjectService.GeteProjectById(Request.Params["eProjectId"]);
if (eproject != null)
{
#region 更新项目关闭或Detail Design 状态
#region 更新项目关闭或Detailed Design 状态
#region Detail Design 和 In Procurement
#region Detailed Design 和 In Procurement
//去掉 同时满足Today小于Design Civil_Revised End Date和Design Mech.E&I_Revised End Date的最大值时，
//var civilRevisedEnd = BLL.PMService.GetCivil(eproject.EProjectId);
//var mechEIRevisedEnd = BLL.PMService.GetMechEI(eproject.EProjectId);
// 后加条件 //当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC为空，状态为Detail Design
var all = from x in Funs.DB.Editor_TDC where x.EProjectId == eproject.EProjectId && x.Type == "D01_IFC" && x.Disc == "00_ALL" && x.ReceiveHC == null select x;
if (eproject.PM_MA_ProjectApproval.HasValue && all.Count() > 0)
// 后加条件 //当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC为空，状态为Detailed Design
var all = from x in Funs.DB.Editor_TDC where x.EProjectId == eproject.EProjectId && x.Type == "D01_IFC" && x.Disc == "00_ALL" && x.ReceiveHC.HasValue select x;
if (eproject.ProjectControl_JobType != "Other" && eproject.PM_MA_ProjectApproval.HasValue && all.Count() == 0)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "On Going" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
eproject.ProjectControl_JobStatus = "Detail Design";
eproject.ProjectControl_JobStatus = "Detailed Design";
}
}
// 后加：当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC不为空，状态为In Procurement
var con_all = from x in Funs.DB.Editor_TDC where x.EProjectId == eproject.EProjectId && x.Type == "D01_IFC" && x.Disc == "00_ALL" && x.ReceiveHC.HasValue select x;
if (eproject.PM_MA_ProjectApproval.HasValue && con_all.Count() > 0)
if (eproject.ProjectControl_JobType != "Other" && eproject.PM_MA_ProjectApproval.HasValue && con_all.Count() > 0)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Detail Design" || eproject.ProjectControl_JobStatus == "On Going" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Detailed Design" || eproject.ProjectControl_JobStatus == "On Going" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
eproject.ProjectControl_JobStatus = "In Procurement";
}
EProject/FineUIPro.Web/File/Excel/Project_List_Report.xlsx
BIN
View File
Binary file not shown.
EProject/FineUIPro.Web/FineUIPro.Web.csproj
+61 -18
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\SixLabors.ImageSharp.3.1.5\build\SixLabors.ImageSharp.props" Condition="Exists('..\packages\SixLabors.ImageSharp.3.1.5\build\SixLabors.ImageSharp.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -29,6 +30,8 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -37,7 +40,7 @@
<OutputPath>bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<WarningLevel>5</WarningLevel>
<LangVersion>7.3</LangVersion>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
@@ -55,12 +58,23 @@
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="FineUIPro, Version=7.1.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\FineUIPro.dll</HintPath>
<Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
<HintPath>..\packages\BouncyCastle.Cryptography.2.3.1\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
<Reference Include="Enums.NET, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7ea1c1650d506225, processorArchitecture=MSIL">
<HintPath>..\packages\Enums.NET.4.0.1\lib\net45\Enums.NET.dll</HintPath>
</Reference>
<Reference Include="ExtendedNumerics.BigDecimal, Version=2025.1001.2.129, Culture=neutral, PublicKeyToken=65f1315a45ad8949, processorArchitecture=MSIL">
<HintPath>..\packages\ExtendedNumerics.BigDecimal.2025.1001.2.129\lib\net48\ExtendedNumerics.BigDecimal.dll</HintPath>
</Reference>
<Reference Include="FineUIPro">
<HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.4.2.13, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="MathNet.Numerics, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cd8b63ad3d691a37, processorArchitecture=MSIL">
<HintPath>..\packages\MathNet.Numerics.Signed.5.0.0\lib\net48\MathNet.Numerics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -75,6 +89,9 @@
<Reference Include="Microsoft.IdentityModel.Tokens, Version=7.6.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Tokens.7.6.2\lib\net472\Microsoft.IdentityModel.Tokens.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.3.0.0\lib\netstandard2.0\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
</Reference>
<Reference Include="Microsoft.JScript" />
<Reference Include="Microsoft.ReportViewer.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.900.148\lib\net40\Microsoft.ReportViewer.Common.dll</HintPath>
@@ -103,21 +120,25 @@
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>
<Reference Include="NPOI.Core, Version=2.7.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.7.1\lib\net472\NPOI.Core.dll</HintPath>
</Reference>
<Reference Include="NPOI.OOXML, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OOXML.dll</HintPath>
<Reference Include="NPOI.OOXML, Version=2.7.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.7.1\lib\net472\NPOI.OOXML.dll</HintPath>
</Reference>
<Reference Include="NPOI.OpenXml4Net, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXml4Net.dll</HintPath>
<Reference Include="NPOI.OpenXml4Net, Version=2.7.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.7.1\lib\net472\NPOI.OpenXml4Net.dll</HintPath>
</Reference>
<Reference Include="NPOI.OpenXmlFormats, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
<Reference Include="NPOI.OpenXmlFormats, Version=2.7.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.7.1\lib\net472\NPOI.OpenXmlFormats.dll</HintPath>
</Reference>
<Reference Include="SixLabors.Fonts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d998eea7b14cab13, processorArchitecture=MSIL">
<HintPath>..\packages\SixLabors.Fonts.1.0.1\lib\netstandard2.0\SixLabors.Fonts.dll</HintPath>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.Linq" />
<Reference Include="System.DirectoryServices" />
@@ -131,11 +152,27 @@
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.Security.AccessControl, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Pkcs, Version=6.0.0.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Pkcs.6.0.3\lib\net461\System.Security.Cryptography.Pkcs.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Xml, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Xml.6.0.1\lib\net461\System.Security.Cryptography.Xml.dll</HintPath>
</Reference>
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
</Reference>
<Reference Include="System.Text.Encodings.Web, Version=4.0.5.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll</HintPath>
</Reference>
@@ -1978,7 +2015,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BLL\BLL.csproj">
<Project>{BBC7282A-9E2B-4BD6-9C6D-333CEFC6F332}</Project>
<Project>{bbc7282a-9e2b-4bd6-9c6d-333cefc6f332}</Project>
<Name>BLL</Name>
</ProjectReference>
<ProjectReference Include="..\Model\Model.csproj">
@@ -2014,7 +2051,7 @@
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -2024,6 +2061,12 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\SixLabors.ImageSharp.3.1.5\build\SixLabors.ImageSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SixLabors.ImageSharp.3.1.5\build\SixLabors.ImageSharp.props'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
EProject/FineUIPro.Web/FineUIPro.Web.csproj.user
+1 -1
View File
@@ -36,7 +36,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>2396</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:9099/</IISUrl>
<IISUrl>http://localhost:9009/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
EProject/FineUIPro.Web/Global.asax.cs
+13 -13
View File
@@ -101,10 +101,10 @@
{
System.Timers.Timer aTimer = new System.Timers.Timer();
//1小时执行一次
aTimer.Interval = 3600000 ;
aTimer.Interval = 3600000;
aTimer.Enabled = true;
aTimer.Start();
aTimer.Elapsed += new System.Timers.ElapsedEventHandler(UpdateManHourDisabled);
aTimer.Elapsed += new System.Timers.ElapsedEventHandler(UpdateManHourDisabled);
}
// MC证书提醒
@@ -282,8 +282,8 @@
private void MCEmial(object sender, System.Timers.ElapsedEventArgs e)
{
var eplist = (from x in Funs.DB.Editor_EProject
where x.CM_MA_MC.Value.AddMonths(3).Year == DateTime.Now.Year
&& x.CM_MA_MC.Value.AddMonths(3).Month == DateTime.Now.Month
where x.CM_MA_MC.Value.AddMonths(3).Year == DateTime.Now.Year
&& x.CM_MA_MC.Value.AddMonths(3).Month == DateTime.Now.Month
&& x.CM_MA_MC.Value.AddMonths(3).Day == DateTime.Now.Day
select x).ToList();
if (eplist.Count > 0)
@@ -361,10 +361,10 @@
}
}
var epList=from x in Funs.DB.Editor_EProject
where (x.ProjectControl_PC_CancelDate.HasValue && x.ProjectControl_PC_CancelDate.Value.AddMonths(1) <= DateTime.Now && x.ProjectControl_PC_CancelDate.Value.AddMonths(2) >= DateTime.Now)
|| (x.Job_Hold.HasValue && x.Job_Hold.Value.AddMonths(1)<= DateTime.Now && x.Job_Hold.Value.AddMonths(2) >= DateTime.Now)
select x;
var epList = from x in Funs.DB.Editor_EProject
where (x.ProjectControl_PC_CancelDate.HasValue && x.ProjectControl_PC_CancelDate.Value.AddMonths(1) <= DateTime.Now && x.ProjectControl_PC_CancelDate.Value.AddMonths(2) >= DateTime.Now)
|| (x.Job_Hold.HasValue && x.Job_Hold.Value.AddMonths(1) <= DateTime.Now && x.Job_Hold.Value.AddMonths(2) >= DateTime.Now)
select x;
foreach (var ep in epList)
{
var manHours_Plan = Funs.DB.ManHours_Plan.FirstOrDefault(x => x.EProjectId == ep.EProjectId);
@@ -530,9 +530,9 @@
// 1、 系统在项目计划(改为实际)批准当天自动给项目经理发送提醒邮件，提醒项目经理完成设计输入策划工作,并只适用于CTE设计的项目。
var eprojectList = from x in BLL.Funs.DB.Editor_EProject
where x.PM_General_CDI== "CTE" && x.PM_MA_ProjectApproval.HasValue &&
where x.PM_General_CDI == "CTE" && x.PM_MA_ProjectApproval.HasValue &&
x.PM_MA_ProjectApproval.Value.Date == DateTime.Now.Date && x.DesignInputMailIsSend == null
select x;
select x;
if (eprojectList.Count() > 0)
{
foreach (var eproject in eprojectList)
@@ -570,7 +570,7 @@
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
for (int i = 0; i < dt.Rows.Count; i++)
{
NameValueCollection nameValue = new NameValueCollection();
nameValue.Add("projectNo", dt.Rows[i]["ProjectControl_JobNo"].ToString());
nameValue.Add("IssuedDiscOrNo", dt.Rows[i]["ProjectControl_JobNo"].ToString() + "-" + dt.Rows[i]["ProjectControl_JobTitle"].ToString() + "," + dt.Rows[i]["DesignInputChName"].ToString() + " " + dt.Rows[i]["DesignInputEnName"].ToString() + " " + dt.Rows[i]["DesignInputNo"].ToString());
@@ -621,7 +621,7 @@
}
NameValueCollection nameValue = new NameValueCollection();
nameValue.Add("projectNo", dt.Rows[i]["ProjectControl_JobNo"].ToString());
nameValue.Add("IssuedDiscOrNo", dt.Rows[i]["ProjectControl_JobNo"].ToString() + "-" + dt.Rows[i]["ProjectControl_JobTitle"].ToString() + "," + dt.Rows[i]["DesignInputChName"].ToString() + " " + dt.Rows[i]["DesignInputEnName"].ToString() + " " + dt.Rows[i]["DesignInputNo"].ToString()+" "+ dt.Rows[i]["MutualIssuedNo"].ToString());
nameValue.Add("IssuedDiscOrNo", dt.Rows[i]["ProjectControl_JobNo"].ToString() + "-" + dt.Rows[i]["ProjectControl_JobTitle"].ToString() + "," + dt.Rows[i]["DesignInputChName"].ToString() + " " + dt.Rows[i]["DesignInputEnName"].ToString() + " " + dt.Rows[i]["DesignInputNo"].ToString() + " " + dt.Rows[i]["MutualIssuedNo"].ToString());
nameValue.Add("Person_Ch", person_Ch);
nameValue.Add("Person_En", person_En);
@@ -788,7 +788,7 @@
}
}
#endregion
#region 其他类项目
//其他类项目：最晚的①竣工图接收日期②商务关闭日期③主控文档更新日期
else if (eproject.ProjectControl_JobType == "Other")
EProject/FineUIPro.Web/ManHours/ManHours.aspx.cs
+11 -1
View File
@@ -87,7 +87,7 @@ namespace FineUIPro.Web.ManHours
{
JobType = this.drpJobType.SelectedValue;
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
JobStatus = this.drpJobStatus.SelectedValue;
}
@@ -155,6 +155,16 @@ namespace FineUIPro.Web.ManHours
/// <param name="e"></param>
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
if (hidpersonnel.Text == "D@" + BLL.Const.CTE_DepartId)
{
BindGrid("");
EProject/FineUIPro.Web/ManHours/SelectPlan.aspx.cs
+1 -1
View File
@@ -54,7 +54,7 @@ namespace FineUIPro.Web.ManHours
{
string strSql = @"SELECT * from View_NewManHours_Plan
WHERE AccountDisabled=0 and IsCalculated=1
AND (ProjectControl_JobStatus='Detail Design' OR ProjectControl_JobStatus='In Construction' OR ProjectControl_JobStatus='In Procurement'
AND (ProjectControl_JobStatus='Detailed Design' OR ProjectControl_JobStatus='In Construction' OR ProjectControl_JobStatus='In Procurement'
OR ProjectControl_JobStatus='Not Start' OR ProjectControl_JobStatus='On Going'
OR (ProjectControl_JobStatus='Cancelled' AND DATEDIFF(DAY,ProjectControl_PC_CancelDate,GETDATE())<=31)
OR (ProjectControl_JobStatus='MC' and DATEDIFF(MONTH,CM_MA_MC,GETDATE())<=4)
EProject/FineUIPro.Web/Report/ConcernReport.aspx
+1 -1
View File
@@ -22,7 +22,7 @@
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:TextBox ID="txtJobNo" runat="server" EmptyText="Job NO." NextFocusControl="btnSearch"></f:TextBox>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
EProject/FineUIPro.Web/Report/ConcernReport.aspx.cs
+14 -1
View File
@@ -61,7 +61,7 @@ namespace FineUIPro.Web.Report
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -78,6 +78,19 @@ namespace FineUIPro.Web.Report
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/Report/MonthReport.aspx
+1 -1
View File
@@ -23,7 +23,7 @@
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:TextBox ID="txtJobNo" runat="server" EmptyText="Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:DropDownList ID="drpJobType" runat="server" EnableEdit="true" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" EnableEdit="true" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" EnableEdit="true" NextFocusControl="btnSearch"></f:DropDownList>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
EProject/FineUIPro.Web/Report/MonthReport.aspx.cs
+14 -1
View File
@@ -67,7 +67,7 @@ namespace FineUIPro.Web.Report
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -149,6 +149,19 @@ namespace FineUIPro.Web.Report
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/Report/ProjectListReport.aspx
+11
View File
@@ -64,6 +64,17 @@
</Operator>
</Filter>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectControl_ProjectType" DataField="ProjectControl_ProjectType"
FieldType="String" HeaderText="Proj.Type" HeaderTextAlign="Center" TextAlign="Left" EnableFilter="true">
<Filter EnableMultiFilter="true" ShowMatcher="true">
<Operator>
<f:DropDownList ID="DropDownList58" runat="server">
<f:ListItem Text="equal to" Value="equal" />
<f:ListItem Text="include" Value="contain" Selected="true" />
</f:DropDownList>
</Operator>
</Filter>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectControl_LeadByName" DataField="ProjectControl_LeadByName"
FieldType="String" HeaderText="Lead By" HeaderTextAlign="Center" TextAlign="Left" EnableFilter="true">
<Filter EnableMultiFilter="true" ShowMatcher="true">
EProject/FineUIPro.Web/Report/ProjectListReport.aspx.cs
+19
View File
@@ -129,6 +129,19 @@ namespace FineUIPro.Web.Report
valid = true;
}
}
if (column == "ProjectControl_ProjectType")
{
string sourceValue = sourceObj.ToString();
string fillteredValue = fillteredObj.ToString();
if (fillteredOperator == "equal" && sourceValue == fillteredValue)
{
valid = true;
}
else if (fillteredOperator == "contain" && sourceValue.Contains(fillteredValue))
{
valid = true;
}
}
if (column == "ProjectControl_LeadByName")
{
string sourceValue = sourceObj.ToString();
@@ -823,6 +836,7 @@ namespace FineUIPro.Web.Report
if (projectList.GetRow(rowIndex).GetCell(2) == null) projectList.GetRow(rowIndex).CreateCell(2);
projectList.GetRow(rowIndex).GetCell(2).SetCellValue(itemOver.ProjectControl_JobType);
projectList.GetRow(rowIndex).GetCell(2).CellStyle.SetFont(cs_content_Font);
//Lead By
if (projectList.GetRow(rowIndex).GetCell(3) == null) projectList.GetRow(rowIndex).CreateCell(3);
projectList.GetRow(rowIndex).GetCell(3).SetCellValue(itemOver.ProjectControl_LeadByName);
@@ -1384,6 +1398,11 @@ namespace FineUIPro.Web.Report
projectList.GetRow(rowIndex).GetCell(73).SetCellValue(itemOver.Job_Hold);
projectList.GetRow(rowIndex).GetCell(73).CellStyle = styleQfw;
//Proj.Type
if (projectList.GetRow(rowIndex).GetCell(74) == null) projectList.GetRow(rowIndex).CreateCell(74);
projectList.GetRow(rowIndex).GetCell(74).SetCellValue(itemOver.ProjectControl_ProjectType);
projectList.GetRow(rowIndex).GetCell(74).CellStyle.SetFont(cs_content_Font);
#endregion
rowIndex++;
EProject/FineUIPro.Web/Report/ProjectListReport.aspx.designer.cs
Generated
+87 -76
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Report {
public partial class ProjectListReport {
namespace FineUIPro.Web.Report
{
public partial class ProjectListReport
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtJobNo 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJobNo;
/// <summary>
/// drpProjectManager 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectManager;
/// <summary>
/// btnSearch 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnExport 控件。
/// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnExport;
/// <summary>
/// DropDowsnList1 控件。
/// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDowsnList1;
/// <summary>
/// DropDownList1 控件。
/// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList1;
/// <summary>
/// DropDownList2 控件。
/// </summary>
@@ -128,7 +130,16 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList2;
/// <summary>
/// DropDownList58 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList58;
/// <summary>
/// DropDownList3 控件。
/// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList3;
/// <summary>
/// DropDownList4 控件。
/// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList4;
/// <summary>
/// DropDownList5 控件。
/// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList5;
/// <summary>
/// DropDownList6 控件。
/// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList6;
/// <summary>
/// DropDownList7 控件。
/// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList7;
/// <summary>
/// DropDownList8 控件。
/// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList8;
/// <summary>
/// DropDownList9 控件。
/// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList9;
/// <summary>
/// DropDownList10 控件。
/// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList10;
/// <summary>
/// DropDownList11 控件。
/// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList11;
/// <summary>
/// DropDownList12 控件。
/// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList12;
/// <summary>
/// DropDownList13 控件。
/// </summary>
@@ -227,7 +238,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList13;
/// <summary>
/// DropDownList14 控件。
/// </summary>
@@ -236,7 +247,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList14;
/// <summary>
/// DropDownList15 控件。
/// </summary>
@@ -245,7 +256,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList15;
/// <summary>
/// DropDownList16 控件。
/// </summary>
@@ -254,7 +265,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList16;
/// <summary>
/// DropDownList17 控件。
/// </summary>
@@ -263,7 +274,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList17;
/// <summary>
/// DropDownList18 控件。
/// </summary>
@@ -272,7 +283,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList18;
/// <summary>
/// DropDownList19 控件。
/// </summary>
@@ -281,7 +292,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList19;
/// <summary>
/// DropDownList20 控件。
/// </summary>
@@ -290,7 +301,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList20;
/// <summary>
/// DropDownList21 控件。
/// </summary>
@@ -299,7 +310,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList21;
/// <summary>
/// DropDownList22 控件。
/// </summary>
@@ -308,7 +319,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList22;
/// <summary>
/// DropDownList23 控件。
/// </summary>
@@ -317,7 +328,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList23;
/// <summary>
/// DropDownList24 控件。
/// </summary>
@@ -326,7 +337,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList24;
/// <summary>
/// DropDownList25 控件。
/// </summary>
@@ -335,7 +346,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList25;
/// <summary>
/// DropDownList26 控件。
/// </summary>
@@ -344,7 +355,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList26;
/// <summary>
/// DropDownList27 控件。
/// </summary>
@@ -353,7 +364,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList27;
/// <summary>
/// DropDownList28 控件。
/// </summary>
@@ -362,7 +373,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList28;
/// <summary>
/// DropDownList29 控件。
/// </summary>
@@ -371,7 +382,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList29;
/// <summary>
/// DropDownList30 控件。
/// </summary>
@@ -380,7 +391,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList30;
/// <summary>
/// DropDownList31 控件。
/// </summary>
@@ -389,7 +400,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList31;
/// <summary>
/// DropDownList32 控件。
/// </summary>
@@ -398,7 +409,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList32;
/// <summary>
/// DropDownList33 控件。
/// </summary>
@@ -407,7 +418,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList33;
/// <summary>
/// DropDownList34 控件。
/// </summary>
@@ -416,7 +427,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList34;
/// <summary>
/// DropDownList35 控件。
/// </summary>
@@ -425,7 +436,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList35;
/// <summary>
/// DropDownList36 控件。
/// </summary>
@@ -434,7 +445,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList36;
/// <summary>
/// DropDownList37 控件。
/// </summary>
@@ -443,7 +454,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList37;
/// <summary>
/// DropDownList38 控件。
/// </summary>
@@ -452,7 +463,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList38;
/// <summary>
/// DropDownList39 控件。
/// </summary>
@@ -461,7 +472,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList39;
/// <summary>
/// DropDownList40 控件。
/// </summary>
@@ -470,7 +481,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList40;
/// <summary>
/// DropDownList41 控件。
/// </summary>
@@ -479,7 +490,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList41;
/// <summary>
/// DropDownList42 控件。
/// </summary>
@@ -488,7 +499,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList42;
/// <summary>
/// DropDownList43 控件。
/// </summary>
@@ -497,7 +508,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList43;
/// <summary>
/// DropDownList44 控件。
/// </summary>
@@ -506,7 +517,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList44;
/// <summary>
/// DropDownList45 控件。
/// </summary>
@@ -515,7 +526,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList45;
/// <summary>
/// DropDownList46 控件。
/// </summary>
@@ -524,7 +535,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList46;
/// <summary>
/// DropDownList47 控件。
/// </summary>
@@ -533,7 +544,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList47;
/// <summary>
/// DropDownList48 控件。
/// </summary>
@@ -542,7 +553,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList48;
/// <summary>
/// DropDownList49 控件。
/// </summary>
@@ -551,7 +562,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList49;
/// <summary>
/// DropDownList50 控件。
/// </summary>
@@ -560,7 +571,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList50;
/// <summary>
/// DropDownList51 控件。
/// </summary>
@@ -569,7 +580,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList51;
/// <summary>
/// DropDownList52 控件。
/// </summary>
@@ -578,7 +589,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList52;
/// <summary>
/// DropDownList53 控件。
/// </summary>
@@ -587,7 +598,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList53;
/// <summary>
/// DropDownList54 控件。
/// </summary>
@@ -596,7 +607,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList54;
/// <summary>
/// DropDownList55 控件。
/// </summary>
@@ -605,7 +616,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList55;
/// <summary>
/// DropDownList56 控件。
/// </summary>
@@ -614,7 +625,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList56;
/// <summary>
/// DropDownList57 控件。
/// </summary>
@@ -623,7 +634,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList57;
/// <summary>
/// DropDownList59 控件。
/// </summary>
@@ -632,7 +643,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList59;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -641,7 +652,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -650,7 +661,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
EProject/FineUIPro.Web/Report/TimeSheetReport.aspx.cs
+27
View File
@@ -291,6 +291,15 @@ namespace FineUIPro.Web.Report
string actStr = actType + "1";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
if (actType.Contains("1"))
{
string thirdParty = table.Rows[i]["IsThirdParty"].ToString();
if (thirdParty != "" && thirdParty == "是")
{
string actStr = actType + "1";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
}
}
else if (table.Rows[i]["Type"].ToString().Contains("T02_OverTime"))
{
@@ -300,6 +309,15 @@ namespace FineUIPro.Web.Report
string actStr = actType + "2";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
if (actType.Contains("1"))
{
string thirdParty = table.Rows[i]["IsThirdParty"].ToString();
if (thirdParty != "" && thirdParty == "是")
{
string actStr = actType + "2";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
}
}
else if (table.Rows[i]["Type"].ToString().Contains("T03_OverTime"))
@@ -310,6 +328,15 @@ namespace FineUIPro.Web.Report
string actStr = actType + "3";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
if (actType.Contains("1"))
{
string thirdParty = table.Rows[i]["IsThirdParty"].ToString();
if (thirdParty != "" && thirdParty == "是")
{
string actStr = actType + "3";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
}
}
else
EProject/FineUIPro.Web/ResourcePlan/ResourcePlan.aspx
+1 -1
View File
@@ -21,7 +21,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
EProject/FineUIPro.Web/ResourcePlan/ResourcePlan.aspx.cs
+72 -76
View File
@@ -75,7 +75,7 @@ namespace FineUIPro.Web.ResourcePlan
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -369,35 +369,26 @@ namespace FineUIPro.Web.ResourcePlan
var role = BLL.Sys_RoleService.GetRole(user.RoleId);
string projectManager = epro.ProjectControl_ProjectManager;
string leadByName = epro.ProjectControl_LeadByName;
// 权限已特殊处理
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "编辑 - ")));
var manHours = (from x in Funs.DB.ManHours_Plan where x.ResourcePlanId == Id select x).FirstOrDefault();
if (manHours.AccountDisabled == 0)
{
// 权限已特殊处理
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//if (!string.IsNullOrEmpty(projectManager) && !string.IsNullOrEmpty(leadByName) && epro.ProjectControl_LeadByName.Contains("CTE") && (epro.ProjectControl_ProjectManager == this.CurrUser.UserName || user.DepartId != BLL.Const.CTEM_DepartId))
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//}
////lead by不是CTE的项目，需CTE做设计支持的项目的RP授权给Project Control
//else if (!string.IsNullOrEmpty(leadByName) && !epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName == "PPE")
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//}
//else if (this.CurrUser.UserId == BLL.Const.GlyId)
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//}
//else
//{
// Alert.Show("您不是PM、非CTE/M用户或PPE，不能填报资源", MessageBoxIcon.Warning);
//}
}
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanView.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
}
//if (!string.IsNullOrEmpty(projectManager) && !string.IsNullOrEmpty(leadByName) && epro.ProjectControl_LeadByName.Contains("CTE") && (epro.ProjectControl_ProjectManager == this.CurrUser.UserName || user.DepartId != BLL.Const.CTEM_DepartId))
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//}
////lead by不是CTE的项目，需CTE做设计支持的项目的RP授权给Project Control
//else if (!string.IsNullOrEmpty(leadByName) && !epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName == "PPE")
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//}
//else if (this.CurrUser.UserId == BLL.Const.GlyId)
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//}
//else
//{
// Alert.Show("您不是PM、非CTE/M用户或PPE，不能填报资源", MessageBoxIcon.Warning);
//}
}
}
}
@@ -435,53 +426,45 @@ namespace FineUIPro.Web.ResourcePlan
object[] keys = Grid2.DataKeys[e.RowIndex];
string eProjectId = keys[1].ToString();
var manHours = (from x in Funs.DB.ManHours_Plan where x.ResourcePlanId == Id select x).FirstOrDefault();
if (manHours.AccountDisabled == 0)
{
//var epro = BLL.EProjectService.GeteProjectById(eProjectId);
//if (epro != null)
//{
// var user = BLL.Sys_UserService.GetUsersByUserId(this.CurrUser.UserId);
// if (user != null)
// {
//if (!string.IsNullOrEmpty(user.RoleId))
//{
//var role = BLL.Sys_RoleService.GetRole(user.RoleId);
//if (role != null)
//{
//if (epro.ProjectControl_LeadByName.Contains("CTE") && user.DepartId == BLL.Const.CTEM_DepartId)
//{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//}
//else if (epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName != "PM")
//{
// ShowAlert("您不是PM，不能填报Lead by是CTE的项目资源", MessageBoxIcon.Warning);
//}
//else if (!epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName == "PPE")
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//}
//else if (!epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName != "PPE")
//{
// ShowAlert("您不是PPE，不能填报Lead by不是CTE的项目资源", MessageBoxIcon.Warning);
//}
//else
//{
// Alert.Show("您不是PM或PPE，不能填报资源", MessageBoxIcon.Warning);
//}
//}
//}
//else if (this.CurrUser.UserId == BLL.Const.GlyId)
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//}
// }
//}
}
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanView.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
}
//var epro = BLL.EProjectService.GeteProjectById(eProjectId);
//if (epro != null)
//{
// var user = BLL.Sys_UserService.GetUsersByUserId(this.CurrUser.UserId);
// if (user != null)
// {
//if (!string.IsNullOrEmpty(user.RoleId))
//{
//var role = BLL.Sys_RoleService.GetRole(user.RoleId);
//if (role != null)
//{
//if (epro.ProjectControl_LeadByName.Contains("CTE") && user.DepartId == BLL.Const.CTEM_DepartId)
//{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//}
//else if (epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName != "PM")
//{
// ShowAlert("您不是PM，不能填报Lead by是CTE的项目资源", MessageBoxIcon.Warning);
//}
//else if (!epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName == "PPE")
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//}
//else if (!epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName != "PPE")
//{
// ShowAlert("您不是PPE，不能填报Lead by不是CTE的项目资源", MessageBoxIcon.Warning);
//}
//else
//{
// Alert.Show("您不是PM或PPE，不能填报资源", MessageBoxIcon.Warning);
//}
//}
//}
//else if (this.CurrUser.UserId == BLL.Const.GlyId)
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//}
// }
//}
}
protected void Grid2_RowCommand(object sender, GridCommandEventArgs e)
@@ -595,6 +578,19 @@ namespace FineUIPro.Web.ResourcePlan
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/ResourcePlan/ResourcePlanAdd.aspx.cs
+15 -11
View File
@@ -2,9 +2,13 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.ResourcePlan
{
@@ -140,8 +144,6 @@ namespace FineUIPro.Web.ResourcePlan
}
//绑定
BindGrid();
}
}
}
@@ -615,15 +617,17 @@ namespace FineUIPro.Web.ResourcePlan
ProjectControlAccount = string.Empty;
}
// 后加条件，当创建第二个资源时，项目批准日期不为空时项目状态为On Going
if (eProject.PM_MA_ProjectApproval.HasValue && (eProject.ProjectControl_JobStatus == "Not Start" || eProject.ProjectControl_JobStatus == "Study"))
{
EProjects.ProjectControl_JobStatus = "On Going";
}
else
{
EProjects.ProjectControl_JobStatus = eProject.ProjectControl_JobStatus;
}
// 后加条件，当创建第二个资源时，项目批准日期不为空时项目状态为On Going 不要了 修改于2024.07.03
//if (eProject.ProjectControl_JobType == "Other" && eProject.PM_MA_ProjectApproval.HasValue && !eProject.CM_MA_MC.HasValue
// && (eProject.ProjectControl_JobStatus == "Not Start" || eProject.ProjectControl_JobStatus == "Study"))
//{
// EProjects.ProjectControl_JobStatus = "On Going";
//}
//else
//{
// EProjects.ProjectControl_JobStatus = eProject.ProjectControl_JobStatus;
//}
//(现增加第二张资源一个月后关闭)
//if(eProject.ProjectControl_JobType == "MOC")
//{
EProject/FineUIPro.Web/ResourcePlan/ResourcePlanEdit.aspx.cs
+39 -42
View File
@@ -62,54 +62,51 @@ namespace FineUIPro.Web.ResourcePlan
if (!string.IsNullOrEmpty(resourcePlanId))
{
var rp = BLL.ResourcePlanService.GetModelsResourcePlans(resourcePlanId);
if (rp != null)
var eProject = BLL.EProjectService.GeteProjectById(rp.EProjectId);
if (eProject != null)
{
var eProject = BLL.EProjectService.GeteProjectById(rp.EProjectId);
if (eProject != null)
{
this.txtJobNo.Text = eProject.ProjectControl_JobNo;
this.txtJobTitle.Text = eProject.ProjectControl_JobTitle;
this.txtMOCNo.Text = eProject.ProjectControl_MOCFormNo;
this.txtJobNo.Text = eProject.ProjectControl_JobNo;
this.txtJobTitle.Text = eProject.ProjectControl_JobTitle;
this.txtMOCNo.Text = eProject.ProjectControl_MOCFormNo;
foreach (CheckItem lst in this.checkJobType.Items)//项目类型
foreach (CheckItem lst in this.checkJobType.Items)//项目类型
{
if (!string.IsNullOrEmpty(eProject.ProjectControl_JobType))
{
if (!string.IsNullOrEmpty(eProject.ProjectControl_JobType))
{
if (eProject.ProjectControl_JobType.Equals(lst.Value))
lst.Selected = true;
}
if (eProject.ProjectControl_JobType.Equals(lst.Value))
lst.Selected = true;
}
//foreach (CheckItem lsts in this.checkPriority.Items)//优先级
//{
// if (!string.IsNullOrEmpty(eProject.PM_General_Priority))
// {
// if (eProject.PM_General_Priority.Equals(lsts.Value))
// lsts.Selected = true;
// }
//}
var wbs = BLL.DisciplinesWBSService.GetDisciplinesWBSListByType("4"); //"4"表示项目经理
if (wbs != null)
{
Model.ManHours_Plan p = BLL.PlanService.GetPlanByIds(resourcePlanId, wbs.FirstOrDefault().DisciplinesWBSId);
if (p != null)
{
this.DropDownList7.SelectedValue = p.EngineerId;
this.NumberBox15.Text = p.ManHours.ToString();
}
else if (!string.IsNullOrEmpty(eProject.ProjectControl_ProjectManagerId))
{
this.DropDownList7.SelectedValue = eProject.ProjectControl_ProjectManagerId;
}
}
if (!string.IsNullOrEmpty(rp.Phase))
{
checkPhase.SelectedValueArray = rp.Phase.Split(',');
}
//绑定
BindGrid();
}
//foreach (CheckItem lsts in this.checkPriority.Items)//优先级
//{
// if (!string.IsNullOrEmpty(eProject.PM_General_Priority))
// {
// if (eProject.PM_General_Priority.Equals(lsts.Value))
// lsts.Selected = true;
// }
//}
var wbs = BLL.DisciplinesWBSService.GetDisciplinesWBSListByType("4"); //"4"表示项目经理
if (wbs != null)
{
Model.ManHours_Plan p = BLL.PlanService.GetPlanByIds(resourcePlanId, wbs.FirstOrDefault().DisciplinesWBSId);
if (p != null)
{
this.DropDownList7.SelectedValue = p.EngineerId;
this.NumberBox15.Text = p.ManHours.ToString();
}
else if (!string.IsNullOrEmpty(eProject.ProjectControl_ProjectManagerId))
{
this.DropDownList7.SelectedValue = eProject.ProjectControl_ProjectManagerId;
}
}
if (!string.IsNullOrEmpty(rp.Phase))
{
checkPhase.SelectedValueArray = rp.Phase.Split(',');
}
//绑定
BindGrid();
}
//foreach (CheckItem item in checkPhase.Items)
//{
// if (!string.IsNullOrEmpty(rp.Phase))
EProject/FineUIPro.Web/SysManage/LogList.aspx
+1 -1
View File
@@ -59,7 +59,7 @@
<f:RenderField Width="150px" ColumnID="HostName" DataField="HostName" SortField="HostName"
HeaderTextAlign="Center" TextAlign="Left" FieldType="String" HeaderText="Host name">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="OperationLog" DataField="OperationLog" SortField="OperationLog"
<f:RenderField Width="250px" ColumnID="OperationLog" DataField="OperationLog" SortField="OperationLog" ShowToolTip="true"
HeaderTextAlign="Center" TextAlign="Left" FieldType="String" HeaderText="Operation log" ExpandUnusedSpace="true">
</f:RenderField>
</Columns>
EProject/FineUIPro.Web/Web.config
+24 -4
View File
@@ -9,7 +9,7 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false" />
</configSections>
<connectionStrings>
<add name="EProjectDBConnectionString" connectionString="Data Source=.\SQL2016;Initial Catalog=EProjectDB;uid=sa;pwd=1111;" />
<add name="EProjectDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=EProjectDB;uid=sa;pwd=1111;" />
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=EProjectDB;Integrated Security=True"
providerName="System.Data.SqlClient" />-->
</connectionStrings>
@@ -24,7 +24,7 @@
<add key="SystemName" value="EProject" />
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;" />
<add key="aspnet:MaxHttpCollectionKeys" value="50000" />
<add key="Https" value="false" />
<add key="Https" value="true" />
<add key="LdapUrl" value="10.4.21.240" />
</appSettings>
<!--
@@ -91,12 +91,24 @@
<error redirect="https://localhost/hjgl/OperationError.aspx" statusCode="404" />
</customErrors>
<!--Unencrypted __VIEWSTATE parameter，viewstate 保存没有加密，解决方法-->
<!--<machineKey validation="3DES"/>-->
<machineKey validation="3DES" compatibilityMode="Framework20SP1" />
<!--Body Parameters Accepted in Query:https才能访问-->
<!--<httpCookies httpOnlyCookies="true" requireSSL="true"/>-->
</system.web>
<location path="res.axd" />
<system.webServer>
<!--重定向HTTPS-->
<!--<rewrite>
<rules>
<rule name="HTTP to HTTPS redirect" stopProcessing="true">
<match url="(.*)" />
<conditions>
<add input="{HTTPS}" pattern="off" />
</conditions>
<action type="Redirect" redirectType="Permanent" url="https://{HTTP_HOST}/{R:1}" />
</rule>
</rules>
</rewrite>-->
<staticContent>
<mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File" />
<mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File" />
@@ -142,7 +154,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -164,6 +176,14 @@
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.2.13" newVersion="1.4.2.13" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
EProject/FineUIPro.Web/common/Main.aspx
+9 -8
View File
@@ -38,7 +38,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="dropDownList_Click" NextFocusControl="btnFind"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnFind"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" EnableCheckBoxSelect="true" EnableMultiSelect="true" NextFocusControl="btnFind" AutoPostBack="true" OnSelectedIndexChanged="drpJobStatus_Click"></f:DropDownList>
<f:DropDownList ID="drpDivision" runat="server" AutoPostBack="true" OnSelectedIndexChanged="dropDownList_Click" NextFocusControl="btnFind"></f:DropDownList>
<f:TextBox ID="txtJobNoS" runat="server" EmptyText="Enter the Job No." EnableBlurEvent="true" OnBlur="dropDownList_Click" NextFocusControl="btnFind"></f:TextBox>
@@ -186,7 +186,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtJobTitle" runat="server" Label="Job Title" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtProjType" runat="server" Label="Proj.Type" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtCostEffectivity" runat="server" Label="Cost Effectivity" LabelWidth="170px"></f:TextBox>
<f:TextBox ID="txtInstrumentEng" runat="server" Label="Instrument Eng." LabelWidth="120px"></f:TextBox>
<f:NumberBox ID="txtPendingQty" runat="server" Label="-Pending Qty" LabelWidth="160px" EnableCommas="true" Readonly="true"></f:NumberBox>
@@ -194,7 +194,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtLeadBy" runat="server" Label="Lead By" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtJobTitle" runat="server" Label="Job Title" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtPVIPredition" runat="server" Label="PVI Predition" LabelWidth="170px"></f:TextBox>
<f:TextBox ID="txtElectrialEng" runat="server" Label="Electrial Eng." LabelWidth="120px"></f:TextBox>
<f:NumberBox ID="txtPendingCost" runat="server" Label="-Pending Cost(RMB)" LabelWidth="160px" EnableCommas="true" Readonly="true"></f:NumberBox>
@@ -202,7 +202,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtPriority" runat="server" Label="Priority" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtLeadBy" runat="server" Label="Lead By" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtProjManager" runat="server" Label="Proj.Manager" LabelWidth="170px"></f:TextBox>
<f:TextBox ID="txtCivilEng" runat="server" Label="Civil Eng." LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtDocStatus" runat="server" Label="Doc.Status" LabelWidth="160px"></f:TextBox>
@@ -210,7 +210,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCategory" runat="server" Label="Category" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtPriority" runat="server" Label="Priority" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtConstManager" runat="server" Label="Const.Manager" LabelWidth="170px"></f:TextBox>
<f:TextBox ID="txtCDI" runat="server" Label="CDI" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtMOCFormNo" runat="server" Label="MOC Form No." LabelWidth="160px"></f:TextBox>
@@ -218,15 +218,16 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtOperationRep" runat="server" Label="Operation Rep." LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtCategory" runat="server" Label="Category" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtEngManager" runat="server" Label="Eng.Manager" LabelWidth="170px"></f:TextBox>
<f:TextBox ID="txtOutSourceType" runat="server" Label="OutSource Type" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtCAPEXPlanNo" runat="server" Label="CAPEX Plan No." LabelWidth="160px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow ColumnWidths="25% 75%">
<Items>
<f:TextBox ID="txtRemarks" runat="server" Label="Remarks" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtOperationRep" runat="server" Label="Operation Rep." LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtRemarks" runat="server" Label="Remarks" LabelWidth="170px"></f:TextBox>
</Items>
</f:FormRow>
</Items>
EProject/FineUIPro.Web/common/Main.aspx.cs
+17 -2
View File
@@ -75,7 +75,7 @@ namespace FineUIPro.Web.common
strSql += " AND eProject.ProjectControl_JobType=@jobType";
listStr.Add(new SqlParameter("@jobType", this.drpJobType.SelectedItem.Text));
} // AND CHARINDEX(Trust.ProjectId,@ProjectId)>0
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
//strSql += " AND eProject.ProjectControl_JobStatus=@jobStatus";
strSql += " AND CHARINDEX(eProject.ProjectControl_JobStatus,@jobStatus)>0";
@@ -231,7 +231,8 @@ namespace FineUIPro.Web.common
#region General
this.txtBuCode.Text = eProject.ProjectControl_BUCode; //部门代码
this.txtJobNo.Text = eProject.ProjectControl_JobNo;//项目号
this.txtJobType.Text = eProject.ProjectControl_JobType;//项目类型
this.txtJobType.Text = eProject.ProjectControl_JobType;//项目类型
this.txtProjType.Text = eProject.ProjectControl_ProjectType; //
this.txtJobTitle.Text = eProject.ProjectControl_JobTitle;//项目标题
if (!string.IsNullOrEmpty(eProject.ProjectControl_LeadBy))
{
@@ -1183,6 +1184,20 @@ namespace FineUIPro.Web.common
BindGrid();
}
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
BindGrid();
}
protected void dropDownList_Click(object sender, EventArgs e)
{
BindGrid();
EProject/FineUIPro.Web/common/Main.aspx.designer.cs
Generated
+137 -126
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.common {
public partial class main {
namespace FineUIPro.Web.common
{
public partial class main
{
/// <summary>
/// Head1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// form1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpJobType 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJobType;
/// <summary>
/// drpJobStatus 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJobStatus;
/// <summary>
/// drpDivision 控件。
/// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDivision;
/// <summary>
/// txtJobNoS 控件。
/// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJobNoS;
/// <summary>
/// btnFind 控件。
/// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnFind;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSearch 控件。
/// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnViewDetail 控件。
/// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnViewDetail;
/// <summary>
/// hdItemsString 控件。
/// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdItemsString;
/// <summary>
/// hdJobNo 控件。
/// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdJobNo;
/// <summary>
/// hdJobTitle 控件。
/// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdJobTitle;
/// <summary>
/// hdType 控件。
/// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdType;
/// <summary>
/// hdStatus 控件。
/// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdStatus;
/// <summary>
/// hdDivision 控件。
/// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdDivision;
/// <summary>
/// hdProjectManager 控件。
/// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdProjectManager;
/// <summary>
/// hdConstManager 控件。
/// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdConstManager;
/// <summary>
/// hdOperationRep 控件。
/// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdOperationRep;
/// <summary>
/// hdAccount 控件。
/// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAccount;
/// <summary>
/// hdMOCFormNo 控件。
/// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdMOCFormNo;
/// <summary>
/// hdLeadBy 控件。
/// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdLeadBy;
/// <summary>
/// hdEngineer 控件。
/// </summary>
@@ -263,7 +265,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdEngineer;
/// <summary>
/// hdCritical 控件。
/// </summary>
@@ -272,7 +274,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdCritical;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -281,7 +283,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// imgSchedule 控件。
/// </summary>
@@ -290,7 +292,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Image imgSchedule;
/// <summary>
/// imgCost 控件。
/// </summary>
@@ -299,7 +301,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Image imgCost;
/// <summary>
/// imgScope 控件。
/// </summary>
@@ -308,7 +310,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Image imgScope;
/// <summary>
/// FilesLinks 控件。
/// </summary>
@@ -317,7 +319,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink FilesLinks;
/// <summary>
/// NotesLinks 控件。
/// </summary>
@@ -326,7 +328,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink NotesLinks;
/// <summary>
/// EProjectId 控件。
/// </summary>
@@ -335,7 +337,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label EProjectId;
/// <summary>
/// panelBottomRegion 控件。
/// </summary>
@@ -344,7 +346,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelBottomRegion;
/// <summary>
/// TabStrip1 控件。
/// </summary>
@@ -353,7 +355,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -362,7 +364,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtBuCode 控件。
/// </summary>
@@ -371,7 +373,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtBuCode;
/// <summary>
/// txtApprovedBudget 控件。
/// </summary>
@@ -380,7 +382,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtApprovedBudget;
/// <summary>
/// txtJobStatus 控件。
/// </summary>
@@ -389,7 +391,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJobStatus;
/// <summary>
/// txtScopeChange 控件。
/// </summary>
@@ -398,7 +400,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtScopeChange;
/// <summary>
/// txtJobNo 控件。
/// </summary>
@@ -407,7 +409,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJobNo;
/// <summary>
/// txtAccountNo 控件。
/// </summary>
@@ -416,7 +418,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAccountNo;
/// <summary>
/// txtProcePipEng 控件。
/// </summary>
@@ -425,7 +427,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProcePipEng;
/// <summary>
/// txtApprovedQty 控件。
/// </summary>
@@ -434,7 +436,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtApprovedQty;
/// <summary>
/// txtJobType 控件。
/// </summary>
@@ -443,7 +445,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJobType;
/// <summary>
/// txtNetworkNo 控件。
/// </summary>
@@ -452,7 +454,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtNetworkNo;
/// <summary>
/// txtEquipEng 控件。
/// </summary>
@@ -461,7 +463,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtEquipEng;
/// <summary>
/// txtApprovedCost 控件。
/// </summary>
@@ -470,16 +472,16 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtApprovedCost;
/// <summary>
/// txtJobTitle 控件。
/// txtProjType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJobTitle;
protected global::FineUIPro.TextBox txtProjType;
/// <summary>
/// txtCostEffectivity 控件。
/// </summary>
@@ -488,7 +490,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCostEffectivity;
/// <summary>
/// txtInstrumentEng 控件。
/// </summary>
@@ -497,7 +499,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtInstrumentEng;
/// <summary>
/// txtPendingQty 控件。
/// </summary>
@@ -506,16 +508,16 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtPendingQty;
/// <summary>
/// txtLeadBy 控件。
/// txtJobTitle 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtLeadBy;
protected global::FineUIPro.TextBox txtJobTitle;
/// <summary>
/// txtPVIPredition 控件。
/// </summary>
@@ -524,7 +526,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPVIPredition;
/// <summary>
/// txtElectrialEng 控件。
/// </summary>
@@ -533,7 +535,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtElectrialEng;
/// <summary>
/// txtPendingCost 控件。
/// </summary>
@@ -542,16 +544,16 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtPendingCost;
/// <summary>
/// txtPriority 控件。
/// txtLeadBy 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPriority;
protected global::FineUIPro.TextBox txtLeadBy;
/// <summary>
/// txtProjManager 控件。
/// </summary>
@@ -560,7 +562,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjManager;
/// <summary>
/// txtCivilEng 控件。
/// </summary>
@@ -569,7 +571,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCivilEng;
/// <summary>
/// txtDocStatus 控件。
/// </summary>
@@ -578,16 +580,16 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDocStatus;
/// <summary>
/// txtCategory 控件。
/// txtPriority 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCategory;
protected global::FineUIPro.TextBox txtPriority;
/// <summary>
/// txtConstManager 控件。
/// </summary>
@@ -596,7 +598,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtConstManager;
/// <summary>
/// txtCDI 控件。
/// </summary>
@@ -605,7 +607,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCDI;
/// <summary>
/// txtMOCFormNo 控件。
/// </summary>
@@ -614,16 +616,16 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMOCFormNo;
/// <summary>
/// txtOperationRep 控件。
/// txtCategory 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtOperationRep;
protected global::FineUIPro.TextBox txtCategory;
/// <summary>
/// txtEngManager 控件。
/// </summary>
@@ -632,7 +634,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtEngManager;
/// <summary>
/// txtOutSourceType 控件。
/// </summary>
@@ -641,7 +643,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtOutSourceType;
/// <summary>
/// txtCAPEXPlanNo 控件。
/// </summary>
@@ -650,7 +652,16 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCAPEXPlanNo;
/// <summary>
/// txtOperationRep 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtOperationRep;
/// <summary>
/// txtRemarks 控件。
/// </summary>
@@ -659,7 +670,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemarks;
/// <summary>
/// Panel5 控件。
/// </summary>
@@ -668,7 +679,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel5;
/// <summary>
/// Panel6 控件。
/// </summary>
@@ -677,7 +688,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel6;
/// <summary>
/// grdSchedule 控件。
/// </summary>
@@ -686,7 +697,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid grdSchedule;
/// <summary>
/// Panel7 控件。
/// </summary>
@@ -695,7 +706,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel7;
/// <summary>
/// grdScheduleDetail 控件。
/// </summary>
@@ -704,7 +715,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid grdScheduleDetail;
/// <summary>
/// lblSchProgress 控件。
/// </summary>
@@ -713,7 +724,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblSchProgress;
/// <summary>
/// lblActualProgress 控件。
/// </summary>
@@ -722,7 +733,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblActualProgress;
/// <summary>
/// Panel8 控件。
/// </summary>
@@ -731,7 +742,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel8;
/// <summary>
/// grdClosuerDetail 控件。
/// </summary>
@@ -740,7 +751,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid grdClosuerDetail;
/// <summary>
/// Panel4 控件。
/// </summary>
@@ -749,7 +760,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel4;
/// <summary>
/// Panel9 控件。
/// </summary>
@@ -758,7 +769,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel9;
/// <summary>
/// txtOrginalBudget 控件。
/// </summary>
@@ -767,7 +778,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtOrginalBudget;
/// <summary>
/// txtChangedBudget 控件。
/// </summary>
@@ -776,7 +787,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtChangedBudget;
/// <summary>
/// txtActualCost 控件。
/// </summary>
@@ -785,7 +796,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtActualCost;
/// <summary>
/// txtCommitted_PRPO 控件。
/// </summary>
@@ -794,7 +805,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtCommitted_PRPO;
/// <summary>
/// txtCommitted_SSRs 控件。
/// </summary>
@@ -803,7 +814,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtCommitted_SSRs;
/// <summary>
/// txtCostToComplete 控件。
/// </summary>
@@ -812,7 +823,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtCostToComplete;
/// <summary>
/// txtEstimatedFinalCost 控件。
/// </summary>
@@ -821,7 +832,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtEstimatedFinalCost;
/// <summary>
/// txtVariance 控件。
/// </summary>
@@ -830,7 +841,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtVariance;
/// <summary>
/// Panel10 控件。
/// </summary>
@@ -839,7 +850,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel10;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
@@ -848,7 +859,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// Grid5 控件。
/// </summary>
@@ -857,7 +868,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid5;
/// <summary>
/// Panel11 控件。
/// </summary>
@@ -866,7 +877,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel11;
/// <summary>
/// Panel12 控件。
/// </summary>
@@ -875,7 +886,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel12;
/// <summary>
/// Grid6 控件。
/// </summary>
@@ -884,7 +895,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid6;
/// <summary>
/// Panel13 控件。
/// </summary>
@@ -893,7 +904,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel13;
/// <summary>
/// ContentPanel2 控件。
/// </summary>
@@ -902,7 +913,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel2;
/// <summary>
/// Form2 控件。
/// </summary>
@@ -911,7 +922,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// txtEnginering 控件。
/// </summary>
@@ -920,7 +931,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtEnginering;
/// <summary>
/// txtProcurement 控件。
/// </summary>
@@ -929,7 +940,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtProcurement;
/// <summary>
/// txtConstruction 控件。
/// </summary>
@@ -938,7 +949,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtConstruction;
/// <summary>
/// txtQuilaityHSE 控件。
/// </summary>
@@ -947,7 +958,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtQuilaityHSE;
/// <summary>
/// Grid7 控件。
/// </summary>
@@ -956,7 +967,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid7;
/// <summary>
/// GridTDC 控件。
/// </summary>
@@ -965,7 +976,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid GridTDC;
/// <summary>
/// Label2 控件。
/// </summary>
@@ -974,7 +985,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Grid8 控件。
/// </summary>
@@ -983,7 +994,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid8;
/// <summary>
/// GridLessonLearned 控件。
/// </summary>
@@ -992,7 +1003,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid GridLessonLearned;
/// <summary>
/// Grid9 控件。
/// </summary>
@@ -1001,7 +1012,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid9;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -1010,7 +1021,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
EProject/FineUIPro.Web/common/PageBase.cs
+16 -8
View File
@@ -1510,7 +1510,7 @@ namespace FineUIPro.Web
// MC Auto
if (sends.EmailUserYN == 0)
{
// 收件人：CTE所有直线经理（CTE_Manager）、会计(当项目状态为Projects，Small Invest) and 项目组所有人员，抄送：CTE总监、PMs(CTE/M的所有人)
// 收件人：CTE所有直线经理（CTE_Manager）、会计(当项目状态为Projects，Small Invest) and 项目组所有人员，抄送：CTE总监、PMs(CTE/M的所有人：改为项目的PM)
// 项目组所有人员
var Sendes2 = (from a in Funs.DB.ManHours_Plan
join b in Funs.DB.Sys_User
@@ -1552,10 +1552,14 @@ namespace FineUIPro.Web
select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
).Distinct().ToList();
var conCC2 = (from x in Funs.DB.Sys_User
join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
where y.DepartId == Const.CTEM_DepartId && (x.IsThirdParty == false || x.IsThirdParty == null)
where x.UserId==ep.ProjectControl_ProjectManagerId && (x.IsThirdParty == false || x.IsThirdParty == null)
select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
).Distinct().ToList();
).Distinct().ToList();
//var conCC2 = (from x in Funs.DB.Sys_User
// join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
// where y.DepartId == Const.CTEM_DepartId && (x.IsThirdParty == false || x.IsThirdParty == null)
// select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
// ).Distinct().ToList();
var conCC = conCC1.Union(conCC2);
if (conCC.Count() > 0)
@@ -1614,7 +1618,7 @@ namespace FineUIPro.Web
string[] mailCC = null;
string resultMessage = "";
// 收件人：CTE所有直线经理（CTE_Manager）、会计(当项目状态为Projects，Small Invest) and 项目组所有人员，抄送：CTE总监、PMs(CTE/M的所有人)
// 收件人：CTE所有直线经理（CTE_Manager）、会计(当项目状态为Projects，Small Invest) and 项目组所有人员，抄送：CTE总监、PMs(CTE/M的所有人:改为项目的PM)
// 项目组所有人员
var Sendes2 = (from a in Funs.DB.ManHours_Plan
join b in Funs.DB.Sys_User
@@ -1656,10 +1660,14 @@ namespace FineUIPro.Web
select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
).Distinct().ToList();
var conCC2 = (from x in Funs.DB.Sys_User
join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
where y.DepartId == Const.CTEM_DepartId && (x.IsThirdParty == false || x.IsThirdParty == null)
where x.UserId == ep.ProjectControl_ProjectManagerId && (x.IsThirdParty == false || x.IsThirdParty == null)
select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
).Distinct().ToList();
).Distinct().ToList();
//var conCC2 = (from x in Funs.DB.Sys_User
// join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
// where y.DepartId == Const.CTEM_DepartId && (x.IsThirdParty == false || x.IsThirdParty == null)
// select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
// ).Distinct().ToList();
var conCC = conCC1.Union(conCC2);
if (conCC.Count() > 0)
EProject/FineUIPro.Web/packages.config
+15 -3
View File
@@ -1,19 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BouncyCastle.Cryptography" version="2.3.1" targetFramework="net48" />
<package id="Enums.NET" version="4.0.1" targetFramework="net48" />
<package id="ExtendedNumerics.BigDecimal" version="2025.1001.2.129" targetFramework="net48" />
<package id="MathNet.Numerics.Signed" version="5.0.0" targetFramework="net48" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net48" />
<package id="Microsoft.IdentityModel.Abstractions" version="7.6.2" targetFramework="net48" />
<package id="Microsoft.IdentityModel.Logging" version="7.6.2" targetFramework="net48" />
<package id="Microsoft.IdentityModel.Tokens" version="7.6.2" targetFramework="net48" />
<package id="Microsoft.IO.RecyclableMemoryStream" version="3.0.0" targetFramework="net48" />
<package id="Microsoft.ReportingServices.ReportViewerControl.WebForms" version="150.900.148" targetFramework="net40" />
<package id="Microsoft.SqlServer.Types" version="14.0.1016.290" targetFramework="net40" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
<package id="NPOI" version="2.5.5" targetFramework="net461" />
<package id="NPOI" version="2.7.1" targetFramework="net48" />
<package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net461" />
<package id="SharpZipLib" version="1.3.2" targetFramework="net461" />
<package id="SharpZipLib" version="1.4.2" targetFramework="net48" />
<package id="SixLabors.Fonts" version="1.0.1" targetFramework="net48" />
<package id="SixLabors.ImageSharp" version="3.1.5" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
<package id="System.Security.AccessControl" version="6.0.0" targetFramework="net48" />
<package id="System.Security.Cryptography.Pkcs" version="6.0.3" targetFramework="net48" />
<package id="System.Security.Cryptography.Xml" version="6.0.1" targetFramework="net48" />
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
<package id="System.Text.Encoding.CodePages" version="8.0.0" targetFramework="net48" />
<package id="System.Text.Encodings.Web" version="4.7.2" targetFramework="net48" />
<package id="System.Text.Json" version="4.7.2" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />