From 1739e39d5b474e47a97295bea19f38b07f1baa2b Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 6 Jun 2024 16:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2024-06-05-gaofei.sql | 3 ++ SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx | 3 ++ .../Personal/BusinessTrip.aspx.cs | 10 ++++++ .../Personal/BusinessTrip.aspx.designer.cs | 9 ++++++ .../TestRun/DriverReport/MonthReport.aspx.cs | 32 +++++++++---------- .../DriverReport/MonthReportNewEdit.aspx.cs | 7 ++-- .../DriverReport/MonthReportPushView.aspx | 5 ++- .../DriverReport/MonthReportPushView.aspx.cs | 8 ++--- .../MonthReportPushView.aspx.designer.cs | 8 ++--- SGGL/FineUIPro.Web/common/Menu_Personal.xml | 3 ++ SGGL/FineUIPro.Web/common/Menu_TestRun.xml | 14 ++++---- SGGL/FineUIPro.Web/common/Menu_Transfer.xml | 18 +++++++++++ SGGL/FineUIPro.Web/common/Menu_ZHGL.xml | 4 +++ 13 files changed, 88 insertions(+), 36 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-06-05-gaofei.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2024-06-05-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-06-05-gaofei.sql new file mode 100644 index 00000000..eed3671b --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-06-05-gaofei.sql @@ -0,0 +1,3 @@ +delete from Sys_ButtonToMenu where MenuId='AA88BD56-E0B4-4B9C-9238-3F48EA59C50A' +delete from Sys_Menu where MenuId='AA88BD56-E0B4-4B9C-9238-3F48EA59C50A' +GO \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx b/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx index aff4bc9c..dee0c859 100644 --- a/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx +++ b/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx @@ -32,6 +32,9 @@ + + diff --git a/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx.cs b/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx.cs index f458090f..ee7b91b1 100644 --- a/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx.cs +++ b/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx.cs @@ -235,5 +235,15 @@ namespace FineUIPro.Web.Personal { BindGrid(); } + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx.designer.cs b/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx.designer.cs index 11962c5b..35e18f2d 100644 --- a/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/Personal/BusinessTrip.aspx.designer.cs @@ -93,6 +93,15 @@ namespace FineUIPro.Web.Personal { /// protected global::FineUIPro.Button btnNew; + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// ToolbarSeparator1 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs index d646672d..4d3eba0f 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs @@ -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; + //} } } } diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportNewEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportNewEdit.aspx.cs index 262fd8b6..ecddf443 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportNewEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportNewEdit.aspx.cs @@ -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(); diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx index adfcc414..caf96164 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx @@ -32,9 +32,8 @@ - - - + + diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.cs index d8b6ea5e..3d140cc1 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.cs @@ -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 diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.designer.cs index caab3950..bd897732 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.designer.cs @@ -85,22 +85,22 @@ namespace FineUIPro.Web.TestRun.DriverReport { protected global::FineUIPro.Form Form2; /// - /// txtMonthReportCode 控件。 + /// txtStartDate 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtMonthReportCode; + protected global::FineUIPro.DatePicker txtStartDate; /// - /// txtMonthReportDate 控件。 + /// txtEndDate 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DatePicker txtMonthReportDate; + protected global::FineUIPro.DatePicker txtEndDate; /// /// GroupPanel2 控件。 diff --git a/SGGL/FineUIPro.Web/common/Menu_Personal.xml b/SGGL/FineUIPro.Web/common/Menu_Personal.xml index 2854ffd9..a9d07855 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Personal.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Personal.xml @@ -6,4 +6,7 @@ + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml index b1a26ee1..1c0402e8 100644 --- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml +++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml @@ -46,12 +46,12 @@ - - - + + + + - @@ -69,9 +69,11 @@ + + @@ -119,8 +121,8 @@ - + + - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml index 91d9fd84..4d3b9e97 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml @@ -1,3 +1,21 @@  + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index ed44c8fe..69859890 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -83,4 +83,8 @@ + + + + \ No newline at end of file