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

20250619 修改报表

This commit is contained in:
毕文静 2025-06-19 11:45:21 +08:00
parent 1390e63fe2
commit a4b1a94dd9
17 changed files with 322 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CreateModel.bat
View File

@ -27,7 +27,7 @@ REM --------------
@echo.
@call "%VS100COMNTOOLS%"vsvars32.bat
SqlMetal /views /server:.\SQL2016 /database:EProjectDB /code:%Model_ROOT%\Model.cs /namespace:Model
SqlMetal /views /server:.\SQL2022 /database:EProjectDB /code:%Model_ROOT%\Model.cs /namespace:Model
@ECHO 完成
pause

30
EProject/BLL/Common/CommonService.cs
View File

@ -293,7 +293,10 @@ namespace BLL
if (user.UserId == Const.GlyId) //// 如果是管理员或者本部人员返回所有菜单
{
var sysMenu = from x in Funs.DB.Sys_Menu orderby x.SortIndex select x;
reMenuList = sysMenu.ToList();
if (sysMenu.Count() > 0)
{
reMenuList = sysMenu.ToList();
}
}
else
{
@ -302,7 +305,10 @@ namespace BLL
where y.RoleId == user.RoleId
orderby x.SortIndex
select x;
reMenuList = sysMenuRole.ToList();
if (sysMenuRole.Count() > 0)
{
reMenuList = sysMenuRole.ToList();
}
// PM,EM,CM权限特殊处理
List<string> pm = (from x in Funs.DB.Editor_EProject select x.ProjectControl_ProjectManagerId).ToList();
@ -312,13 +318,19 @@ namespace BLL
{
Model.Sys_Menu addSupMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == "1FA19FE4-D8B9-4D1B-8EB0-CAC05B71AFBB" select x).First();
Model.Sys_Menu addMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == Const.PMEditorMenuId select x).First();
reMenuList.Add(addMenu);
if (addMenu != null)
{
reMenuList.Add(addMenu);
}
}
if (cm.Contains(user.UserId))
{
Model.Sys_Menu addSupMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == "1FA19FE4-D8B9-4D1B-8EB0-CAC05B71AFBB" select x).First();
Model.Sys_Menu addMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == Const.CMEditorMenuId select x).First();
reMenuList.Add(addMenu);
if (addMenu != null)
{
reMenuList.Add(addMenu);
}
}
// 对资源模块的特殊处理:CTE/M具有RP权限
@ -326,8 +338,14 @@ namespace BLL
{
Model.Sys_Menu addSupMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == "72CDB9E2-F44B-4F96-A578-3271211FDC15" select x).First();
Model.Sys_Menu addMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == Const.ResourcePlanMenuId select x).First();
reMenuList.Add(addSupMenu);
reMenuList.Add(addMenu);
if (addSupMenu != null)
{
reMenuList.Add(addSupMenu);
}
if (addMenu != null)
{
reMenuList.Add(addMenu);
}
}
}

4
EProject/EProject.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.572
# Visual Studio Version 17
VisualStudioVersion = 17.11.35312.102
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}"
EndProject

6
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx
View File

@ -41,7 +41,7 @@
<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" 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:NumberBox ID="txtOrginalBudget" runat="server" Label="Original 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>
</Items>
@ -49,7 +49,7 @@
<f:FormRow ColumnWidths="25% 24% 27% 24%">
<Items>
<f:TextBox ID="txtJobTitle" runat="server" Label="Job Title" LabelWidth="110px" ShowRedStar="true" Required="true"></f:TextBox>
<f:TextBox ID="txtCostEffectvitity" runat="server" Label="Cost Effectvitity" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtCostEffectvitity" runat="server" Label="Cost Effectivity" LabelWidth="120px"></f:TextBox>
<f:DropDownList ID="drpLeadBy" runat="server" Label="Lead By" LabelWidth="160px" EnableEdit="true" EnableGroup="true" ShowRedStar="true">
</f:DropDownList>
<f:TextBox ID="txtCAPEXPlanNo" runat="server" Label="CAPEX Plan No." LabelWidth="130px"></f:TextBox>
@ -146,7 +146,7 @@
<f:DropDownList ID="drpCIProcess" runat="server" Label="Proce.&Pip.Eng." LabelWidth="140px" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpEquipment" runat="server" Label="Equip.Eng." LabelWidth="140px" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpInstrument" runat="server" Label="Instrument Eng." LabelWidth="140px" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpElectrical" runat="server" Label="Electrial Eng." LabelWidth="140px" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpElectrical" runat="server" Label="Electrical Eng." LabelWidth="140px" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpCivil" runat="server" Label="Civil Eng." LabelWidth="140px" EnableEdit="true"></f:DropDownList>
</Items>
</f:FormRow>

