Skip to content

D
DataCenter_Core2.1_20190520
Commit aa6f7c90 by guanzhenshan
Options

新月销售利润报表增加修改说明，明细的功能

parent dd0e53eb
Showing with 62 additions and 14 deletions
Bailun.DC.Models/dc_month_sale_profit_details.cs
......@@ -83,6 +83,10 @@ namespace Bailun.DC.Models
/// 是否已删除 1：已删除，0：未删除
/// </summary>
public int delstatus { get; set; }
/// <summary>
/// 是否新销售利润报表的明细，1：是，0：否（旧的）
/// </summary>
public int? isnew { get; set; }
}
}
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
......@@ -8757,12 +8757,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// 月销售利润明细
/// </summary>
/// <returns></returns>
public ActionResult MonthSaleProfitDetails(string month,string col,string colname)
public ActionResult MonthSaleProfitDetails(string month,string col,string colname,int? isnew)
{
ViewBag.month = month;
ViewBag.col = col;
ViewBag.colname = colname;
ViewBag.isnew = (isnew ?? 0);
return View();
}
......@@ -8774,14 +8776,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="col">列名</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
public string ListMonthSaleProfitDetailJson(BtTableParameter parameter, string month, string col)
public string ListMonthSaleProfitDetailJson(BtTableParameter parameter, string month, string col,int? isnew)
{
var user = HttpContextHelper.Current?.User;
var total = 0;
var _service = new Services.FinanceReportServices();
var obj = _service.ListMonthSaleProfitDetail(parameter, month, col, ref total);
var objCount = _service.ListMonthSaleProfitDetailCount(month, col);
var obj = _service.ListMonthSaleProfitDetail(parameter, month, col, ref total,(isnew??0));
var objCount = _service.ListMonthSaleProfitDetailCount(month, col, (isnew ?? 0));
var list = obj.Select(a => new {
a.id,
......@@ -8818,7 +8820,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="uid"></param>
/// <param name="username"></param>
/// <returns></returns>
public JsonResult UploadMonthSaleProfitDetail(string month,string col,string colname,int uid,string username)
public JsonResult UploadMonthSaleProfitDetail(string month,string col,string colname,int uid,string username, int? isnew)
{
if (Request.Form.Files.Count == 0)
{
......@@ -8859,7 +8861,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
month = month,
colval = col,
colname = colname
colname = colname,
isnew = (isnew??0)
});
}
}
......@@ -8971,7 +8974,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
try
{
var obj = _service.ListMonthSaleProfitNew(month, "");
//var objDescription = _service.ListMonthSaleProfitDescription(month, "");
var objDescription = _service.ListMonthSaleProfitNewDescription(month, "");
var list = obj.Select(a => new
......@@ -9278,7 +9281,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
data = list.Where(a => a.isedit == 0).ToList(),
listEdit = list.Where(a => a.isedit == 1).ToList(),
head = listHead,
listCount = objCount
listCount = objCount,
listdesc = objDescription
});
}
catch (Exception ex)
......@@ -9597,6 +9601,25 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
/// <summary>
/// 更新月度销售利润报表的取数描述
/// </summary>
/// <param name="m"></param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
public JsonResult UpdateMonthSalesProfitDescription(mMonthSalesProfitDesc_Input m)
{
var user = HttpContextHelper.Current?.User;
var obj = new Services.FinanceReportServices().SaveMonthSaleProfitNewDescription(m, user != null ? user.GetUid() : 0, user != null ? user.GetUserName() : "");
return Json(new
{
success = string.IsNullOrEmpty(obj),
msg = obj
});
}
/// <summary>
/// 导出分类管理成品明细
/// </summary>
/// <param name="start"></param>
......
Bailun.DC.Web/Areas/Reports/Views/Finance/MonthSaleProfitDetails.cshtml
......@@ -91,7 +91,7 @@
}
];
var url = '@Url.Content("~/Reports/Finance/ListMonthSaleProfitDetailJson")' + '?month=@(ViewBag.month)'+ '&col=@(ViewBag.col)';
var url = '@Url.Content("~/Reports/Finance/ListMonthSaleProfitDetailJson")' + '?month=@(ViewBag.month)'+ '&col=@(ViewBag.col)'+'&isnew=@(ViewBag.isnew)';
if (tb == undefined) {
tb = OnlyTable("roletable", columns, url, "", {
......@@ -117,7 +117,7 @@
})
uploadfile('btn_Upload',
'@Url.Content("~/Reports/Finance/UploadMonthSaleProfitDetail")' + '?month=@(ViewBag.month)'+ '&col=@(ViewBag.col)' + '&colname=@(ViewBag.colname)' + '&uid=' + uid + '&username=' + username,
'@Url.Content("~/Reports/Finance/UploadMonthSaleProfitDetail")' + '?month=@(ViewBag.month)'+ '&col=@(ViewBag.col)' + '&colname=@(ViewBag.colname)' + '&uid=' + uid + '&username=' + username+'&isnew=@(ViewBag.isnew)',
function(result){
if(result.success)
{
......
Bailun.DC.Web/Areas/Reports/Views/Finance/MonthSaleProfitNew.cshtml
......@@ -98,6 +98,14 @@
var objData = result.data[d];
var count = 0;
var objDescription;
for (var d in result.listdesc) {
if (result.listdesc[d].month == objData.month) {
objDescription = result.listdesc[d];
}
}
for (var a in objData) {
if (a == col.item2) {
row += '<td class="showitem ' + col.item2 + '" val="' + objData['month'] + '" valname="' + col.item1 + '">' + objData[a] + '</td>';
......@@ -115,17 +123,30 @@
}
}
//col, val, mon, name
//获取说明描述
var descri = '';
if (objDescription != undefined) {
for (var d in objDescription) {
if (d == col.item2) {
descri = objDescription[d];
}
}
}
if (objEdit != undefined) {
for (var a in objEdit) {
if (a == col.item2) {
row += '<td>' + objEdit[a].replace(/,/g, '') + (col.item3 == 1 ? "" : ('<a href="javascript:;" onclick="EditFee(\'' + col.item1 + '\',\'' + col.item2 + '\',' + objEdit[a].replace(/,/g, '') + ',\'' + objData.month + '\')">编辑</a>'))+'</td>';
row += '<td>' + objEdit[a].replace(/,/g, '') + (col.item3 == 1 ? "" : ('<img src="/img/icon-quetion.png" style="width:18px;margin-left:3px" title="' + descri + '" /><a href="javascript:;" onclick="EditFee(\'' + col.item1 + '\',\'' + col.item2 + '\',' + objEdit[a].replace(/,/g, '') + ',\'' + objData.month + '\')">编辑</a><a style="color:#bbb;" onclick=\"EditDescription(\'' + col.item2 + '\',\'' + descri + '\',\'' + objData.month + '\',\'' + col.item1 + '\')\">修改说明</a><a style="color:#bbb;" onclick=\"ShowDetail(\'' + col.item2 + '\',\'' + objData.month + '\',\'' + col.item1 + '\')\">明细</a>'))+'</td>';
//count += parseFloat(objEdit[a].replace(/,/g, ''));
continue;
}
}
}
else {
row += '<td>0' + (col.item3 == 1 ? "" :'<a href="javascript:;" onclick="EditFee(\'' + col.item1 +'\',\'' + col.item2 + '\',0,\'' + objData.month + '\')">编辑</a>')+'</td>';
row += '<td>0' + (col.item3 == 1 ? "" : '<img src="/img/icon-quetion.png" style="width:18px;margin-left:3px" title="' + descri + '" /><a href="javascript:;" onclick="EditFee(\'' + col.item1 + '\',\'' + col.item2 + '\',0,\'' + objData.month + '\')">编辑</a><a style="color:#bbb;" onclick=\"EditDescription(\'' + col.item2 + '\',\'' + descri + '\',\'' + objData.month + '\',\'' + col.item1 + '\')\">修改说明</a><a style="color:#bbb;" onclick=\"ShowDetail(\'' + col.item2 + '\',\'' + objData.month + '\',\'' + col.item1 + '\')\">明细</a>')+'</td>';
}
......@@ -319,7 +340,7 @@
function SaveDescription(col, val, mon) {
$.submit({
url: '@Url.Content("~/Reports/Finance/UpdateMonthSaleProfitDescription")',
url: '@Url.Content("~/Reports/Finance/UpdateMonthSalesProfitDescription")',
paramData: 'month=' + mon+'&'+col+'='+val,
type:'POST',
func: function (result) {
......@@ -337,7 +358,7 @@
}
function ShowDetail(col, mon, name) {
layer_show(mon + ' ' + name + "的明细", '@Url.Content("~/Reports/Finance/MonthSaleProfitDetails")' + '?month=' + mon + '&col=' + col + '&colname=' + name, '95%', '95%');
layer_show(mon + ' ' + name + "的明细", '@Url.Content("~/Reports/Finance/MonthSaleProfitDetails")' + '?month=' + mon + '&col=' + col + '&colname=' + name+"&isnew=1", '95%', '95%');
}
function exportxls() {
......
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