增加日期筛选

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

@@ -6805,7 +6805,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             return View();
         }
 
-        public ActionResult ExportTotalIncomePay_PayDetail(DateTime date, int t)
+        public ActionResult ExportTotalIncomePay_PayDetail(DateTime start,DateTime end, int t)
         {
             //支出包含两部分，一部分是百伦管理费，一部分是产品成本支出
             //管理成本  广州百伦、香港百伦、电子服装厂、阳山仓、深圳仓的管理成本
@@ -6813,9 +6813,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             var cwurl = "http://cw.bailuntec.com/api/api/GetRepayPlanDetails?";
             var lgurl = "http://api.fee.bailuntec.com/fee/api/cost/api/logisticsCostList?";
 
-            url += "&startDate=" + date.ToString("yyyy-MM-dd") + "&endDate=" + date.ToString("yyyy-MM-dd");
-            cwurl += "BeginRepayTime=" + date.ToString("yyyy-MM-dd") + "&EndRepayTime=" + date.ToString("yyyy-MM-dd");
-            lgurl += "startDate=" + date.ToString("yyyy-MM-dd") + "&endDate=" + date.ToString("yyyy-MM-dd");
+            url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.ToString("yyyy-MM-dd");
+            cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd") + "&EndRepayTime=" + end.ToString("yyyy-MM-dd");
+            lgurl += "startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.ToString("yyyy-MM-dd");
 
             
 
@@ -6857,7 +6857,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 }
 
                 var guid = Guid.NewGuid().ToString();
-                var filename = date.ToString("yyyy-MM-dd")+" 现金流量表-管理成本支出";
+                var filename = start.ToString("yyyy-MM-dd")+"至"+ end.ToString("yyyy-MM-dd") + " 现金流量表-管理成本支出";
                 var filepath = _hostingEnvironment.WebRootPath + "\\Files\\Report\\" + DateTime.Now.ToString("yyyy-MM-dd") + "\\";
                 ToCSV(listval, colNames, guid, filepath);
 
@@ -6888,7 +6888,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 }
 
                 var guid = Guid.NewGuid().ToString();
-                var filename = date.ToString("yyyy-MM-dd") + " 现金流量表-利息成本支出";
+                var filename = start.ToString("yyyy-MM-dd") + "至" + end.ToString("yyyy-MM-dd") + " 现金流量表-利息成本支出";
                 var filepath = _hostingEnvironment.WebRootPath + "\\Files\\Report\\" + DateTime.Now.ToString("yyyy-MM-dd") + "\\";
                 ToCSV(listval, colNames, guid, filepath);
 
@@ -6917,7 +6917,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 }
 
                 var guid = Guid.NewGuid().ToString();
-                var filename = date.ToString("yyyy-MM-dd") + " 现金流量表-物流费支出";
+                var filename = start.ToString("yyyy-MM-dd") + "至" + end.ToString("yyyy-MM-dd") + " 现金流量表-物流费支出";
                 var filepath = _hostingEnvironment.WebRootPath + "\\Files\\Report\\" + DateTime.Now.ToString("yyyy-MM-dd") + "\\";
                 ToCSV(listval, colNames, guid, filepath);
 
@@ -6934,7 +6934,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             }
             else if (t == 4) //采购成本
             {
-                var listpurchase = new Services.FinanceReportServices().ListPurchaseCost(date, date);
+                var listpurchase = new Services.FinanceReportServices().ListPurchaseCost(start, end);
 
                 var colNames = new List<string>() { "出纳单编号", "申请标题", "费用大类", "公司主体名称", "金额", "出纳时间" };
 
@@ -6948,7 +6948,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 }
 
                 var guid = Guid.NewGuid().ToString();
-                var filename = date.ToString("yyyy-MM-dd") + " 现金流量表-采购成本支出";
+                var filename = start.ToString("yyyy-MM-dd") + "至" + end.ToString("yyyy-MM-dd") + " 现金流量表-采购成本支出";
                 var filepath = _hostingEnvironment.WebRootPath + "\\Files\\Report\\" + DateTime.Now.ToString("yyyy-MM-dd") + "\\";
                 ToCSV(listval, colNames, guid, filepath);
 

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

@@ -10,6 +10,11 @@
             <form id="toolbar">
                 <div class="form-inline" style="line-height:40px;">
                     <div class="form-group">
+                        <label>日期</label>
+                        <input id="start" name="start" class="form-control layer-date" style="width:120px;" value="@(ViewBag.date)" placeholder="请填写开始日期" />
+                        <input id="end" name="end" class="form-control layer-date" style="width:120px;" value="@(ViewBag.date)" placeholder="请填写结束日期" />
+                    </div>
+                    <div class="form-group">
                         <label>&nbsp;</label>
                         <button id="btnexport" type="button" class="btn btn-success" onclick="exportlist(1);">导出管理成本支出</button>
                         <button id="btnexport" type="button" class="btn btn-primary" onclick="exportlist(2);">导出利息支出</button>
@@ -25,9 +30,27 @@
 @section scripts{ 
     <script>
 
+        $(document).ready(function () {
+            laydate.render({ elem: '#start' });
+            laydate.render({ elem: '#end' });
+        })
+
         function exportlist (t)
         {
-            var url = '@Url.Content("~/Reports/Finance/ExportTotalIncomePay_PayDetail?date="+ ViewBag.date)&t=' + t;
+            var start = $('#start').val();
+            var end = $('#end').val();
+
+            if (start == '') {
+                alert('请选择开始日期');
+                return false;
+            }
+
+            if (end == '') {
+                alert('请选择结束日期');
+                return false;
+            }
+
+            var url = '@Url.Content("~/Reports/Finance/ExportTotalIncomePay_PayDetail?t=")' + t+'&start='+;
 
             window.open(url, '_blank');
         }