Commit d2d5e753 by guanzhenshan

加上差异值

parent 22132e99
...@@ -16,5 +16,7 @@ namespace Bailun.DC.Models ...@@ -16,5 +16,7 @@ namespace Bailun.DC.Models
public string diff { get; set; } public string diff { get; set; }
public decimal diffval { get; set; }
} }
} }
...@@ -2975,6 +2975,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -2975,6 +2975,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var listPro = new List<string>(); var listPro = new List<string>();
for (var i = 0; i < s.Count; i++) for (var i = 0; i < s.Count; i++)
{ {
listval[i].diffval = listval[i].end - listval[i].start;
if (i >= 0 && i < 31) if (i >= 0 && i < 31)
{ {
listval[i].onelevelname=("流动资产"); listval[i].onelevelname=("流动资产");
...@@ -3167,7 +3169,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -3167,7 +3169,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var colNames = new List<string> { "一级项目", "二级项目", start.ToString("yyyy-MM-dd"), end.ToString("yyyy-MM-dd"),"环比%" }; var colNames = new List<string> { "一级项目", "二级项目", start.ToString("yyyy-MM-dd"), end.ToString("yyyy-MM-dd"),"环比%","差异值" };
var list = new List<string>(); var list = new List<string>();
...@@ -3267,6 +3269,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -3267,6 +3269,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
for (var i = 0; i < list.Count; i++) for (var i = 0; i < list.Count; i++)
{ {
var arr = list[i].Split('|');
list[i] = arr[0] + "|" + arr[1] +"|"+arr[2]+"|"+arr[3]+"|"+(decimal.Parse(arr[2])-decimal.Parse(arr[1]));
if (i >= 0 && i < 31) if (i >= 0 && i < 31)
{ {
list[i] = ("流动资产")+"|"+list[i]; list[i] = ("流动资产")+"|"+list[i];
...@@ -3299,6 +3306,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -3299,6 +3306,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{ {
list[i] = ("所有者权益(或股东权益)合计") + "|" + list[i]; list[i] = ("所有者权益(或股东权益)合计") + "|" + list[i];
} }
} }
var guid = Guid.NewGuid().ToString(); var guid = Guid.NewGuid().ToString();
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<th>二级项目</th> <th>二级项目</th>
<th>期初</th> <th>期初</th>
<th>期末</th> <th>期末</th>
<th>差异值(期末-期初)</th>
<th>环比差值%</th> <th>环比差值%</th>
</tr> </tr>
</thead> </thead>
...@@ -93,10 +94,10 @@ ...@@ -93,10 +94,10 @@
for (var i = 0; i < result.data.length; i++) { for (var i = 0; i < result.data.length; i++) {
if (result.data[i].sencondlevelname.indexOf('合计') > 0) { if (result.data[i].sencondlevelname.indexOf('合计') > 0) {
var s = '<tr><td style="text-align:right;width:190px;background:#eee;">' + result.data[i].onelevelname + '</td><td style="background:#eee;">' + result.data[i].sencondlevelname + '</td><td style="background:#eee;">' + result.data[i].start + '</td><td style="background:#eee;">' + result.data[i].end + '</td><td style="background:#eee;">' + result.data[i].diff + '</td><tr>'; var s = '<tr><td style="text-align:right;width:190px;background:#eee;">' + result.data[i].onelevelname + '</td><td style="background:#eee;">' + result.data[i].sencondlevelname + '</td><td style="background:#eee;">' + result.data[i].start + '</td><td style="background:#eee;">' + result.data[i].end + '</td><td style="background:#eee;">' + result.data[i].diffval + '</td><td style="background:#eee;">' + result.data[i].diff + '</td><tr>';
} }
else { else {
var s = '<tr><td style="text-align:right;width:190px;">' + result.data[i].onelevelname + '</td><td>' + result.data[i].sencondlevelname + '</td><td>' + result.data[i].start + '</td><td>' + result.data[i].end + '</td><td>' + result.data[i].diff + '</td><tr>'; var s = '<tr><td style="text-align:right;width:190px;">' + result.data[i].onelevelname + '</td><td>' + result.data[i].sencondlevelname + '</td><td>' + result.data[i].start + '</td><td>' + result.data[i].end + '</td><td>' + result.data[i].diffval + '</td><td>' + result.data[i].diff + '</td><tr>';
} }
$('#tbody_').append(s); $('#tbody_').append(s);
......
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