Skip to content

D
DataCenter_Core2.1_20190520
Commit 31e88d9c by guanzhenshan
Options

解决登录问题

parent 89a2c4f3
Showing with 28 additions and 4 deletions
Bailun.DC.Web/Areas/Reports/Controllers/WarehouseController.cs
......@@ -35,6 +35,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <returns></returns>
public ActionResult LogicWarehouse()
{
ViewBag.EndDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).AddSeconds(-1).ToString("yyyy-MM-dd HH:mm:ss");
ViewBag.StartOneDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
ViewBag.StartSevenDate = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd");
ViewBag.StartFourteenDate = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
ViewBag.StartThirtyDate = DateTime.Now.AddDays(-30).ToString("yyyy-MM-dd");
return View();
}
......
Bailun.DC.Web/Areas/Reports/Views/Warehouse/LogicWarehouse.cshtml
......@@ -133,7 +133,7 @@
}
},
{ field: 'oneday_total_sales', title: '昨日总销量', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
return data.oneday_total_sales + '<img src="@Url.Content("~/img/icon-trendchart.png")" title="昨日总销量趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'昨日总销量\',\'oneday_total_sales\',\'' + data.warehouse_name + '\');" />';
return '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '昨日总销量' + '\',1,\'' + data.warehouse_code + '\')">' + data.oneday_total_sales + '</a><img src="@Url.Content("~/img/icon-trendchart.png")" title="昨日总销量趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'昨日总销量\',\'oneday_total_sales\',\'' + data.warehouse_name + '\');" />';
}
},
{
......@@ -258,6 +258,23 @@
layer_show(name + '现金流明细', 'http://aims.bailuntec.com/view/reports/cash-flow-sku.html?warehouse_code=' + code,'90%','90%');
}
function ShowOrderList(name,t,warehousecode) {
var start = '@(ViewBag.StartOneDate)';
var end = '@(ViewBag.EndDate)';
if (t == 7) {
start = '@(ViewBag.StartSevenDate)';
}
else if (t == 14) {
end = '@(ViewBag.StartFourteenDate)';
}
else if (t == 30) {
end = '@(ViewBag.StartThirtyDate)';
}
layer_show(name + "的订单明细", 'http://oms.bailuntec.com/#/bailun-order/all-orders?baseQueryKey=SkuNo_Accurate&dateType=payTime&daterange=' + start + '&daterange=' + end + '&wareNo=' + warehousecode + '&orderStatus=0&orderStatus=1&orderStatus=3', '90%', '90%');
}
</script>
}
......
Bailun.DC.Web/Pages/Index.cshtml
......@@ -29,8 +29,8 @@
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
<script type="text/javascript">
login_localhost();
//login();
//login_localhost();
login();
window.location = "@Url.Content("~/Home/Main")";
</script>
</body>
......
Bailun.DC.Web/wwwroot/js/common.js
var baseUrl = 'http://localhost:59628/';//'http://data.bailuntec.com'; //
var baseUrl = 'http://data.bailuntec.com'; //'http://localhost:59628/';//
var globalOrderSort='';
var globalOrderType = '';
......
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