Commit 6846f906 by guanzhenshan

更改主题样式

parent f7d34beb
...@@ -182,10 +182,10 @@ namespace Bailun.DC.HappenAmount ...@@ -182,10 +182,10 @@ namespace Bailun.DC.HappenAmount
//已付款 //已付款
m.tl_amount_pay = m.hl_amount_pay; m.tl_amount_pay = m.hl_amount_pay;
//发生额 //发生额
sqlhappen = $@"select sum(t2.cost_logistics*t1.quantity_shipped) from dc_base_oms_pick t1 sqlhappen = $@"select sum(t2.cost_logistics*t1.quantity_shipped) from dc_base_oms_pick t1
join dc_base_oms_sku t2 on t1.bailun_sku = t2.bailun_sku and t1.origin_order_id = t2.origin_order_id and t2.bailun_order_status != 'Canceled' and t2.has_scalp = 0 and t2.has_delete = 0 and t2.has_innersale = 0 and t2.company_id = 1 and t2.cost_logistics > 0 join dc_base_oms_sku t2 on t1.bailun_sku = t2.bailun_sku and t1.origin_order_id = t2.origin_order_id and t2.bailun_order_status != 'CantHandle' and t2.bailun_order_status != 'Canceled' and t2.has_scalp = 0 and t2.has_delete = 0 and t2.has_innersale = 0 and t2.bailun_interception_status in ('None', 'Failed') and t2.company_id = 1 and t2.cost_logistics > 0
where t1.shipping_time >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.shipping_time < '{end.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.has_delete = 0 and t1.company_id = 1 and t1.shipping_status = 'TotalShipping'"; where t1.shipping_time >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.shipping_time < '{end.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.has_delete = 0 and t1.company_id = 1 and t1.shipping_status = 'TotalShipping'";
m.tl_amount_happen += cn.QueryFirstOrDefault<decimal?>(sqlhappen,null,null,2*60)??0; m.tl_amount_happen += cn.QueryFirstOrDefault<decimal?>(sqlhappen,null,null,2*60)??0;
......
...@@ -24,14 +24,14 @@ ...@@ -24,14 +24,14 @@
<link href="/css/hplus/css/bootstrap.min14ed.css?v=3.3.6" rel="stylesheet"> <link href="/css/hplus/css/bootstrap.min14ed.css?v=3.3.6" rel="stylesheet">
<link href="/css/hplus/css/font-awesome.min93e3.css?v=4.4.0" rel="stylesheet"> <link href="/css/hplus/css/font-awesome.min93e3.css?v=4.4.0" rel="stylesheet">
<link href="/css/hplus/css/animate.min.css" rel="stylesheet"> <link href="/css/hplus/css/animate.min.css" rel="stylesheet">
<link href="/css/hplus/css/style.min862f.css?v=4.1.0" rel="stylesheet"> <link href="/css/hplus/css/style.min.css?v=4.2.0" rel="stylesheet">
<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?20200220001" type="text/javascript"></script> <script src="/js/common.js?20200220001" 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 white-bg" style="overflow:hidden">
@if (ViewBag.companyid == -1) @if (ViewBag.companyid == -1)
{ {
<script type="text/javascript"> <script type="text/javascript">
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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