Skip to content

D
DataCenter_Core2.1_20190520
Commit ad8a0b81 by guanzhenshan
Options

月销售利润增加基础数据列、调整列

parent eb317c1b
Showing with 66 additions and 38 deletions
Bailun.DC.Models/mMonthSaleProfit.cs
...@@ -72,6 +72,11 @@ namespace Bailun.DC.Models ...@@ -72,6 +72,11 @@ namespace Bailun.DC.Models
public decimal? manager_cost_gzbailun { get; set; } public decimal? manager_cost_gzbailun { get; set; }
/// <summary> /// <summary>
/// 管理成本-美甲店
/// </summary>
public decimal? manager_cost_meijiadian { get; set; }
/// <summary>
/// 管理成本-成品仓（不含直接支付的与销售平台相关的费用） /// 管理成本-成品仓（不含直接支付的与销售平台相关的费用）
/// </summary> /// </summary>
public decimal? manager_cost_finish_wh { get; set; } public decimal? manager_cost_finish_wh { get; set; }
......
Bailun.DC.Services/FinanceReportServices.cs
...@@ -3899,6 +3899,11 @@ group by currency"; ...@@ -3899,6 +3899,11 @@ group by currency";
obj.manager_cost_hkbailun = m.manager_cost_hkbailun.Value; obj.manager_cost_hkbailun = m.manager_cost_hkbailun.Value;
} }
if (m.manager_cost_meijiadian.HasValue)
{
obj.manager_cost_meijiadian = m.manager_cost_meijiadian.Value;
}
if (m.nonbusiness_income.HasValue) if (m.nonbusiness_income.HasValue)
{ {
obj.nonbusiness_income = m.nonbusiness_income.Value; obj.nonbusiness_income = m.nonbusiness_income.Value;
...@@ -3964,8 +3969,8 @@ group by currency"; ...@@ -3964,8 +3969,8 @@ group by currency";
//销售相关的管理成本=处理费+直接支付的与销售平台相关费用 //销售相关的管理成本=处理费+直接支付的与销售平台相关费用
obj.sale_manager_cost = obj.handlingcharges + obj.payfor_platform_related_fee; obj.sale_manager_cost = obj.handlingcharges + obj.payfor_platform_related_fee;
//直接管理成本=管理成本香港百伦+管理成本广州百伦+管理成本成品仓+财务费用 //直接管理成本=管理成本香港百伦+管理成本广州百伦+管理成本成品仓+财务费用+管理成本美甲店
obj.direct_manager_cost = obj.manager_cost_hkbailun + obj.manager_cost_gzbailun + obj.manager_cost_finish_wh+obj.finance_fee; obj.direct_manager_cost = obj.manager_cost_hkbailun + obj.manager_cost_gzbailun + obj.manager_cost_finish_wh+obj.finance_fee+obj.manager_cost_meijiadian;
//管理成本合计=直接管理成本+销售相关的管理成本 //管理成本合计=直接管理成本+销售相关的管理成本
obj.manager_cost_count = obj.direct_manager_cost + obj.sale_manager_cost; obj.manager_cost_count = obj.direct_manager_cost + obj.sale_manager_cost;
......
Bailun.DC.Web/Areas/Reports/Views/Finance/MonthSaleProfit.cshtml
...@@ -33,15 +33,16 @@ ...@@ -33,15 +33,16 @@
<table id="tb" style="table-layout: fixed;" class="table table-border table-bordered table-hover table-bg table-sort form-inline"> <table id="tb" style="table-layout: fixed;" class="table table-border table-bordered table-hover table-bg table-sort form-inline">
<thead> <thead>
<tr> <tr>
<td>月份</td> <td rowspan="2">项目</td>
<td id="lbl_title" style="font-size:1.1em;font-weight:bold;"></td> <td colspan="3">月份</td>
</tr> </tr>
</thead>
<tbody>
<tr> <tr>
<td style="width:420px;">项目</td> <td>基础数据</td>
<td>金额</td> <td>调整数据</td>
<td>合计数据</td>
</tr> </tr>
</thead>
<tbody>
<tr> <tr>
<td style="font-weight:bold;text-align:center;">销售额</td> <td style="font-weight:bold;text-align:center;">销售额</td>
<td> <td>
...@@ -311,6 +312,23 @@ ...@@ -311,6 +312,23 @@
$('#tb').find('tbody').html(''); $('#tb').find('tbody').html('');
if (result.data.length > 0) { if (result.data.length > 0) {
var s = ''; var s = '';
var m = '<tr><th style="height:40px;text-align: center;line-height: 40px;" rowspan="2">项目</th>';
var m2 = '<tr>';
for (var i in result.data) {
m += ('<th style="height:40px;text-align: center;line-height: 40px;" colspan="3">' + result.data[i]['month'] + '月份</th>');
m2 += '<td>基础数据</td><td>调整数据</td><td>合计数据</td>';
}
m2 += '</tr>';
m += '</tr>';
$('#tb').find('thead').html(m + m2);
for (var h in result.head) { for (var h in result.head) {
s = '<tr>' + result.head[h].item2; //项目名称 s = '<tr>' + result.head[h].item2; //项目名称
...@@ -328,7 +346,35 @@ ...@@ -328,7 +346,35 @@
} }
s += ('<td>' + str_template + '</td>'); //基础
var col_1 = result.head[h].item4;
col_1 = col_1.replace('{' + result.head[h].item1 + '}', result.data[i][c]);
if (parseFloat(col_1) >= 0) {
s += '<td>' + col_1 + '</td>';
}
else {
if (col_1.indexOf('-') > 0) {
s += '<td>' + ((result.data[i][c]).replace(/,/g, '') - (result.data[i][c + '_'])).toFixed(2) + '</td>';
}
else {
s += '<td>' + ((result.data[i][c])) + '</td>';
}
}
//调整
var col_2 = result.head[h].item5;
col_2 = col_2.replace('{' + result.head[h].item1 + '}', result.data[i][c]);
col_2 = col_2.replace('{' + result.head[h].item1 + '_}', result.data[i][c + '_']);
s += '<td>' + str_template.replace('{' + result.head[h].item1 + '+}', col_2) + '</td>';
//合计
s += ('<td>' + result.data[i][c] + '</td>');
break; break;
} }
...@@ -337,35 +383,7 @@ ...@@ -337,35 +383,7 @@
s += '</tr>'; s += '</tr>';
$('#tb').find('tbody').append(s); $('#tb').find('tbody').append(s);
} }
var m = '<tr><th style="height:40px;text-align: center;line-height: 40px;">项目</th>';
for (var i in result.data) {
m += ('<th style="height:40px;text-align: center;line-height: 40px;">' + result.data[i]['month']+'</th>');
}
m += '</tr>';
$('#tb').find('thead').html(m);
//var obj = result.data[0];
//$('#lbl_title').html($('#month').val());
//for (var i in obj) {
// var _temp = i.substr(i.length - 1, 1);
// if (_temp == '_') {
// $('.' + i).attr('val', obj[i]);
// $('.' + i).attr('mon', obj['month']);
// }
// else {
// $('.lbl_' + i).html(obj[i]);
// $('.lbl_' + i).attr('mon', obj['month']);
// try {
// $('.' + i).attr('val', obj[i]);
// $('.' + i).attr('mon', obj['month']);
// } catch (e) {
// }
// }
//}
} }
else { else {
layer.msg('没有' + $('#month').val()+'月份的销售利润数据。'); layer.msg('没有' + $('#month').val()+'月份的销售利润数据。');
......
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