From 331c3207a73c0eab8b5575c9c7a5a3f2572dcac4 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Wed, 16 Feb 2022 16:05:22 +0800
Subject: [PATCH] edit

---
 .../cost-management-detail.component.ts                     | 6 +++---
 .../cost-management/cost-management.component.html          | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts
index c3fec627..56fd1edc 100644
--- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts
+++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts
@@ -48,10 +48,10 @@ export class CostManagementDetailComponent implements OnInit {
         { title: '订单号', index: 'billHCode', className: 'text-left', width: 200 },
         { title: '订单日期', render: 'billTime', className: 'text-left', width: 200 },
         { title: '运单号', index: 'waybillHCode', className: 'text-left', width: 200 },
-        { title: '运单日期', index: 'waybillDate', className: 'text-left', width: 200 },
+        { title: '运单日期', index: 'waybillDate', className: 'text-left', width: 200, format: _ => this.costInfo.billTime },
         { title: '结算客户', render: 'cnoName', className: 'text-left', width: 200 },
-        { title: '订单费用类型', index: 'billLType', className: 'text-left', width: 200 },
-        { title: '费用科目', index: 'feeSubId', className: 'text-left', width: 200 },
+        { title: '订单费用类型', index: 'billLTypeLabel', className: 'text-left', width: 200 },
+        { title: '费用科目', index: 'feeSubName', className: 'text-left', width: 200 },
         { title: '税率', index: 'hrvatrate', className: 'text-right', width: 200 },
         { title: '费用金额', render: 'hrvatmoney', className: 'text-right', width: 200 },
         { title: '收/付款金额', render: 'armoney', className: 'text-right', width: 200 },
diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.html b/src/app/routes/financial-management/components/cost-management/cost-management.component.html
index 187f8086..9d429044 100644
--- a/src/app/routes/financial-management/components/cost-management/cost-management.component.html
+++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.html
@@ -48,8 +48,7 @@
       {{ item.hrmoney | currency}}
     </ng-template>
     <ng-template st-row="artocode" let-item let-index="index">
-      <span *ngIf="item.feetype == 1">{{ item.artocode}}/{{ item.artonames}}</span>
-      <span *ngIf="item.feetype == 2">{{ item.hrtocode}}/{{ item.hrtonames}}</span>
+      {{ item.cnoCode}}/{{ item.cnoName}}
     </ng-template>
     <ng-template st-row="hrpaymoney" let-item let-index="index">
       {{ item.hrpaymoney | currency}}