解决查看费用单详情异常的问题

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

@@ -2012,6 +2012,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         [BailunAuthentication(LoginMode.Enforce)]
         public string ListAdministrativeCostJson(DateTime start, DateTime end, int? paycompanyid, string headname, string categoryname, int type, int issub,int? ismanager)
         {
+            var user = HttpContextHelper.Current?.User;
+
             //var url = ConfigHelper.GetByName("FeeUrl") + "?o=0";
 
             //url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.ToString("yyyy-MM-dd");
@@ -2088,14 +2090,16 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 companyName = a.company_name,
                 currency = a.dic,
                 departmentName = a.department_name,
-                feeSubType = a.type_name,
+                feeSubType = a.kind_name,
                 a.accounting_subject_name,
-                feeSuperType = a.kind_name,
+                feeSuperType = a.type_name,
                 no = a.cost_no,
                 manageCostType = a.accounting_subject_name,
-                receiveUnit = a.pay_dic,
+                cost_form = a.cost_form>2?(a.is_lend.Value==1?3:4):a.cost_form,
+                receiveUnit = a.bank_company,
                 reason = a.cost_reason,
-                payTime = a.pay_time.HasValue?a.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss"):""
+                payTime = a.pay_time.HasValue?a.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss"):"",
+                uid = user != null ? user.GetUid() : 0
             }).ToList();
             
 

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

@@ -52,7 +52,7 @@
                 {
                     field: 'no', title: '费用单号', formatter: function (idx, data) {
                         //return '<div class="mules" title="' + data.no + '">' + data.no + '</div>';
-                        return '<a href="http://fee.bailuntec.com/#/manage_cost?manageCostType=' + data.manageCostType + '&no=' + data.no + '" target="_blank">' + data.no + '</a>' + (data.no==""?"":'<a style="margin-left:5px;color:#aaa;" onclick="showAttachment(\''+data.no+'\');">出纳凭证</a>');
+                        return '<a href="http://fee.bailuntec.com/#/manage_cost?manageCostType=' + (data.cost_form) + '&no=' + data.no +'&uid='+data.uid+ '" target="_blank">' + data.no + '</a>' + (data.no==""?"":'<a style="margin-left:5px;color:#aaa;" onclick="showAttachment(\''+data.no+'\');">出纳凭证</a>');
                     }
                 },
                 { field: 'departmentName', title: '部门名称' },