diff --git a/AMESCoreStudio.Web/Controllers/RPTController.cs b/AMESCoreStudio.Web/Controllers/RPTController.cs index 11bca281..fe9dc6e0 100644 --- a/AMESCoreStudio.Web/Controllers/RPTController.cs +++ b/AMESCoreStudio.Web/Controllers/RPTController.cs @@ -36,6 +36,8 @@ namespace AMESCoreStudio.Web.Controllers var sdate = ""; var edate = ""; + ViewBag.QueryDate = DateTime.Now.ToString("yyyy/MM"); + var model = await _rptApi.GetRPT001View(sdate, edate); // 異常工時 //var a = await _whsApi.GetExceptionWorktimeByQueryWHS009("", "", "", "", sdate: sdate, edate: edate); @@ -65,6 +67,9 @@ namespace AMESCoreStudio.Web.Controllers public async Task RPT001(string SerachData) { var Data = DateTime.Parse(SerachData); + + ViewBag.QueryDate = new DateTime(Data.Year, Data.Month, 1).ToString("yyyy/MM"); + var sDate = new DateTime(Data.Year, Data.Month, 1).ToString("yyyy/MM/dd"); var eDate = new DateTime(Data.Year, Data.Month, DateTime.DaysInMonth(Data.Year, Data.Month)).ToString("yyyy/MM/dd"); var model = await _rptApi.GetRPT001View(sDate, eDate); diff --git a/AMESCoreStudio.Web/Views/RPT/RPT001.cshtml b/AMESCoreStudio.Web/Views/RPT/RPT001.cshtml index fd7cdb3a..02e85ab4 100644 --- a/AMESCoreStudio.Web/Views/RPT/RPT001.cshtml +++ b/AMESCoreStudio.Web/Views/RPT/RPT001.cshtml @@ -75,7 +75,7 @@
- +