diff --git a/YLErpWeb/Controllers/SwapTrade2Controller.cs b/YLErpWeb/Controllers/SwapTrade2Controller.cs index 3eceef63..d882d4ec 100644 --- a/YLErpWeb/Controllers/SwapTrade2Controller.cs +++ b/YLErpWeb/Controllers/SwapTrade2Controller.cs @@ -67,7 +67,7 @@ namespace YLErp.Web.Controllers { TradeType = "收益互换", UnderlyingInstrumentType = "Stock", - StartDate = QdpCalendarHelper.GetNonHoliday(valuedateBLL.ValueDate, tradeDateCountry), + StartDate = QdpCalendarHelper.GetNonHoliday(valuedateBLL.ValueDate), TradeDate = QdpCalendarHelper.GetNonHolidayDefore(valuedateBLL.ValueDate.AddDays(-1), tradeDateCountry), TraderId = CurUser.UserId, TraderName = CurUser.UserName, diff --git a/YLErpWeb/wwwroot/Scripts/base/ylotc.calendar.js b/YLErpWeb/wwwroot/Scripts/base/ylotc.calendar.js index a726787b..53a68fdf 100644 --- a/YLErpWeb/wwwroot/Scripts/base/ylotc.calendar.js +++ b/YLErpWeb/wwwroot/Scripts/base/ylotc.calendar.js @@ -13,7 +13,7 @@ ylotc.isHoliday = function (date) { return false; } var y = date.getFullYear().toString(); - var holidays = ylotc.calendar[y + "ib"] || ylotc.calendar[y]; + var holidays = ylotc.calendar[y]; if (Array.isArray(holidays)) { var d = date.getDate(); var m = date.getMonth() + 1;//js月份从0开始