修复冗余报表排序不了的问题

Bailun.DC.Services/WareHouseServices.cs

@@ -441,6 +441,12 @@ namespace Bailun.DC.Services
                     sqlparam.Add("code", warehousecode);
                 }
 
+                if (!string.IsNullOrEmpty(request.sort))
+                {
+                    sql += " order by t1."+request.sort+" "+request.order;
+                }
+
+
                 var obj = cn.Page<dc_mid_warehouse_redundancy>(request.pageIndex, request.limit, sql, ref total,sqlparam);
 
                 return obj.AsList();

Bailun.DC.Web/Areas/Reports/Views/Warehouse/SkuRedundancy.cshtml

@@ -225,6 +225,7 @@
                                 for (var o in obj) {
                                     shtml += '<tr><td>' + obj[o].bailun_sku + '</td>';
                                     shtml += '<td>' + obj[o].productcount + '</td>';
+                                    shtml += '<td>' + obj[o].amount_total + '</td>';
                                     shtml += '<td>' + obj[o].yesterdaysale_count + '</td>';
                                     shtml += '<td>' + obj[o].yesterdaysale_amount + '</td>';
                                     shtml += '<td>' + obj[o].sale_3d_avg + '</td>';

Bailun.DC.Web/Areas/Reports/Views/Warehouse/WareHouseRedundancy.cshtml

@@ -80,82 +80,82 @@
             var columns = [
                 {
                     field: 'warehouse_name', title: '仓库名称', width: '190', sortable: false, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowSku(\'' + data.warehouse_code + '\',\'' + data.warehouse_name + '\')">' + data.warehouse_name + '</div>';
+                        return '<div  style="color:#7CABD9;cursor:pointer;" onclick="ShowSku(\'' + data.warehouse_code + '\',\'' + data.warehouse_name + '\')">' + data.warehouse_name + '</div>';
                     }
                 },
                 {
                     field: 'skucount', title: 'Sku总个数', width: '120', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'skucount\',\'Sku总个数\',\'' + data.warehouse_name + '\')" >' + data.skucount + '</div>';
+                        return '<div  style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'skucount\',\'Sku总个数\',\'' + data.warehouse_name + '\')" >' + data.skucount + '</div>';
                     }
                 },
                 {
                     field: 'productcount', title: '产品个数', width: '110', sortable: true, iscount: true, formatter: function (idx,data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'productcount\',\'产品个数\',\'' + data.warehouse_name + '\')" >' + data.productcount + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'productcount\',\'产品个数\',\'' + data.warehouse_name + '\')" >' + data.productcount + '</div>';
                     }
                 },
                 {
                     field: 'amount_total', title: '总金额', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'amount_total\',\'总金额\',\'' + data.warehouse_name + '\')" >' + data.amount_total + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'amount_total\',\'总金额\',\'' + data.warehouse_name + '\')" >' + data.amount_total + '</div>';
                     }
                 },
                 {
                     field: 'skusales_count', title: '日销sku个数', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'skusales_count\',\'日销sku个数\',\'' + data.warehouse_name + '\')" >' + data.skusales_count + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'skusales_count\',\'日销sku个数\',\'' + data.warehouse_name + '\')" >' + data.skusales_count + '</div>';
                     }
                 },
                 {
                     field: 'skusales_rate', title: '动销sku比例', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'skusales_rate\',\'动销sku比例\',\'' + data.warehouse_name + '\')" >' + data.skusales_rate + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'skusales_rate\',\'动销sku比例\',\'' + data.warehouse_name + '\')" >' + data.skusales_rate + '</div>';
                     }
                 },
                 {
                     field: 'daily_productsale_count', title: '日销产品个数', width: '150', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'daily_productsale_count\',\'日销产品个数\',\'' + data.warehouse_name + '\')" >' + data.daily_productsale_count + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'daily_productsale_count\',\'日销产品个数\',\'' + data.warehouse_name + '\')" >' + data.daily_productsale_count + '</div>';
                     }
                 },
                 {
                     field: 'productsale_rate', title: '动销产品比例', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'productsale_rate\',\'动销产品比例\',\'' + data.warehouse_name + '\')" >' + data.productsale_rate + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'productsale_rate\',\'动销产品比例\',\'' + data.warehouse_name + '\')" >' + data.productsale_rate + '</div>';
                     }
                 },
                 {
                     field: 'dailysale_amount', title: '日销金额', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'dailysale_amount\',\'日销金额\',\'' + data.warehouse_name + '\')" >' + data.dailysale_amount + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'dailysale_amount\',\'日销金额\',\'' + data.warehouse_name + '\')" >' + data.dailysale_amount + '</div>';
                     }
                 },
                 {
                     field: 'saleamount_rate', title: '动销金额比例', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'saleamount_rate\',\'动销金额比例\',\'' + data.warehouse_name + '\')" >' + data.saleamount_rate + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'saleamount_rate\',\'动销金额比例\',\'' + data.warehouse_name + '\')" >' + data.saleamount_rate + '</div>';
                     }
                 },
                 {
                     field: 'redundancy_sku_count', title: '冗余sku个数', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'redundancy_sku_count\',\'冗余sku个数\',\'' + data.warehouse_name + '\')" >' + data.redundancy_sku_count + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'redundancy_sku_count\',\'冗余sku个数\',\'' + data.warehouse_name + '\')" >' + data.redundancy_sku_count + '</div>';
                     }
                 },
                 {
                     field: 'redundancy_sku_rate', title: '冗余sku个数比例', width: '150', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'redundancy_sku_rate\',\'冗余sku个数比例\',\'' + data.warehouse_name + '\')" >' + data.redundancy_sku_rate + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'redundancy_sku_rate\',\'冗余sku个数比例\',\'' + data.warehouse_name + '\')" >' + data.redundancy_sku_rate + '</div>';
                     }
                 },
                 {
                     field: 'redundancy_product_count', title: '冗余产品个数', width: '120', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'redundancy_product_count\',\'冗余产品个数\',\'' + data.warehouse_name + '\')" >' + data.redundancy_product_count + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'redundancy_product_count\',\'冗余产品个数\',\'' + data.warehouse_name + '\')" >' + data.redundancy_product_count + '</div>';
                     }
                 },
                 {
                     field: 'redundancy_product_rate', title: '冗余产品个数比例', width: '150', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'redundancy_product_rate\',\'冗余产品个数比例\',\'' + data.warehouse_name + '\')" >' + data.redundancy_product_rate + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'redundancy_product_rate\',\'冗余产品个数比例\',\'' + data.warehouse_name + '\')" >' + data.redundancy_product_rate + '</div>';
                     }
                 },
                 {
                     field: 'redundancy_amount', title: '冗余金额', width: '100', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'redundancy_amount\',\'冗余金额\',\'' + data.warehouse_name + '\')" >' + data.redundancy_amount + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'redundancy_amount\',\'冗余金额\',\'' + data.warehouse_name + '\')" >' + data.redundancy_amount + '</div>';
                     }
                 },
                 {
                     field: 'redundancy_amount_rate', title: '冗余金额比例', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return '<div onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'redundancy_amount_rate\',\'冗余金额比例\',\'' + data.warehouse_name + '\')" >' + data.redundancy_amount_rate + '</div>';
+                        return '<div style="cursor:pointer;" onclick="ShowHistoryData(\'' + data.warehouse_code + '\',\'redundancy_amount_rate\',\'冗余金额比例\',\'' + data.warehouse_name + '\')" >' + data.redundancy_amount_rate + '</div>';
                     }
                 },
             ];