增加查看管理成本手续费明细页面

Bailun.DC.Models/dc_base_finance_handlefee.cs

@@ -10,111 +10,323 @@ namespace Bailun.DC.Models
     /// </summary>
     public class dc_base_finance_handlefee
     {
+        /// <summary>
+        /// 
+        /// </summary>
         public int id { get; set; }
 
+
+        /// <summary>
+        /// 财务id
+        /// </summary>
         public int cw_id { get; set; }
 
+
+        /// <summary>
+        /// 交易流水
+        /// </summary>
         public string trad_code { get; set; }
 
+
+        /// <summary>
+        /// 付款主体值
+        /// </summary>
         public int subject_value_from { get; set; }
 
+
+        /// <summary>
+        /// 付款主体名称
+        /// </summary>
         public string subject_name_from { get; set; }
 
+
+        /// <summary>
+        /// 银行帐号ID
+        /// </summary>
         public int pay_account_iDFrom { get; set; }
 
+
+        /// <summary>
+        /// 银行名称
+        /// </summary>
         public string bank_name_from { get; set; }
 
+
+        /// <summary>
+        /// 银行帐号
+        /// </summary>
         public string bank_card_from { get; set; }
 
+
+        /// <summary>
+        /// 持卡人
+        /// </summary>
         public string bank_card_user_from { get; set; }
 
+
+        /// <summary>
+        /// 供应商ID
+        /// </summary>
         public int supplier_iDFrom { get; set; }
 
+
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
         public string supplier_name_from { get; set; }
 
+
+        /// <summary>
+        /// 交易类型 1付款 2 收款
+        /// </summary>
         public int trade_type { get; set; }
 
+
+        /// <summary>
+        /// 交易-付款主体值
+        /// </summary>
         public string subject_value_to { get; set; }
 
+
+        /// <summary>
+        /// 交易-付款主体名称
+        /// </summary>
         public string subject_name_to { get; set; }
 
+
+        /// <summary>
+        /// 交易-银行账户ID
+        /// </summary>
         public int pay_account_iDTo { get; set; }
 
+
+        /// <summary>
+        /// 交易-银行名称
+        /// </summary>
         public string bank_name_to { get; set; }
 
+
+        /// <summary>
+        /// 交易-银行帐号
+        /// </summary>
         public string bank_card_to { get; set; }
 
+
+        /// <summary>
+        /// 交易-持卡人
+        /// </summary>
         public string bank_card_user_to { get; set; }
 
+
+        /// <summary>
+        /// 交易-供应商ID
+        /// </summary>
         public int supplier_iDTo { get; set; }
 
+
+        /// <summary>
+        /// 交易-供应商名称
+        /// </summary>
         public string supplier_name_to { get; set; }
 
+
+        /// <summary>
+        /// 交易-币种名称
+        /// </summary>
         public string unit_nameto { get; set; }
 
+
+        /// <summary>
+        /// 交易-币种编号
+        /// </summary>
         public string unit_codeto { get; set; }
 
+
+        /// <summary>
+        /// 交易-币种汇率
+        /// </summary>
         public decimal rate { get; set; }
 
+
+        /// <summary>
+        /// 交易-交易金额
+        /// </summary>
         public decimal pay_moneyto { get; set; }
 
+
+        /// <summary>
+        /// 币种名称
+        /// </summary>
         public string unit_name { get; set; }
 
+
+        /// <summary>
+        /// 币种编号
+        /// </summary>
         public string unit_code { get; set; }
 
+
+        /// <summary>
+        /// 交易金额
+        /// </summary>
         public decimal pay_money { get; set; }
 
+
+        /// <summary>
+        /// 交易金额人民币
+        /// </summary>
         public decimal pay_money_rMB { get; set; }
 
+
+        /// <summary>
+        /// 交易前的余额
+        /// </summary>
         public decimal old_money { get; set; }
 
+
+        /// <summary>
+        /// 交易后的余额
+        /// </summary>
         public decimal new_money { get; set; }
 
+
+        /// <summary>
+        /// 前一天的余额
+        /// </summary>
         public decimal before_day_money { get; set; }
 
+
+        /// <summary>
+        /// 备注/摘要
+        /// </summary>
         public string remark { get; set; }
 
+
+        /// <summary>
+        /// 附件
+        /// </summary>
         public string annex { get; set; }
 
+
+        /// <summary>
+        /// 删除状态 0 正常 1作废
+        /// </summary>
         public int has_delete { get; set; }
 
+
+        /// <summary>
+        /// 作废备注
+        /// </summary>
         public string delete_remark { get; set; }
 
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
         public int create_user_iD { get; set; }
 
+
+        /// <summary>
+        /// 创建人名称
+        /// </summary>
         public string create_user_name { get; set; }
 
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
         public DateTime? create_time { get; set; }
 
+
+        /// <summary>
+        /// 关联转账记录ID
+        /// </summary>
         public int fetter_trade_iD { get; set; }
 
+
+        /// <summary>
+        /// 关联转账记录流水号
+        /// </summary>
         public string fetter_trade_code { get; set; }
 
+
+        /// <summary>
+        /// 来源 0账户互转 1财务出纳 2提现收入 3币种金额互转 4调账 5供应商退回 6手续费 7借贷
+        /// </summary>
         public string source { get; set; }
 
+
+        /// <summary>
+        /// 交易类别 0常规转账 1银行手续费
+        /// </summary>
         public string trade_category { get; set; }
 
+
+        /// <summary>
+        /// 出纳申请单ID
+        /// </summary>
         public int payment_iD { get; set; }
 
+
+        /// <summary>
+        /// 采购单分类
+        /// </summary>
         public int pur_category_iD { get; set; }
 
+
+        /// <summary>
+        /// 采购单分类名称
+        /// </summary>
         public string pur_category_name { get; set; }
 
+
+        /// <summary>
+        /// 出纳申请单号，在采购系统确认收款时记录
+        /// </summary>
         public string apply_code { get; set; }
 
+
+        /// <summary>
+        /// 原始汇率
+        /// </summary>
         public decimal original_rate { get; set; }
 
+
+        /// <summary>
+        /// 来源系统
+        /// </summary>
         public string cashier_source_name { get; set; }
 
+
+        /// <summary>
+        /// 采购单号
+        /// </summary>
         public string cashier_detail_name { get; set; }
 
+
+        /// <summary>
+        /// 出纳单号
+        /// </summary>
         public string cashier_code { get; set; }
 
+
+        /// <summary>
+        /// 出纳单交易类型 -1转账支出 -2替人代付 2找人代付 3提现收入 -4还款支出 4借款收入
+        /// </summary>
         public string casher_transaction_type { get; set; }
 
+
+        /// <summary>
+        /// 出纳单ID
+        /// </summary>
         public int cashier_id { get; set; }
 
+
+        /// <summary>
+        /// 出纳单其他订单流水号
+        /// </summary>
         public string cashier_other_order_code { get; set; }
 
+
     }
 }

Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs

@@ -2131,6 +2131,81 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             return View();
         }
 
+
+        public ActionResult ListFinanceHandleFee(DateTime start, DateTime end, int? paycompanyid)
+        {
+            ViewBag.start = start.ToString("yyyy-MM-dd");
+            ViewBag.end = end.ToString("yyyy-MM-dd");
+            ViewBag.paycompanyid = paycompanyid.HasValue ? paycompanyid.Value.ToString() : "";
+
+            return View();
+        }
+
+        /// <summary>
+        /// 手续费明细
+        /// </summary>
+        /// <param name="parameter"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        /// <param name="paycompanyid"></param>
+        /// <returns></returns>
+        [BailunAuthentication(LoginMode.Enforce)]
+        public JsonResult ListFinanceHandleFeeJson(DateTime start, DateTime end, int? paycompanyid)
+        {
+            var total = 0;
+
+            var obj = new Services.FinanceReportServices().ListFinanceHandleFee(start, end, paycompanyid);
+
+            var totalRmb = 0M;
+
+            if (obj.Count > 0)
+            {
+                totalRmb = obj.Sum(a => a.pay_money_rMB);
+            }
+
+            var list = obj.Select(a => new { 
+                a.subject_name_from,
+
+                a.bank_card_from,
+                a.bank_card_to,
+                a.bank_card_user_from,
+                a.bank_card_user_to,
+                a.bank_name_from,
+                a.bank_name_to,
+                
+                a.casher_transaction_type,  //出纳单交易类型 -1转账支出 -2替人代付 2找人代付 3提现收入 -4还款支出 4借款收入
+                a.create_time,      //创建时间
+                a.remark,           //备注
+
+                a.source,           //来源 0账户互转 1财务出纳 2提现收入 3币种金额互转 4调账 5供应商退回 6手续费 7借贷
+                a.trade_category,   //交易类别 0常规转账 1银行手续费
+                a.trade_type,       //交易类型 1付款 2 收款
+                a.trad_code,        //交易号
+                a.pay_money_rMB,    //手续费  
+            });
+
+            return Json(new { 
+                success = true,
+                msg = "",
+                data = list,
+                total = totalRmb
+            });
+        }
+
+        /// <summary>
+        /// 导出手续费明细
+        /// </summary>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        /// <param name="paycompanyid"></param>
+        /// <returns></returns>
+        public ActionResult ExportListFinanceHandleFee(DateTime start, DateTime end, int? paycompanyid)
+        {
+
+            return View();
+
+        }
+
         /// <summary>
         /// 获取利息支出明细列表
         /// </summary>

