Commit 9c7e1ba3 by guanzhenshan

解决差异金额总计没显示的问题

parent 84dadba4
......@@ -5249,10 +5249,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
end_stock_amount = objCount.end_stock_amount.ToString("N2"),
end_stock_count = objCount.end_stock_count.ToString("N0"),
diff_onway_amount = (objCount.diff_onway_amount??0).ToString("N2"),
diff_onway_count = (objCount.diff_onway_count??0).ToString("N0"),
diff_stock_amount = (objCount.diff_stock_amount??0).ToString("N2"),
diff_stock_count = (objCount.diff_stock_count??0).ToString("N0"),
diff_onway_amount = (objCount.end_onway_amount-objCount.start_onway_amount).ToString("N2"),
diff_onway_count = (objCount.end_onway_count-objCount.start_onway_count).ToString("N0"),
diff_stock_amount = (objCount.end_stock_amount-objCount.start_stock_amount).ToString("N2"),
diff_stock_count = (objCount.end_stock_count-objCount.start_stock_count).ToString("N0"),
count = objCount.count.ToString("N0"),
amount = objCount.amount.ToString("N2"),
......
......@@ -7,6 +7,9 @@
<div class="row">
<div class="col-sm-12">
<div class="alert alert-warning">
说明:差异=期末-期初
</div>
<div class="ibox-content m-b-sm border-bottom">
<form id="toolbar">
<div class="form-inline" style="line-height:40px;">
......@@ -89,8 +92,8 @@
{ field: 'diff_stock_count', title: '差异-在库数量', width: '130', iscount: true },
{ field: 'diff_onway_amount', title: '差异-在途金额', width: '130', iscount: true },
{ field: 'diff_onway_count', title: '差异-在途数量', width: '130', iscount: true },
{ field: 'amount', title: '总金额', width: '130', iscount: true, sortable: true },
{ field: 'count', title: '总数量', width: '130', iscount: true, sortable: true }
{ field: 'amount', title: '总期末金额', width: '130', iscount: true, sortable: true },
{ field: 'count', title: '总期末数量', width: '130', iscount: true, sortable: true }
];
var url = '@Url.Content("~/Reports/Finance/WHPurchaseSellStockJson")' + '?' + $("#toolbar").serialize();
......
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