BIN
EProject/FineUIPro.Web/File/Excel/Project_List_Report.xlsx
View File

Binary file not shown.

2
EProject/FineUIPro.Web/Global.asax.cs
View File

@ -108,7 +108,7 @@
}
// MC证书提醒
if ((DateTime.Now.Day == 1 || DateTime.Now.Day == 16) && DateTime.Now.Hour == 10)
if ((DateTime.Now.Day == 1 || DateTime.Now.Day == 16) && DateTime.Now.Hour == 14)
{
System.Timers.Timer aTimer = new System.Timers.Timer();
//1小时执行一次

2
EProject/FineUIPro.Web/ManHours/ManHoursActual.aspx.cs
View File

@ -380,7 +380,7 @@ namespace FineUIPro.Web.ManHours
Alert.ShowInParent("Please fill in the Hours!");
return;
}
Actual.Hours = int.Parse(objects["values"]["Hours"].ToString());
Actual.Hours = Funs.GetNewDouble(objects["values"]["Hours"].ToString());
Actual.Description = objects["values"]["Description"].ToString();
actualLists.Add(Actual);

12
EProject/FineUIPro.Web/Report/ProjectListReport.aspx
View File

@ -740,6 +740,18 @@
<f:RenderField Width="120px" ColumnID="PM_Pre_Approval" DataField="PM_Pre_Approval"
FieldType="Date" Renderer="Date" HeaderText="Pre-Approval" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>
<%--<f:RenderField Width="120px" ColumnID="CM_KickOffMetting" DataField="CM_KickOffMetting"
FieldType="Date" Renderer="Date" HeaderText="Construction Kick Off Meeting" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>--%>
<f:RenderField Width="120px" ColumnID="PM_Remarks_Engineering" DataField="PM_Remarks_Engineering"
FieldType="String" HeaderText="Engineering Remark" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>
<f:RenderField Width="120px" ColumnID="PM_Remarks_Procurement" DataField="PM_Remarks_Procurement"
FieldType="String" HeaderText="Procurement Remark" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>
<f:RenderField Width="120px" ColumnID="CM_Remarks_Construction" DataField="CM_Remarks_Construction"
FieldType="String" HeaderText="Construction Remark" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">

14
EProject/FineUIPro.Web/Report/ProjectListReport.aspx.cs
View File

@ -1403,6 +1403,20 @@ namespace FineUIPro.Web.Report
projectList.GetRow(rowIndex).GetCell(74).SetCellValue(itemOver.ProjectControl_ProjectType);
projectList.GetRow(rowIndex).GetCell(74).CellStyle.SetFont(cs_content_Font);
//Engineering Remark
if (projectList.GetRow(rowIndex).GetCell(75) == null) projectList.GetRow(rowIndex).CreateCell(75);
projectList.GetRow(rowIndex).GetCell(75).SetCellValue(itemOver.PM_Remarks_Engineering);
projectList.GetRow(rowIndex).GetCell(75).CellStyle.SetFont(cs_content_Font);
//Procurement Remark
if (projectList.GetRow(rowIndex).GetCell(76) == null) projectList.GetRow(rowIndex).CreateCell(76);
projectList.GetRow(rowIndex).GetCell(76).SetCellValue(itemOver.PM_Remarks_Procurement);
projectList.GetRow(rowIndex).GetCell(76).CellStyle.SetFont(cs_content_Font);
//Construction Remark
if (projectList.GetRow(rowIndex).GetCell(77) == null) projectList.GetRow(rowIndex).CreateCell(77);
projectList.GetRow(rowIndex).GetCell(77).SetCellValue(itemOver.CM_Remarks_Construction);
projectList.GetRow(rowIndex).GetCell(77).CellStyle.SetFont(cs_content_Font);
#endregion
rowIndex++;

18
EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx
View File

