Skip to content

D
DataCenter_Core2.1_20190520
Commit 3af74199 by guanzhenshan
Options

订单数据增加公司id过滤

parent 04fc998f
Showing with 21 additions and 8 deletions
Bailun.DC.Web/Controllers/ApiController.cs
...@@ -115,10 +115,10 @@ namespace Bailun.DC.Web.Controllers ...@@ -115,10 +115,10 @@ namespace Bailun.DC.Web.Controllers
/// <param name="end">结束时间</param> /// <param name="end">结束时间</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public JsonResult ListPlatformSkuSales(int page, int pagesize, DateTime? start, DateTime? end,string platform) public JsonResult ListPlatformSkuSales(int page, int pagesize, DateTime? start, DateTime? end,string platform,int companyid)
{ {
var total = 0; var total = 0;
var obj = new Services.OrdersServices().ListOrderPlatformSku(page, pagesize, start, end,platform, ref total); var obj = new Services.OrdersServices().ListOrderPlatformSku(page, pagesize, start, end,platform,companyid, ref total);
var list = obj.Select(a => new { var list = obj.Select(a => new {
a.origin_order_id, //平台订单号 a.origin_order_id, //平台订单号
...@@ -166,9 +166,9 @@ namespace Bailun.DC.Web.Controllers ...@@ -166,9 +166,9 @@ namespace Bailun.DC.Web.Controllers
/// <param name="end">结束时间</param> /// <param name="end">结束时间</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public JsonResult ListSalerProfit(DateTime? start, DateTime? end) public JsonResult ListSalerProfit(DateTime? start, DateTime? end,int companyid)
{ {
var list = new Services.OrdersServices().ListSalerProfit(start, end); var list = new Services.OrdersServices().ListSalerProfit(start, end,companyid);
return Json(list); return Json(list);
} }
......
Bailun.DC.Web/Pages/Index.cshtml
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<script src="css/hplus/js/jquery.min.js?v=2.1.4"></script> <script src="css/hplus/js/jquery.min.js?v=2.1.4"></script>
<script src="~/js/jquery.cookie.js" type="text/javascript"></script> <script src="~/js/jquery.cookie.js" type="text/javascript"></script>
<script src="~/js/common.js?20190606001" type="text/javascript"></script> <script src="~/js/common.js?20190609001" type="text/javascript"></script>
</head> </head>
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden"> <body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
......
Bailun.DC.Web/Startup.cs
...@@ -7,6 +7,7 @@ using Bailun.ServiceFabric.Extension; ...@@ -7,6 +7,7 @@ using Bailun.ServiceFabric.Extension;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
...@@ -34,11 +35,18 @@ namespace Bailun.DC.Web ...@@ -34,11 +35,18 @@ namespace Bailun.DC.Web
options.MinimumSameSitePolicy = SameSiteMode.None; options.MinimumSameSitePolicy = SameSiteMode.None;
}); });
services.Configure<FormOptions>(options =>
{
options.ValueLengthLimit = 1024 * 1024 * 100;
options.ValueCountLimit = int.MaxValue;
});
//עsession //עsession
//services.AddSession(); //services.AddSession();
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1); services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>(); services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
......
Bailun.DC.Web/wwwroot/js/common.js
...@@ -10,6 +10,12 @@ function OnlyTable(tableId, aoColumn, actionUrl, serverParams,tbParams,dataParam ...@@ -10,6 +10,12 @@ function OnlyTable(tableId, aoColumn, actionUrl, serverParams,tbParams,dataParam
$btTable.bootstrapTable({ $btTable.bootstrapTable({
url: actionUrl, url: actionUrl,
//toolbar: "#toolbar", //toolbar: "#toolbar",
ajaxOptions:{
beforeSend: function (xhr) {
xhr.setRequestHeader('Authorization', $.cookie("token"))
}
},
sidePagination: "server",//设置在哪进行分页，默认”client”，可选”server”，如果设置 “server”，则必须设置url或者重写ajax方法 sidePagination: "server",//设置在哪进行分页，默认”client”，可选”server”，如果设置 “server”，则必须设置url或者重写ajax方法
pagination: true,//底部工具栏是否显示分页条 pagination: true,//底部工具栏是否显示分页条
striped: true,//是否显示列表背景色 striped: true,//是否显示列表背景色
...@@ -211,14 +217,12 @@ $.submit = function (data) { ...@@ -211,14 +217,12 @@ $.submit = function (data) {
url: data.url, url: data.url,
type: data.type||'GET', type: data.type||'GET',
data: data.paramData, data: data.paramData,
headers: { Authorization: $.cookie("token")},
beforeSend: function (request) { beforeSend: function (request) {
if (!data.noloading) if (!data.noloading)
{ {
//load_index = layer.load(); //load_index = layer.load();
} }
request.setRequestHeader("Authorization", $.cookie("token"));
}, },
success: function (result) { success: function (result) {
try { try {
...@@ -305,6 +309,7 @@ function login() { ...@@ -305,6 +309,7 @@ function login() {
if (token != '') { if (token != '') {
$.cookie('token', token, { expires: 1 }); $.cookie('token', token, { expires: 1 });
window.location = baseUrl;
} }
else { else {
token = $.cookie('token'); token = $.cookie('token');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment