调整管理成本付现流水

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

@@ -2097,7 +2097,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 manageCostType = a.accounting_subject_name,
                 cost_form = a.cost_form>2?(a.is_lend.Value==1?3:4):a.cost_form,
                 receiveUnit = a.bank_company,
-                reason = a.cost_reason,
+                reason = string.IsNullOrEmpty(a.cost_reason)?a.cost_remark:a.cost_reason,
                 payTime = a.pay_time.HasValue?a.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss"):"",
                 uid = user != null ? user.GetUid() : 0
             }).ToList();
@@ -2404,7 +2404,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             foreach (var item in obj)
             {
                 list.Add(item.cost_no + "|" + item.department_name + "|" + item.company_name + "|" + item.type_name + "|" + item.accounting_subject_name + "|" +
-                    item.amount + "|" + item.dic + "|" + item.amount_rmb + "|" + item.bank_company + "|" + item.cost_reason + "|" + item.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss"+"|"+item.mor_remark)
+                    item.amount + "|" + item.dic + "|" + item.amount_rmb + "|" + item.bank_company + "|" + (string.IsNullOrEmpty(item.cost_reason) ? item.cost_remark : item.cost_reason) + "|" + item.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss"+"|"+item.mor_remark)
                     );
             }
 
@@ -2456,7 +2456,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             foreach (var item in obj)
             {
                 list.Add(item.cost_no + "|" + item.department_name + "|" + item.company_name + "|" + item.type_name + "|" + item.accounting_subject_name + "|" +
-                    item.amount + "|" + item.dic + "|" + item.amount_rmb + "|" + item.bank_company + "|" + item.cost_reason + "|" + item.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss" + "|" + item.mor_remark)
+                    item.amount + "|" + item.dic + "|" + item.amount_rmb + "|" + item.bank_company + "|" + (string.IsNullOrEmpty(item.cost_reason) ? item.cost_remark : item.cost_reason) + "|" + item.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss" + "|" + item.mor_remark)
                     );
             }
 

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

@@ -7,15 +7,18 @@
 <div class="row">
     <div class="col-sm-12">
         <div class="ibox-content m-b-sm border-bottom">
+            <div class="alert alert-info">
+
+            </div>
             <form id="toolbar">
                 <div class="form-inline" style="line-height:40px;">
-                    <div class="form-group">
+                    @*<div class="form-group">
                         <label>统计类型</label>
                         <select id="sel_type" class="form-control">
                             <option value="1">按部门</option>
                             <option value="2">按付款主体</option>
                         </select>
-                    </div>
+                    </div>*@
                     <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")" />
@@ -97,12 +100,12 @@
         })
 
         function list() {
-            var type = $('#sel_type').val();
+            //var type = $('#sel_type').val();
 
-            if (type == '') {
-                alert('请选择统计类型');
-                return false;
-            }
+            //if (type == '') {
+            //    alert('请选择统计类型');
+            //    return false;
+            //}
 
             var start = $('#start').val();
             var end = $('#end').val();
@@ -124,7 +127,7 @@
             $.submit({
                 url: '@Url.Content("~/Reports/Finance/AdministrativeCostJson")',
                 type: 'POST',
-                paramData: 't=' + type + '&start=' + start + '&end=' + end + '&ismanager=' + $('#ismanager').val(),
+                paramData: 't=2' + '&start=' + start + '&end=' + end + '&ismanager=' + $('#ismanager').val(),
                 func: function (result) {
                     layer.close(lindex);
                     if (result.success) {