@ -20,13 +20,15 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobStatus" runat="server" Label="Job Status" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" LabelAlign="Right" NextFocusControl="btnSearch">
<f:DropDownList ID="drpJobStatus" runat="server" Label="Job Status" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" LabelAlign="Right" NextFocusControl="btnSearch" Width="270px">
</f:DropDownList>
<f:TextBox ID="txtJobNo" runat="server" Label="Job NO." LabelAlign="Right" NextFocusControl="btnSearch" Width="270px"></f:TextBox>
<f:TextBox ID="txtAccount" runat="server" Label="Account" LabelAlign="Right" NextFocusControl="btnSearch" Width="270px"></f:TextBox>
<f:DropDownList ID="drpName" runat="server" Label="Name" LabelAlign="Right" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" NextFocusControl="btnSearch" Width="270px"></f:DropDownList>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
<%--<f:TextBox ID="txtJobNo" runat="server" Label="Job No." LabelAlign="Right" EmptyText="query conditions" AutoPostBack="true" OnTextChanged="DropDownList_SelectedIndexChanged"></f:TextBox>--%>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnExport" OnClick="btnExport_Click" runat="server" Text="Export" ToolTip="Export"
Icon="DoorOut" EnableAjax="false" DisableControlBeforePostBack="true" EnablePress="true" Pressed="false" Hidden="true" >
<f:Button ID="btnExport" OnClick="btnExport_Click" runat="server" Text="Export" ToolTip="Export"
Icon="DoorOut" EnableAjax="false" DisableControlBeforePostBack="true" EnablePress="true" Pressed="false" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
@ -87,7 +89,7 @@
</Operator>
</Filter>
</f:RenderField>
<f:RenderField Width="110px" ColumnID="Phase" DataField="Phase"
<f:RenderField Width="110px" ColumnID="Phase" DataField="Phase"
FieldType="String" HeaderText="Phase" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="PM_MA_JobReveive" DataField="PM_MA_JobReveive"
@ -157,7 +159,7 @@
</Filter>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Account" DataField="Account"
FieldType="String" HeaderText="Account" HeaderTextAlign="Center" TextAlign="Left" >
FieldType="String" HeaderText="Account" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="EngineerName" DataField="EngineerName"
FieldType="String" HeaderText="Name" HeaderTextAlign="Center" TextAlign="Left" EnableFilter="true">
@ -236,7 +238,7 @@
<f:BoundField Width="110px" DataField="IFC_All" HeaderText="IFC_All">
</f:BoundField>
<f:RenderField Width="110px" ColumnID="Detail_Eng_Civil_Sch_Start" DataField="Detail_Eng_Civil_Sch_Start"
<f:RenderField Width="110px" ColumnID="Detail_Eng_Civil_Sch_Start" DataField="Detail_Eng_Civil_Sch_Start"
FieldType="Date" Renderer="Date" HeaderText="PROJ_DE_CIVIL_SCH_START_DATE" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="Detail_Eng_Civil_Sch_End" DataField="Detail_Eng_Civil_Sch_End"
@ -260,7 +262,7 @@
<f:RenderField Width="110px" ColumnID="PROJ_DE_ME_ACU_END_DATE" DataField="PROJ_DE_ME_ACU_END_DATE"
FieldType="Date" Renderer="Date" HeaderText="PROJ_DE_ME_ACU_END_DATE" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="ProjectControl_LeadByName" DataField="ProjectControl_LeadByName"
<f:RenderField Width="110px" ColumnID="ProjectControl_LeadByName" DataField="ProjectControl_LeadByName"
FieldType="String" HeaderText="Lead By" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>

44
EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx.cs
View File

