From 41f2805b250598007536c46a9dfc31a7eeed1712 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Sat, 7 May 2022 17:33:18 +0800
Subject: [PATCH] fix bug

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

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 f9b6560d..36360f29 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
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-30 19:36:30
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-23 16:35:15
+ * @LastEditTime : 2022-05-07 17:33:01
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -50,11 +50,11 @@
   </div> -->
   <st #st [data]="service.$api_get_cost_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
     [loading]="false" [scroll]="{ x: '2000px',y:scrollY }">
-    <ng-template st-row="armoeny" let-item let-index="index">
+    <!-- <ng-template st-row="armoeny" let-item let-index="index">
       {{ item.armoeny | currency }}
-    </ng-template>
+    </ng-template> -->
     <ng-template st-row="hrmoney" let-item let-index="index">
-      {{ item.hrmoney | currency }}
+      {{ item.armoeny ? (item.armoeny| currency ): '--' }} / {{ item.hrmoney? (item.hrmoney | currency) : '--'}}
     </ng-template>
     <ng-template st-row="artocode" let-item let-index="index"> {{ item.cnoCode }}/{{ item.cnoName }} </ng-template>
     <ng-template st-row="hrpaymoney" let-item let-index="index">
diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
index 7c913644..3a064c06 100644
--- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
+++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
@@ -252,8 +252,8 @@ export class CostManagementComponent extends BasicTableComponent implements OnIn
       { title: '结算客户', render: 'artocode', width: 200, className: 'text-left' },
       { title: '应收对象', index: 'artoname', width: 200, className: 'text-left' },
       { title: '应付对象', index: 'hrtoname', width: 200, className: 'text-left' },
-      { title: '应收金额', render: 'armoeny', width: 150, className: 'text-right' },
-      { title: '应付金额', render: 'hrmoney', width: 150, className: 'text-right' },
+      { title: '应收/应付金额', render: 'hrmoney', width: 150, className: 'text-right' },
+      // { title: '应付金额', render: 'hrmoney', width: 150, className: 'text-right' },
       { title: '收/付款金额', render: 'hrpaymoney', width: 150, className: 'text-right' },
       { title: '开/收票金额', render: 'hrvatmoney', width: 150, className: 'text-right' },
       { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-center' },