1

Bailun.DC.LogicWareHouse/Program.cs

@@ -20,8 +20,6 @@ namespace Bailun.DC.LogicWareHouse
 
         //static void Main(string[] args)
         //{
-        //    //Console.WriteLine("Hello World!");
-
         //    new Services().Save();
         //}
     }

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

@@ -196,9 +196,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <param name="website">站点</param>
         /// <param name="start">付款开始时间</param>
         /// <param name="end">付款结束时间</param>
+        /// <param name="currency">币种</param>
         /// <returns></returns>
         [BailunAuthentication(LoginMode.Enforce)]
-        public string ListAmazonSaleStatisticsJson(BtTableParameter parameter, string sellaccount, string website, DateTime start, DateTime end,string warehousetype, string warehousecode,string skucategoryids)
+        public string ListAmazonSaleStatisticsJson(BtTableParameter parameter, string sellaccount, string website, DateTime start, DateTime end,string warehousetype, string warehousecode,string skucategoryids,string currency)
         {
             var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
 

Bailun.DC.Web/Areas/Reports/Views/Orders/AmazonSaleStatistics.cshtml

@@ -22,6 +22,13 @@
                                 <button type="button" class="btn btn-success" onclick="showleft();">分类筛选</button>
                             </div>
                             <div class="form-group">
+                                <label>币种</label>
+                                <select id="currency" name="currency" class="form-control">
+                                    <option value="CNY">人民币</option>
+                                    <option value="USD">美元</option>
+                                </select>
+                            </div>
+                            <div class="form-group">
                                 <label>&nbsp;</label>
                                 <select id="warehousetype" name="warehousetype" class="form-control">
                                     <option value="">请选择仓库类型</option>

Bailun.DC.Web/Areas/Reports/Views/Orders/ListReturn.cshtml

@@ -80,6 +80,8 @@
             var height = document.body.clientHeight;
             $("#roletable").attr("data-height", (height - 170));
 
+            list();
+
             listPlatform();
 
             $('#platform').change(function () {
@@ -149,6 +151,9 @@
                         for (var i = 0; i < result.length; i++) {
                             $('#platform').append('<option value="' + result[i] + '">' + result[i]+'</option>');
                         }
+
+                        $('#platform').val('@ViewBag.platform');
+
                     }
                 }
             })