资产负债表支持按月维度，按周维度选择日期查看历史数据

Bailun.DC.Services/FinanceReportServices.cs

@@ -7705,7 +7705,6 @@ group by currency";
 
         #endregion
 
-
         #region 4k资产负债表
 
         /// <summary>

Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs

@@ -53,7 +53,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             if (type == 2) //按周
             {
-                date = date.AddDays(-1);
+                if(day.HasValue)  //Add by Allan at 20210429，按周也可以选择日期进行查看
+                {
+                    date = day.Value;
+                }
+                else
+                {
+                    date = date.AddDays(-1);
+                }
+
 
                 if (date.DayOfWeek == DayOfWeek.Saturday)
                 {
@@ -82,6 +90,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             }
             else if (type == 3) //按月
             {
+                if(day.HasValue)  //Add by Allan at 20210429，for 月份也可选择日期进行查看
+                {
+                    date = day.Value;
+                }
+
                 if (date.AddDays(1).ToString("yyyy-MM") == date.ToString("yyyy-MM"))
                 {
                     date = DateTime.Parse(date.ToString("yyyy-MM") + "-01").AddDays(-1);

Bailun.DC.Web/Areas/Reports/Views/Finance/Index2.cshtml

@@ -23,7 +23,7 @@
                             <option value="1">按日的方式</option>
                         </select>
                         @*<label>日期</label>*@
-                        <input id="day" type="text" style="width:120px;display:none;" value="@DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")" class="form-control" />
+                        <input id="day" type="text" style="width:120px;" value="@DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")" class="form-control" />
                         <label>付款主体</label>
                         <select id="sel_paycompany" class="form-control" style="width:200px;">
                             <option value="0">百伦供应链</option>
@@ -1463,14 +1463,14 @@
             init();
             //list();
 
-            $('#timetype').change(function () {
-                if ($('#timetype').val() == 1) {
-                    $('#day').show();
-                }
-                else {
-                    $('#day').hide();
-                }
-            })
+            //$('#timetype').change(function () {
+            //    if ($('#timetype').val() == 1) {
+            //        $('#day').show();
+            //    }
+            //    else {
+            //        $('#day').hide();
+            //    }
+            //})
 
         })