月销售利润报表增加导出功能

Bailun.DC.Models/Common/KeyValue.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models.Common
+{
+    public class KeyValue
+    {
+
+        public string Key { get; set; }
+
+        public string Value { get; set; }
+    }
+}

Bailun.DC.Services/FinanceReportServices.cs

@@ -5530,8 +5530,8 @@ group by currency";
                 obj.fee_platform_and_refund = obj.fee_platform + obj.fee_fba + obj.fee_refund+obj.fee_ad;
                 sql_update += " ,fee_platform_and_refund=" + obj.fee_platform_and_refund;
 
-                //物流仓储费用 = 头程运输+直邮物流费+海外仓仓储+海外仓杂费
-                obj.fee_logistics_storage = obj.fee_logistics_first + obj.fee_logistics_direct + obj.fee_storage+ obj.fee_storage_incidentals;
+                //物流仓储费用 = 头程运输+直邮物流费+尾程物流费+海外仓仓储+海外仓杂费
+                obj.fee_logistics_storage = obj.fee_logistics_first + obj.fee_logistics_direct+obj.fee_logistics_tail + obj.fee_storage+ obj.fee_storage_incidentals;
                 sql_update += " ,fee_logistics_storage=" + obj.fee_logistics_storage;
 
                 //销售费用合计=平台扣费及退款+物流仓储费用+付现销售费用

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

@@ -20,7 +20,7 @@
                     <div class="form-group">
                         <label>&nbsp;</label>
                         <button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
-                        @*<button type="button" class="btn btn-danger" onclick="exportxls();">导出</button>*@
+                        <button type="button" class="btn btn-danger" onclick="exportxls();">导出</button>
                     </div>
                 </div>
             </form>
@@ -231,6 +231,16 @@
             layer_show(mon + ' ' + name + "的明细", '@Url.Content("~/Reports/Finance/MonthSaleProfitDetails")' + '?month=' + mon + '&col=' + col + '&colname=' + name, '95%', '95%');
         }
 
+        function exportxls() {
+            var mon = $('#month').val();
+            if (mon == '') {
+                alert('请选择月份');
+                return;
+            }
+
+            window.open('@Url.Content("~/Reports/Finance/ExportMonthSaleProfitNew?month=")' + mon, '_blank');
+        }
+
         function clearHtml(s) {
             // 去除 富文本格式
             s = s.replace(/(\n)/g, "");