From d6b0f9359c09bc803fffd131abd782ab0fe9921d Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Fri, 25 Mar 2022 16:22:43 +0800
Subject: [PATCH] edit

---
 .../withdrawals-detail.component.html         | 23 ++++++++++++--
 .../withdrawals-detail.component.ts           | 31 ++++++++++++-------
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
index 1425c22a..667027cd 100644
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
@@ -74,8 +74,27 @@
             </div>
             <st #inputST [data]="service.$api_get_refund_detail_page" [columns]="columns" [page]="{  }"
                 [req]="{  process: beforeReq }" [loading]="false" [scroll]="{ x: '1200px', y: '370px' }" class="mt-md">
-                <ng-template st-row="no" let-item let-index="index" let-column="column">
-                    {{index+1}}
+                <ng-template st-row="amountDetails" let-item let-index="index" let-column="column">
+                    <ng-container *ngFor="let detail of item.amountDetails">
+                        {{detail.costName}}:{{detail.price |currency}}
+                    </ng-container>
+                </ng-template>
+                <ng-template st-row="billId" let-item let-index="index" let-column="column">
+                    {{item.billCode}}<br>
+                    {{item.billStatus}}<br>
+                </ng-template>
+                <ng-template st-row="wayBillId" let-item let-index="index" let-column="column">
+                    {{item.wayBillCode}}<br>
+                    {{item.wayBillStatus}}<br>
+                </ng-template>
+                <ng-template st-row="driverId" let-item let-index="index" let-column="column">
+                    {{item.driverName}}<br>
+                    {{item.driverTelephone}}<br>
+                    {{item.driverLicencePlate}}<br>
+                </ng-template>
+                <ng-template st-row="captainName" let-item let-index="index" let-column="column">
+                    {{item.captainName}}<br>
+                    {{item.captainTelephone}}<br>
                 </ng-template>
             </st>
         </nz-tab>
diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
index 5134ce46..77f2cfd9 100644
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
@@ -210,24 +210,31 @@ export class WithdrawalsDetailComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '支付编号', index: 'brmHCode', className: 'text-left', width: 200 },
+      { title: '支付编号', index: 'orderPaymentCode', className: 'text-left', width: 200 },
       {
         title: '支付金额',
-        index: 'yskmoney',
+        index: 'payAmount',
         type: 'widget',
         className: 'text-right',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) },
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payAmount }) },
         width: 140
       },
-      { title: '运费明细', index: 'billHId', className: 'text-center', width: 150 },
-      { title: '货主', index: 'ltdName', className: 'text-center', width: 150 },
-      { title: '订单号', index: 'billHId', className: 'text-center', width: 150 },
-      { title: '运单号', index: 'billHId', className: 'text-center', width: 150 },
-      { title: '货源编号', index: 'billHId', className: 'text-center', width: 150 },
-      { title: '服务类型', index: 'billHId', className: 'text-center', width: 150 },
-      { title: '承运司机', index: 'driverId', className: 'text-center', width: 150 },
-      { title: '收款人', index: 'billHId', className: 'text-center', width: 150 },
-      { title: '银行类型', index: 'billType', className: 'text-center', width: 150 }
+      { title: '运费明细', render: 'amountDetails', className: 'text-center', width: 150 },
+      { title: '货主', index: 'ltdName', className: 'text-center', width: 200 },
+      { title: '订单号', render: 'billId', className: 'text-center', width: 150 },
+      { title: '运单号', render: 'wayBillId', className: 'text-center', width: 150 },
+      { title: '货源编号', index: 'resourceCode', className: 'text-center', width: 150 },
+      {
+        title: '服务类型',
+        index: 'serviceType',
+        className: 'text-center',
+        width: 150,
+        type: 'enum',
+        enum: { '1': '抢单', '2': '指派', '3': '二维码', '4': '手工单' }
+      },
+      { title: '承运司机', render: 'driverId', className: 'text-center', width: 150 },
+      { title: '收款人', render: 'captainName', className: 'text-center', width: 150 },
+      { title: '银行类型', index: 'bankType', className: 'text-center', width: 150 }
     ];
   }
 }