Commit 01ac2a14 by guanzhenshan

解决管理成本报表无法按付款主体查看明细的问题

parent 1b981a22
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.Models.Api
{
/// <summary>
/// 利息支出
/// </summary>
public class mInterestExpense
{
/// <summary>
/// 借入公司主体value
/// </summary>
public int CompanyVal { get; set; }
/// <summary>
/// 借入公司主体名称
/// </summary>
public string Company { get; set; }
/// <summary>
/// 借款帐号
/// </summary>
public string BankCard { get; set; }
/// <summary>
/// 借款银行名称
/// </summary>
public string BankCardUser { get; set; }
/// <summary>
/// 借款银行持卡人
/// </summary>
public string BankName { get; set; }
/// <summary>
/// 债权方
/// </summary>
public string Creditor { get; set; }
/// <summary>
/// 本期归还利息
/// </summary>
public decimal RepayInterest { get; set; }
/// <summary>
/// 本期归还利息RMB
/// </summary>
public decimal RepayInterestRMB { get; set; }
/// <summary>
/// 实际还款时间
/// </summary>
public DateTime? ActualRepayTime { get; set; }
}
}
...@@ -224,6 +224,29 @@ namespace Bailun.DC.Services ...@@ -224,6 +224,29 @@ namespace Bailun.DC.Services
return list; return list;
} }
/// <summary>
/// 管理成本--利息支出
/// </summary>
/// <param name="url"></param>
/// <returns></returns>
public List<Models.Api.mInterestExpense> ListInterestExpense(string url)
{
var list = new List<Models.Api.mInterestExpense>();
var result = Common.HttpHelper.NetHelper.Request(url);
if (!string.IsNullOrEmpty(result))
{
var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Api.mInterestExpense>>(result);
if (obj.Count > 0)
{
list = obj;
}
}
return list;
}
#endregion #endregion
#region 平台余额 #region 平台余额
...@@ -1144,6 +1167,25 @@ namespace Bailun.DC.Services ...@@ -1144,6 +1167,25 @@ namespace Bailun.DC.Services
} }
} }
/// <summary>
/// 获取付款主体
/// </summary>
/// <param name="name">付款主体名称</param>
/// <returns></returns>
public dc_company_main_body GetPayCompanyByName(string name)
{
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if (cn.State == ConnectionState.Closed)
{
cn.Open();
}
var m = cn.QueryFirstOrDefault<dc_company_main_body>("select * from dc_company_main_body where company_name = '"+name+"'");
return m;
}
}
#endregion #endregion
#region 每日平台销售额(小平台) #region 每日平台销售额(小平台)
......
...@@ -184,6 +184,11 @@ ...@@ -184,6 +184,11 @@
} }
function getChildren(trindex, typename) { function getChildren(trindex, typename) {
if (typename == '利息支出') {
layer.msg('利息支出没有子分类哦');
return false;
}
var objTr = $('.tr_' + trindex + '_'); var objTr = $('.tr_' + trindex + '_');
if (objTr.length > 0) { if (objTr.length > 0) {
if (objTr.attr('ishide') == 1) { if (objTr.attr('ishide') == 1) {
...@@ -276,6 +281,7 @@ ...@@ -276,6 +281,7 @@
var start = $('#start').val(); var start = $('#start').val();
var end = $('#end').val(); var end = $('#end').val();
var paycompanyid = $('#sel_paycompanyid').val(); var paycompanyid = $('#sel_paycompanyid').val();
var param = '';
if (start == '') { if (start == '') {
alert('请选择付款开始时间'); alert('请选择付款开始时间');
...@@ -287,15 +293,19 @@ ...@@ -287,15 +293,19 @@
return false; return false;
} }
url += 'type=' + type; param += 'type=' + type;
url += '&start=' + start; param += '&start=' + start;
url += '&end=' + end; param += '&end=' + end;
url += '&paycompanyid=' + paycompanyid; param += '&paycompanyid=' + paycompanyid;
url += '&headname=' + colname; param += '&headname=' + colname;
url += '&categoryname=' + title; param += '&categoryname=' + title;
url += '&issub=' + issub||0; param += '&issub=' + issub||0;
if (title == '利息支出') {
url = '@Url.Content("~/Reports/Finance/ListInterestExpense?")';
}
layer_show(title + '+' + colname+'的明细', url, '90%', '90%'); layer_show(title + '+' + colname + '的明细', url + param, '90%', '90%');
} }
function numFormat(num) { function numFormat(num) {
......

@{
ViewData["Title"] = "利息支出明细";
Layout = "~/Pages/Shared/_MainLayout.cshtml";
}
<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 class="form-control layer-date" id="start" style="width:120px;" placeholder="付款开始时间" value="@ViewBag.start.ToString("yyyy-MM-dd")" />
<input class="form-control layer-date" id="end" style="width:120px" placeholder="付款结束时间" value="@ViewBag.end.ToString("yyyy-MM-dd")" />
</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-success" onclick="ExportCSV()">导出</button>
</div>
</div>
</form>
</div>
<div class="ibox-content m-b-sm border-bottom">
<table id="roletable" style="table-layout:fixed;"></table>
</div>
</div>
</div>
@section scripts{
<script type="text/javascript">
var companyid = @ViewBag.paycompanyid;
var headname = '@Html.Raw(ViewBag.headname)';
var categoryname = '@Html.Raw(ViewBag.categoryname)';
var type = @ViewBag.type;
var issub = @ViewBag.isSub;
var tb;
$(document).ready(function () {
list();
})
function list() {
var start = $('#start').val();
var end = $('#end').val();
var columns = [
{
field: 'Company', title: '借入公司主体名称'
},
{ field: 'BankCard', title: '借款帐号' },
{ field: 'BankCardUser', title: '借款银行名称', },
{ field: 'BankName', title: '借款银行持卡人' },
{ field: 'Creditor', title: '债权方' },
{ field: 'RepayInterest',title: '本期归还利息' },
{ field: 'RepayInterestRMB', title: '本期归还利息RMB' },
{ field: 'ActualRepayTime', title: '实际还款时间' }
];
var url = '@Url.Content("~/Reports/Finance/ListInterestExpenseJson")' + '?paycompanyid=' + companyid + '&headname=' + headname + '&categoryname=' + categoryname + '&start=' + start + '&end=' + end + '&type=' + type + '&issub=' + issub;
if (tb == undefined) {
tb = OnlyTable("roletable", columns, url, "",);
}
else {
tb.bootstrapTable('refresh', { url: url });
}
}
function ExportCSV() {
var start = $('#start').val();
var end = $('#end').val();
window.open('@Url.Content("~/Reports/Finance/ExportListInterestExpense")' + '?paycompanyid=' + companyid + '&headname=' + headname + '&categoryname=' + categoryname + '&start=' + start + '&end=' + end + '&type=' + type + '&issub=' + issub, '_blank');
}
</script>
}
...@@ -6,5 +6,6 @@ ...@@ -6,5 +6,6 @@
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"FeeUrl": "http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList", "FeeUrl": "http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList",
"cn_str": "server=gz-cdb-kp7s5i79.sql.tencentcdb.com;port=61691;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;" "cn_str": "server=gz-cdb-kp7s5i79.sql.tencentcdb.com;port=61691;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;",
"cwUrl": "http://cw.bailuntec.com/api/api/GetRepayPlanDetails"
} }
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