Bailun.DC.Web/Areas/Reports/Views/Finance/AdministrativeCost.cshtml

@@ -343,10 +343,15 @@
             param += '&categoryname=' + title;
             param += '&issub=' + issub||0;
 
+
             if (title == '利息支出') {
                 url = '@Url.Content("~/Reports/Finance/ListInterestExpense?")';
             }
 
+            if (title == '手续费支出') {
+                url = '@Url.Content("~/Reports/Finance/ListFinanceHandleFee?")';
+            }
+
             layer_show(title + '+' + colname + '的明细', url + param, '90%', '90%');
         }
 

Bailun.DC.Web/Areas/Reports/Views/Finance/ListFinanceHandleFee.cshtml

+
+@{
+    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" />
+                        <input class="form-control layer-date" id="end" style="width:120px" placeholder="交易结束时间" value="@ViewBag.end" />
+                    </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 id="btnexport" style="display:none;" 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" class="table table-hover table-bordered table-condensed table-striped" style="table-layout:fixed;">
+                <thead>
+                    <tr>
+                        <th>付款主体</th>
+                        <th>交易银行卡号</th>
+                        <th>所属银行</th>
+                        <th>持卡人</th>
+                        <th>手续费cny</th>
+                        <th>产生时间</th>
+                    </tr>
+                </thead>
+                <tbody id="tb">
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+</div>
+
+@section scripts{
+    <script type="text/javascript">
+        var tb;
+        $(document).ready(function () {
+            list();
+        })
+
+        function list() {
+            var start = $('#start').val();
+            var end = $('#end').val();
+
+            $.submit({
+                url: '@Url.Content("~/Reports/Finance/ListFinanceHandleFeeJson")',
+                paramData: 'start=' + start + '&end=' + end +'&paycompanyid=@(ViewBag.paycompanyid)',
+                func: function (result) {
+                    $('#tb').html('');
+                    if (result.success) {
+                        for (var i in result.data) {
+                            var obj = result.data[i];
+                            var s = '<tr>';
+                            s += '<td>' + obj.subject_name_from + '</td>';
+                            s += '<td>' + obj.bank_card_from + '</td>';
+                            s += '<td>' + obj.bank_name_from + '</td>';
+                            s += '<td>' + obj.bank_card_user_from + '</td>';
+                            s += '<td>' + obj.pay_money_rMB + '</td>';
+                            s += '<td>' + obj.create_time + '</td>';
+                            s += '</tr>';
+                            $('#tb').append(s);
+                        }
+
+                        //合计
+                        $('#tb').append('<tr><td colspan="3"></td><td>合计</td><td>' + result.total + '</td><td></td></tr>');
+
+                    }
+                    else {
+                        alert('获取数据出现异常')
+                    }
+                }
+            })
+
+        }
+
+        function ExportCSV() {
+            var start = $('#start').val();
+            var end = $('#end').val();
+
+            window.open('@Url.Content("~/Reports/Finance/ExportListFinanceHandleFee")' + '?paycompanyid=@(ViewBag.paycompanyid)' + '&start=' + start + '&end=' + end, '_blank');
+
+        }
+
+    </script>
+}
+