lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2024-06-06 16:00:57 +08:00
parent dd3f0cfafe
commit 1739e39d5b
13 changed files with 88 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs
+16 -16
View File
@@ -182,23 +182,23 @@ namespace FineUIPro.Web.TestRun.DriverReport
var report = BLL.TestRun_MonthReportService.GetMonthReportById(id);
if (report != null)
{
if (!string.IsNullOrEmpty(report.PushPerson))
{
if (report.PushPerson.Contains(this.CurrUser.UserId))
{
//if (!string.IsNullOrEmpty(report.PushPerson))
//{
// if (report.PushPerson.Contains(this.CurrUser.UserId))
// {
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthReportPushView.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
}
else
{
Alert.ShowInTop("对不起，您不是接收推送人员，不能查看！");
return;
}
}
else
{
Alert.ShowInTop("对不起，您不是接收推送人员，不能查看！");
return;
}
// }
// else
// {
// Alert.ShowInTop("对不起，您不是接收推送人员，不能查看！");
// return;
// }
//}
//else
//{
// Alert.ShowInTop("对不起，您不是接收推送人员，不能查看！");
// return;
//}
}
}
}
SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportNewEdit.aspx.cs
+4 -3
View File
@@ -101,8 +101,9 @@ namespace FineUIPro.Web.TestRun.DriverReport
}
else
{
this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : Request.Params["startdate"];
this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)) : Request.Params["enddate"];
this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? (DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-25") : Request.Params["enddate"];
this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtEndDate.Text.Trim()).AddMonths(-1).AddDays(1)) : Request.Params["startdate"];
//新增月报时填充上一条月报的项目概况内容
var report = BLL.TestRun_MonthReportService.GetReportByMaxDate(this.CurrUser.LoginProjectId);
if (report != null)
@@ -259,7 +260,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
//newData.MonthReportDate = Funs.GetNewDateTime(this.txtStartDate.Text.Trim());
newData.SortId = this.txtPeriod.Text.Trim();
newData.StartDate = Funs.GetNewDateTime(this.txtStartDate.Text);
newData.EndDate = Funs.GetNewDateTime(this.txtEndDate.Text);
newData.EndDate = Funs.GetNewDateTime(this.txtEndDate.Text);
newData.ProjectId = this.CurrUser.LoginProjectId;
newData.ProjectOverview = this.txtProjectOverview.Text.Trim();
newData.ProjectBaseInfo = this.txtProjectBaseInfo.Text.Trim();
SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx
+2 -3
View File
@@ -32,9 +32,8 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtMonthReportCode" runat="server" Label="编号" LabelAlign="Right" Readonly="true">
</f:TextBox>
<f:DatePicker ID="txtMonthReportDate" runat="server" Label="报告日期" LabelAlign="Right" Readonly="true"></f:DatePicker>
<f:DatePicker ID="txtStartDate" runat="server" Label="时间段" LabelAlign="Right" Readonly="true"></f:DatePicker>
<f:DatePicker ID="txtEndDate" runat="server" Label="至" LabelAlign="Right" Readonly="true"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.cs
+4 -4
View File
@@ -21,8 +21,8 @@ namespace FineUIPro.Web.TestRun.DriverReport
if (data != null)
{
this.hdId.Text = id;
this.txtMonthReportCode.Text = data.MonthReportCode;
this.txtMonthReportDate.Text = data.MonthReportDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MonthReportDate) : "";
this.txtStartDate.Text = data.StartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.StartDate) : "";
this.txtEndDate.Text = data.EndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.EndDate) : "";
this.txtMilestone.Text = data.Milestone;
this.txtCompleteWork.Text = data.CompleteWork;
@@ -32,10 +32,10 @@ namespace FineUIPro.Web.TestRun.DriverReport
this.txtNextMonthCompleteWork.Text = data.NextMonthCompleteWork;
this.txtNextMonthSchedule.Text = data.NextMonthSchedule;
this.txtNextMonthDrivingCost.Text = data.NextMonthDrivingCost;
GroupPanel8.Title = "下月开车计划要点(" + data.EndDate.Value.AddMonths(1).Month + "月份)";
}
}
GroupPanel8.Title = "下月开车计划要点(" + Convert.ToDateTime(this.txtMonthReportDate.Text).AddMonths(1).Month + "月份)";
}
}
#endregion
SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.designer.cs
Generated
+4 -4
View File
@@ -85,22 +85,22 @@ namespace FineUIPro.Web.TestRun.DriverReport {
protected global::FineUIPro.Form Form2;
/// <summary>
/// txtMonthReportCode 控件。
/// txtStartDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMonthReportCode;
protected global::FineUIPro.DatePicker txtStartDate;
/// <summary>
/// txtMonthReportDate 控件。
/// txtEndDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtMonthReportDate;
protected global::FineUIPro.DatePicker txtEndDate;
/// <summary>
/// GroupPanel2 控件。