Commit e9d3fe84 by guanzhenshan

解决菜单删除了还是显示的问题,增加月度销售报表页面

parent b41bc649
...@@ -22,7 +22,7 @@ namespace Bailun.DC.Services ...@@ -22,7 +22,7 @@ namespace Bailun.DC.Services
join dc_menu_permission t2 on t1.id=t2.menuid and t2.delstatus=0 and t2.username='{username}' join dc_menu_permission t2 on t1.id=t2.menuid and t2.delstatus=0 and t2.username='{username}'
where t1.delstatus=0 where t1.delstatus=0
union all union all
select t1.id,t1.parentid,t1.icon,t1.`name`,t1.path,t1.sort from dc_menu t1 where 1 = (select isall from dc_menu_permission where username='{username}' and isall=1 and delstatus=0)) tb order by parentid,sort"; select t1.id,t1.parentid,t1.icon,t1.`name`,t1.path,t1.sort from dc_menu t1 where t1.delstatus=0 and 1 = (select isall from dc_menu_permission where username='{username}' and isall=1 and delstatus=0)) tb order by parentid,sort";
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString)) using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{ {
if (cn.State == System.Data.ConnectionState.Closed) if (cn.State == System.Data.ConnectionState.Closed)
......
...@@ -5533,9 +5533,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -5533,9 +5533,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="end">结束月份</param> /// <param name="end">结束月份</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public JsonResult ListMonthSaleProfit(string start, string end) public JsonResult ListMonthSaleProfit(string month)
{ {
var obj = new Services.FinanceReportServices().ListMonthSaleProfit(start, end);
var obj = new Services.FinanceReportServices().ListMonthSaleProfit(month, month);
......

@{
ViewData["Title"] = "月度销售利润报表";
Layout = "~/Pages/Shared/_MainLayout.cshtml";
ViewBag.Nav = new string[] { "财务报表", "月度销售利润报表" };
}
<div class="row">
<div class="col-sm-12">
<div class="ibox-content m-b-sm border-bottom">
<form id="toolbar">
<div class="form-inline" style="line-height:40px;">
<div class="form-group">
<label>请选择月份</label>
<input id="month" name="month" class="form-control" style="width:130px;" placeholder="年.月" />
</div>
<div class="form-group">
<label>&nbsp;</label>
<button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
<button type="button" class="btn btn-danger" onclick="exportxls();">导出</button>
</div>
</div>
</form>
</div>
<div class="ibox-contentc">
<table id="roletable"></table>
</div>
</div>
</div>
@section scripts{
<script type="text/javascript">
$(document).ready(function () {
laydate.render({ elem: '#month', type: 'month' });
})
function list() {
}
function exportxls() {
}
</script>
}
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