@ -7,6 +7,8 @@ using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Xml.Linq;
using Org.BouncyCastle.Bcpg.OpenPgp;
namespace FineUIPro.Web.Report
{
public partial class ProjectManhourReport : PageBase
@ -27,6 +29,7 @@ namespace FineUIPro.Web.Report
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ConstService.InitConstValueDropDownList(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, true);
BLL.Sys_UserService.InitCTEUserDropDownList(this.drpName, true);
// 绑定表格
BindGrid();
@ -49,6 +52,19 @@ namespace FineUIPro.Web.Report
string status = String.Join(",", drpJobStatus.SelectedItemArray.Select(e => e.Text));
listStr.Add(new SqlParameter("@JobStatus", status));
}
if (!string.IsNullOrEmpty(this.txtJobNo.Text.Trim()))
{
listStr.Add(new SqlParameter("@JobNo", "%" + this.txtJobNo.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtAccount.Text.Trim()))
{
listStr.Add(new SqlParameter("@Account", "%" + this.txtAccount.Text.Trim() + "%"));
}
if (this.drpName.SelectedValue != BLL.Const._Null && this.drpName.SelectedValue != null)
{
string name = String.Join(",", drpName.SelectedItemArray.Select(e => e.Text));
listStr.Add(new SqlParameter("@Name", name));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("Proc_ProjectManhourReport", parameter);
Grid1.RecordCount = tb.Rows.Count;
@ -289,8 +305,7 @@ namespace FineUIPro.Web.Report
{
BindGrid();
}
#endregion
#endregion
#region 分页、排序
/// <summary>
@ -375,6 +390,31 @@ namespace FineUIPro.Web.Report
{
listStr.Add(new SqlParameter("@JobStatus", null));
}
if (!string.IsNullOrEmpty(this.txtJobNo.Text.Trim()))
{
listStr.Add(new SqlParameter("@JobNo", "%" + this.txtJobNo.Text.Trim() + "%"));
}
else
{
listStr.Add(new SqlParameter("@JobNo", null));
}
if (!string.IsNullOrEmpty(this.txtAccount.Text.Trim()))
{
listStr.Add(new SqlParameter("@Account", "%" + this.txtAccount.Text.Trim() + "%"));
}
else
{
listStr.Add(new SqlParameter("@Account", null));
}
if (drpName.SelectedValue != BLL.Const._Null && drpName.SelectedValue != null)
{
string status = String.Join(",", drpName.SelectedItemArray.Select(x => x.Text));
listStr.Add(new SqlParameter("@Name", status));
}
else
{
listStr.Add(new SqlParameter("@Name", null));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable table = SQLHelper.GetDataTableRunProc("Proc_ProjectManhourReport", parameter);
if (table.Rows.Count > 0)

91
EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Report {
public partial class ProjectManhourReport {
namespace FineUIPro.Web.Report
{
public partial class ProjectManhourReport
{
/// <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>
/// drpJobStatus 控件。
/// </summary>
@ -65,7 +67,34 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJobStatus;
/// <summary>
/// txtJobNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJobNo;
/// <summary>
/// txtAccount 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAccount;
/// <summary>
/// drpName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpName;
/// <summary>
/// btnSearch 控件。
/// </summary>
@ -74,7 +103,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -83,7 +112,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnExport 控件。
/// </summary>
@ -92,7 +121,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnExport;
/// <summary>
/// DropDowsnList1 控件。
/// </summary>
@ -101,7 +130,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDowsnList1;
/// <summary>
/// DropDownList1 控件。
/// </summary>
@ -110,7 +139,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList1;
/// <summary>
/// DropDownList2 控件。
/// </summary>
@ -119,7 +148,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList2;
/// <summary>
/// DropDownList3 控件。
/// </summary>
@ -128,7 +157,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList3;
/// <summary>
/// DropDownList4 控件。
/// </summary>
@ -137,7 +166,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList4;
/// <summary>
/// DropDownList5 控件。
/// </summary>
@ -146,7 +175,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList5;
/// <summary>
/// DropDownList6 控件。
/// </summary>
@ -155,7 +184,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList6;
/// <summary>
/// DropDownList7 控件。
/// </summary>
@ -164,7 +193,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList7;
/// <summary>
/// DropDownList8 控件。
/// </summary>
@ -173,7 +202,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList8;
/// <summary>
/// DropDownList9 控件。
/// </summary>
@ -182,7 +211,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList9;
/// <summary>
/// DropDownList10 控件。
/// </summary>
@ -191,7 +220,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList10;
/// <summary>
/// DropDownList11 控件。
/// </summary>
@ -200,7 +229,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList11;
/// <summary>
/// DropDownList12 控件。
/// </summary>
@ -209,7 +238,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList12;
/// <summary>
/// DropDownList13 控件。
/// </summary>
@ -218,7 +247,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList13;
/// <summary>
/// DropDownList14 控件。
/// </summary>
@ -227,7 +256,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList14;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -236,7 +265,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -245,7 +274,7 @@ namespace FineUIPro.Web.Report {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>

2
EProject/FineUIPro.Web/Web.config
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=.\sql2022;Initial Catalog=EProjectDB;uid=sa;pwd=1111;"/>
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=EProjectDB;Integrated Security=True"
providerName="System.Data.SqlClient" />-->
</connectionStrings>

10
EProject/FineUIPro.Web/common/Main.aspx
View File

@ -333,7 +333,7 @@
<f:Panel ID="Panel9" Width="350px"
runat="server" BodyPadding="1px" ShowBorder="false" ShowHeader="false">
<Items>
<f:NumberBox ID="txtOrginalBudget" runat="server" Label="Orginal Budget(RMB)" LabelWidth="190px" EnableCommas="true" Readonly="true"></f:NumberBox>
<f:NumberBox ID="txtOrginalBudget" runat="server" Label="Original Budget(RMB)" LabelWidth="190px" EnableCommas="true" Readonly="true"></f:NumberBox>
<f:NumberBox ID="txtChangedBudget" runat="server" Label="Changed Budget(RMB)" LabelWidth="190px" EnableCommas="true" Readonly="true"></f:NumberBox>
<f:NumberBox ID="txtActualCost" runat="server" Label="Actual Cost(RMB)" LabelWidth="190px" EnableCommas="true" Readonly="true"></f:NumberBox>
<f:NumberBox ID="txtCommitted_PRPO" runat="server" Label="Committed_PR/PO(RMB)" LabelWidth="190px" EnableCommas="true" Readonly="true"></f:NumberBox>
@ -431,7 +431,7 @@
<Items>
<f:FormRow>
<Items>
<f:TextArea ID="txtEnginering" runat="server" Label="Enginering" Height="60px"></f:TextArea>
<f:TextArea ID="txtEnginering" runat="server" Label="Engineering" Height="60px"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
@ -446,7 +446,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtQuilaityHSE" runat="server" Label="Quilaity&HSE" Height="60px"></f:TextArea>
<f:TextArea ID="txtQuilaityHSE" runat="server" Label="Quality&HSE" Height="60px"></f:TextArea>
</Items>
</f:FormRow>
</Items>
@ -658,10 +658,10 @@
SortField="DisciplinesWBSCode" FieldType="String" HeaderText="Identifier" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="DisciplinesWBSName" DataField="DisciplinesWBSName"
FieldType="String" HeaderText="Descipline" HeaderTextAlign="Center" TextAlign="Left">
FieldType="String" HeaderText="Discipline" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="QuantityDesctiption" DataField="QuantityDesctiption"
FieldType="String" HeaderText="Quantity Desctiption" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
FieldType="String" HeaderText="Quantity Description" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="InputQuantity" DataField="InputQuantity"
FieldType="String" HeaderText="Input Quantity" HeaderTextAlign="Center" TextAlign="Left">

2
EProject/FineUIPro.Web/common/PageBase.cs
View File

@ -1527,7 +1527,7 @@ namespace FineUIPro.Web
{
var Sendes1 = (from u in Sys_UserService.GetUserList()
join r in Funs.DB.Sys_Role on u.RoleId equals r.RoleId
where r.RoleName == "CTE_Manager" || r.RoleName == "Accounting"
where r.RoleName == "CTE_Manager" //|| r.RoleName == "Accounting"
select new { EmuaerEmailAddress = u.Email, senduserid = u.UserId }
).Distinct().ToList();
var Senders = Sendes1.Union(Sendes2);

33
EProject/FineUIPro.Web/index.aspx.cs
View File

@ -129,24 +129,27 @@ namespace FineUIPro.Web
leftPanel.Items.Add(accordionMenu);
var dt = GetNewMenu("0");
foreach (var dr in dt)
if (dt.Count() > 0)
{
AccordionPane accordionPane = new AccordionPane();
accordionPane.Title = dr.MenuName;
//accordionPane.Layout = Layout.Fit;
accordionPane.ShowBorder = false;
accordionPane.BodyPadding = "2px 0 0 0";
accordionMenu.Items.Add(accordionPane);
foreach (var dr in dt)
{
AccordionPane accordionPane = new AccordionPane();
accordionPane.Title = dr.MenuName;
//accordionPane.Layout = Layout.Fit;
accordionPane.ShowBorder = false;
accordionPane.BodyPadding = "2px 0 0 0";
accordionMenu.Items.Add(accordionPane);
Tree innerTree = new Tree();
innerTree.ShowBorder = false;
innerTree.ShowHeader = false;
innerTree.EnableIcons = true;
innerTree.AutoScroll = true;
innerTree.EnableSingleClickExpand = true;
accordionPane.Items.Add(innerTree);
Tree innerTree = new Tree();
innerTree.ShowBorder = false;
innerTree.ShowHeader = false;
innerTree.EnableIcons = true;
innerTree.AutoScroll = true;
innerTree.EnableSingleClickExpand = true;
accordionPane.Items.Add(innerTree);
BoundTree(innerTree.Nodes, dr.MenuId);
BoundTree(innerTree.Nodes, dr.MenuId);
}
}
return accordionMenu;
}

322
EProject/Model/Model.cs
View File

@ -137,9 +137,6 @@ namespace Model
partial void InsertResource_PlanDetail(Resource_PlanDetail instance);
partial void UpdateResource_PlanDetail(Resource_PlanDetail instance);
partial void DeleteResource_PlanDetail(Resource_PlanDetail instance);
partial void InsertSyncDataUserLogs(SyncDataUserLogs instance);
partial void UpdateSyncDataUserLogs(SyncDataUserLogs instance);
partial void DeleteSyncDataUserLogs(SyncDataUserLogs instance);
partial void InsertSys_ActualManHourMonthSet(Sys_ActualManHourMonthSet instance);
partial void UpdateSys_ActualManHourMonthSet(Sys_ActualManHourMonthSet instance);
partial void DeleteSys_ActualManHourMonthSet(Sys_ActualManHourMonthSet instance);
@ -18837,79 +18834,28 @@ namespace Model
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.SyncDataUserLogs")]
public partial class SyncDataUserLogs : INotifyPropertyChanging, INotifyPropertyChanged
public partial class SyncDataUserLogs
{
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
private int _Id;
private string _BatchNo;
private int _DataType;
private System.Nullable<System.DateTime> _CreatedTime;
private System.Nullable<int> _DataType;
private string _DepatId;
private string _UserId;
private System.Nullable<System.DateTime> _CreatedTime;
private System.Nullable<bool> _IsSuccess;
private string _Remark;
private string _Josn;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
partial void OnCreated();
partial void OnIdChanging(int value);
partial void OnIdChanged();
partial void OnBatchNoChanging(string value);
partial void OnBatchNoChanged();
partial void OnDataTypeChanging(int value);
partial void OnDataTypeChanged();
partial void OnDepatIdChanging(string value);
partial void OnDepatIdChanged();
partial void OnUserIdChanging(string value);
partial void OnUserIdChanged();
partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
partial void OnCreatedTimeChanged();
partial void OnIsSuccessChanging(System.Nullable<bool> value);
partial void OnIsSuccessChanged();
partial void OnRemarkChanging(string value);
partial void OnRemarkChanged();
partial void OnJosnChanging(string value);
partial void OnJosnChanged();
#endregion
public SyncDataUserLogs()
{
OnCreated();
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="id", Storage="_Id", AutoSync=AutoSync.OnInsert, DbType="Int NOT NULL IDENTITY", IsPrimaryKey=true, IsDbGenerated=true)]
public int Id
{
get
{
return this._Id;
}
set
{
if ((this._Id != value))
{
this.OnIdChanging(value);
this.SendPropertyChanging();
this._Id = value;
this.SendPropertyChanged("Id");
this.OnIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="batchNo", Storage="_BatchNo", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BatchNo", DbType="NVarChar(50)")]
public string BatchNo
{
get
@ -18920,76 +18866,12 @@ namespace Model
{
if ((this._BatchNo != value))
{
this.OnBatchNoChanging(value);
this.SendPropertyChanging();
this._BatchNo = value;
this.SendPropertyChanged("BatchNo");
this.OnBatchNoChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="dataType", Storage="_DataType", DbType="Int NOT NULL")]
public int DataType
{
get
{
return this._DataType;
}
set
{
if ((this._DataType != value))
{
this.OnDataTypeChanging(value);
this.SendPropertyChanging();
this._DataType = value;
this.SendPropertyChanged("DataType");
this.OnDataTypeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="depatId", Storage="_DepatId", DbType="NVarChar(50)")]
public string DepatId
{
get
{
return this._DepatId;
}
set
{
if ((this._DepatId != value))
{
this.OnDepatIdChanging(value);
this.SendPropertyChanging();
this._DepatId = value;
this.SendPropertyChanged("DepatId");
this.OnDepatIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="userId", Storage="_UserId", DbType="NVarChar(50)")]
public string UserId
{
get
{
return this._UserId;
}
set
{
if ((this._UserId != value))
{
this.OnUserIdChanging(value);
this.SendPropertyChanging();
this._UserId = value;
this.SendPropertyChanged("UserId");
this.OnUserIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="createdTime", Storage="_CreatedTime", DbType="DateTime")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
public System.Nullable<System.DateTime> CreatedTime
{
get
@ -19000,11 +18882,55 @@ namespace Model
{
if ((this._CreatedTime != value))
{
this.OnCreatedTimeChanging(value);
this.SendPropertyChanging();
this._CreatedTime = value;
this.SendPropertyChanged("CreatedTime");
this.OnCreatedTimeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataType", DbType="Int")]
public System.Nullable<int> DataType
{
get
{
return this._DataType;
}
set
{
if ((this._DataType != value))
{
this._DataType = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepatId", DbType="NVarChar(50)")]
public string DepatId
{
get
{
return this._DepatId;
}
set
{
if ((this._DepatId != value))
{
this._DepatId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserId", DbType="NVarChar(50)")]
public string UserId
{
get
{
return this._UserId;
}
set
{
if ((this._UserId != value))
{
this._UserId = value;
}
}
}
@ -19020,16 +18946,12 @@ namespace Model
{
if ((this._IsSuccess != value))
{
this.OnIsSuccessChanging(value);
this.SendPropertyChanging();
this._IsSuccess = value;
this.SendPropertyChanged("IsSuccess");
this.OnIsSuccessChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
public string Remark
{
get
@ -19040,54 +18962,10 @@ namespace Model
{
if ((this._Remark != value))
{
this.OnRemarkChanging(value);
this.SendPropertyChanging();
this._Remark = value;
this.SendPropertyChanged("Remark");
this.OnRemarkChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Josn", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string Josn
{
get
{
return this._Josn;
}
set
{
if ((this._Josn != value))
{
this.OnJosnChanging(value);
this.SendPropertyChanging();
this._Josn = value;
this.SendPropertyChanged("Josn");
this.OnJosnChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
protected virtual void SendPropertyChanging()
{
if ((this.PropertyChanging != null))
{
this.PropertyChanging(this, emptyChangingEventArgs);
}
}
protected virtual void SendPropertyChanged(String propertyName)
{
if ((this.PropertyChanged != null))
{
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Sys_ActualManHourMonthSet")]
@ -28577,8 +28455,6 @@ namespace Model
private string _CM_CM_RevisedEnd;
private string _CM_KickOffMetting;
private System.Nullable<System.DateTime> _ProjectControl_Revised_MC_Date;
private string _ProjectControl_Remarks;
@ -28605,6 +28481,14 @@ namespace Model
private string _Job_Hold;
private string _CM_KickOffMetting;
private string _PM_Remarks_Engineering;
private string _PM_Remarks_Procurement;
private string _CM_Remarks_Construction;
public View_ProjectListReport()
{
}
@ -29633,22 +29517,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CM_KickOffMetting", DbType="VarChar(10)")]
public string CM_KickOffMetting
{
get
{
return this._CM_KickOffMetting;
}
set
{
if ((this._CM_KickOffMetting != value))
{
this._CM_KickOffMetting = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectControl_Revised_MC_Date", DbType="DateTime")]
public System.Nullable<System.DateTime> ProjectControl_Revised_MC_Date
{
@ -29856,6 +29724,70 @@ namespace Model
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CM_KickOffMetting", DbType="VarChar(10)")]
public string CM_KickOffMetting
{
get
{
return this._CM_KickOffMetting;
}
set
{
if ((this._CM_KickOffMetting != value))
{
this._CM_KickOffMetting = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PM_Remarks_Engineering", DbType="NVarChar(2000)")]
public string PM_Remarks_Engineering
{
get
{
return this._PM_Remarks_Engineering;
}
set
{
if ((this._PM_Remarks_Engineering != value))
{
this._PM_Remarks_Engineering = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PM_Remarks_Procurement", DbType="NVarChar(2000)")]
public string PM_Remarks_Procurement
{
get
{
return this._PM_Remarks_Procurement;
}
set
{
if ((this._PM_Remarks_Procurement != value))
{
this._PM_Remarks_Procurement = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CM_Remarks_Construction", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string CM_Remarks_Construction
{
get
{
return this._CM_Remarks_Construction;
}
set
{
if ((this._CM_Remarks_Construction != value))
{
this._CM_Remarks_Construction = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Punch")]