From 3f83aa5cd684d5af2008d2a782eec03d6c960b01 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 19 Jan 2022 13:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cost-management-detail.component.html      | 15 +++++++++++++--
 .../cost-management-detail.component.ts        | 18 +++++++++---------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html
index 7f2b3e8e..c0e25429 100644
--- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html
+++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html
@@ -89,7 +89,14 @@
         </nz-tab>
         <nz-tab nzTitle="收款信息">
             <st #st [data]="costInfo?.ficoAhxLList" [columns]="columns.collection" [page]="{ show: false}"
-                [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }"></st>
+                [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }">
+                <ng-template st-row="no" let-item let-index="index" let-column="column">
+                    {{ index+1 }}
+                </ng-template>
+                <ng-template st-row="status" let-item let-index="index" let-column="column">
+                   已核销
+                </ng-template>
+            </st>
         </nz-tab>
         <nz-tab nzTitle="收票信息">
             <st #st [data]="data" [columns]="columns.ticket" [page]="{ show: false}" [loading]="service.http.loading"
@@ -97,7 +104,11 @@
         </nz-tab>
         <nz-tab nzTitle="付款信息">
             <st #st [data]="costInfo?.ficoPhxLList" [columns]="columns.payment" [page]="{ show: false}" [loading]="service.http.loading"
-                [scroll]="{ x:'1200px',y: '370px' }"></st>
+                [scroll]="{ x:'1200px',y: '370px' }">
+                <ng-template st-row="no" let-item let-index="index" let-column="column">
+                    {{ index+1 }}
+                </ng-template>
+            </st>
         </nz-tab>
     </nz-tabset>
 
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 86a27a9e..7bd24925 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
@@ -69,16 +69,16 @@ export class CostManagementDetailComponent implements OnInit {
         { title: '开票金额', index: 'vatmoney' }
       ],
       collection: [
-        { title: '序号', index: 'no' },
-        { title: '费用明细号', index: 'waybillLId' },
-        { title: '收款单号', index: 'callNo' },
-        { title: '收款日期', index: 'callNo' },
-        { title: '收款状态', index: 'callNo' },
-        { title: '应收金额', index: 'callNo' },
-        { title: '收款金额', index: 'callNo' }
+        { title: '序号', render: 'no', width: 70 },
+        { title: '费用明细号', index: 'feeLId' },
+        { title: '收款单号', index: 'id' },
+        { title: '收款日期', index: 'feedate' },
+        { title: '收款状态', render: 'status' },
+        { title: '应收金额', index: 'ahxmoney' },
+        { title: '收款金额', index: 'ahxmoney' }
       ],
       ticket: [
-        { title: '序号', index: 'no' },
+        { title: '序号', render: 'no', width: 70 },
         { title: '费用明细号', index: 'callNo' },
         { title: '进项发票号', index: 'callNo' },
         { title: '发票类型', index: 'callNo' },
@@ -89,7 +89,7 @@ export class CostManagementDetailComponent implements OnInit {
         { title: '收票金额', index: 'callNo' }
       ],
       payment: [
-        { title: '序号', index: 'no' },
+        { title: '序号', render: 'no', width: 70 },
         { title: '费用明细号', index: 'callNo' },
         { title: '付款单号', index: 'callNo' },
         { title: '要求日期', index: 'callNo' },