产品类型筛选改为多选

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

@@ -1549,7 +1549,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <returns></returns>
         [BailunAuthentication(LoginMode.Enforce)]
         [HttpPost]
-        public JsonResult PlatformProfitCountJson(string platform,string website, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, string currency, string skucategoryids,int? producttype,int? skusource,int? shippingstrategy)
+        public JsonResult PlatformProfitCountJson(string platform,string website, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, string currency, string skucategoryids,string product_type,int? skusource,int? shippingstrategy)
         {
             var _service = new Services.OrdersServices();
             var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
@@ -1590,8 +1590,16 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     "CrediteBayStores"
                 };
 
+            var producttype = new int[] { };
+
+            if (!string.IsNullOrEmpty(product_type))
+            {
+                producttype = product_type.Split(",").Where(a => !string.IsNullOrEmpty(a)).Select(b => int.Parse(b)).ToArray();
+            }
+            
+
             //Add by Allan at 20200320，for 增加sku级别的利润统计
-            if (producttype.HasValue || skusource.HasValue || shippingstrategy.HasValue)
+            if (producttype.Length>0 || skusource.HasValue || shippingstrategy.HasValue)
             {
 
                 if (shipstart.HasValue || shipend.HasValue)

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

@@ -58,8 +58,8 @@
                             </div>
                             <div class="form-group">
                                 <label>产品类型</label>
-                                <select id="producttype" name="producttype" class="form-control">
-                                    <option value="">选择产品类型</option>
+                                <select id="producttype" name="producttype" class="form-control"  multiple="multiple">
+                                    @*<option value="">选择产品类型</option>*@
                                     @if (ViewBag.listSkuType.Count > 0)
                                     {
                                         foreach (var item in ViewBag.listSkuType)
@@ -140,6 +140,7 @@
 </div>
 @section css{
     <link href="~/css/zTreeStyle/zTreeStyle.css" rel="stylesheet" type="text/css" />
+    <link href="~/js/yselect/yselect.css" rel="stylesheet" />
     <style>
         .mules {
             white-space: nowrap;
@@ -175,6 +176,7 @@
     <script src="~/js/jquery.ztree.core.min.js"></script>
     <script src="~/js/jquery.ztree.excheck.min.js"></script>
     <script src="~/js/jquery.tablesorter.min.js" type="text/javascript"></script>
+    <script src="~/js/yselect/yselect.js"></script>
     <script type="text/javascript">
         var tb;
         $(document).ready(function () {
@@ -195,9 +197,23 @@
             $('#platform').change(function () {
                 listwebsite();
             })
+
+            $('#producttype').ySelect(
+                {
+                    placeholder: '请选择产品类型',
+                    searchText: '搜索',
+                    showSearch: false,
+                    numDisplayed: 10,
+                    overflowText: '已选中 {n}项'
+                }
+            );
+            
         })
 
         function list() {
+
+            var producttype = $("#producttype").ySelectedValues(",");
+            
             var shipstart = $('#shipstart').val();
             var shipend = $('#shipend').val();
             var start = $('#start').val();
@@ -224,7 +240,7 @@
             $.submit({
                 type:'POST',
                 url: '@Url.Content("~/Reports/Orders/PlatformProfitCountJson")',
-                paramData: $("#toolbar").serialize() + '&skucategoryids=' + s,
+                paramData: $("#toolbar").serialize() + '&skucategoryids=' + s + '&product_type=' + producttype,
                 func: function (result) {
                     layer.close(lindex);
                     if (result && result.length > 0) {

Bailun.DC.Web/wwwroot/js/yselect/yselect.css

+.fs-wrap {
+    position: relative;
+    display: inline-block;
+    width: 200px;
+    margin: 3px;
+    font-size: 12px;
+    line-height: 1;
+}
+
+.fs-label-wrap {
+    position: relative;
+    border: 1px solid #ccc;
+    cursor: default;
+    color: #555;
+    border-radius: 4px;
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+    height: 32px;
+    margin-top: 3px;
+}
+
+.fs-label-wrap,
+.fs-dropdown {
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+    .fs-label-wrap .fs-label {
+        padding: 4px 22px 4px 8px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        cursor: pointer;
+    }
+
+.fs-label {
+    position: relative;
+    top: 5px;
+}
+.fs-arrow {
+    width: 0;
+    height: 0;
+    border-left: 4px solid transparent;
+    border-right: 4px solid transparent;
+    border-top: 6px solid #000;
+    position: absolute;
+    top: 0;
+    right: 4px;
+    bottom: 0;
+    margin: auto;
+    cursor: pointer;
+}
+
+.fs-dropdown {
+    position: absolute;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    /*margin-top: 2px;*/
+    width: 100%;
+    z-index: 1000;
+    border-radius: 4px;
+}
+
+    .fs-dropdown .fs-options {
+        max-height: 200px;
+        overflow: auto;
+    }
+
+.fs-search input {
+    width: 90%;
+    padding: 2px 4px;
+    border: 0;
+}
+
+.fs-selectAll {
+    float: right;
+    cursor: pointer;
+    margin-top: 4px;
+    height: auto;
+}
+
+    .fs-selectAll.selected {
+        float: right;
+        cursor: pointer;
+        margin-top: 4px;
+        height: auto;
+        color: green;
+    }
+
+    .fs-selectAll:hover {
+        background-color: #eee;
+    }
+
+.fs-option,
+.fs-search,
+.fs-optgroup-label {
+    padding: 8px 8px;
+    border-bottom: 1px solid #eee;
+    cursor: default;
+}
+
+.fs-option {
+    cursor: pointer;
+}
+
+    .fs-option.hl {
+        background-color: #f5f5f5;
+    }
+
+.fs-wrap.multiple .fs-option {
+    position: relative;
+    padding-left: 30px;
+}
+
+.fs-wrap.multiple .fs-checkbox {
+    position: absolute;
+    display: block;
+    width: 30px;
+    top: 0;
+    left: 0;
+    bottom: 0;
+}
+
+.fs-wrap.multiple .fs-option .fs-checkbox i {
+    position: absolute;
+    margin: auto;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    width: 14px;
+    height: 14px;
+    border: 1px solid #aeaeae;
+    border-radius: 4px;
+    background-color: #fff;
+}
+
+.fs-wrap.multiple .fs-option.selected .fs-checkbox i {
+    background-color: rgb(17, 169, 17);
+    border-color: transparent;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAGCAYAAAD+Bd/7AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNXG14zYAAABMSURBVAiZfc0xDkAAFIPhd2Kr1WRjcAExuIgzGUTIZ/AkImjSofnbNBAfHvzAHjOKNzhiQ42IDFXCDivaaxAJd0xYshT3QqBxqnxeHvhunpu23xnmAAAAAElFTkSuQmCC');
+    background-repeat: no-repeat;
+    background-position: center;
+}
+
+
+.fs-wrap .fs-option:hover {
+    /*background-color: #f5f5f5;*/
+    background: #D1F3E5;
+    border-radius: 4px;
+    margin-left: 0px;
+    margin-right: 2px;
+}
+
+.fs-optgroup-label {
+    font-weight: bold;
+}
+
+.hidden {
+    display: none;
+}
+
+.fs-options::-webkit-scrollbar {
+    width: 6px;
+}
+
+.fs-options::-webkit-scrollbar-track {
+    -webkit-border-radius: 2em;
+    -moz-border-radius: 2em;
+    border-radius: 2em;
+    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    background: rgba(0,0,0,0.1);
+}
+
+.fs-options::-webkit-scrollbar-thumb {
+    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    background: rgba(0,0,0,0.2);
+    -webkit-border-radius: 2em;
+    -moz-border-radius: 2em;
+    border-radius: 2em;
+}