-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
\ No newline at end of file
+
+
+
diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts
index 5285cd21..ba186628 100644
--- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts
+++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts
@@ -4,11 +4,13 @@ import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { FreightAccountService } from '../../services/freight-account.service';
+import { CurrencyPipe } from '@angular/common';
@Component({
selector: 'app-transaction-flow',
templateUrl: './transaction-flow.component.html',
- styleUrls: ['./transaction-flow.component.less']
+ styleUrls: ['./transaction-flow.component.less'],
+ providers: [CurrencyPipe]
})
export class TransactionFlowComponent implements OnInit {
@ViewChild('st', { static: true })
@@ -20,7 +22,12 @@ export class TransactionFlowComponent implements OnInit {
_$expand = false;
- constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+ constructor(
+ public service: FreightAccountService,
+ private nzModalService: NzModalService,
+ private router: Router,
+ private currencyPipe: CurrencyPipe
+ ) {}
ngOnInit(): void {}
@@ -214,8 +221,17 @@ export class TransactionFlowComponent implements OnInit {
{ title: '账户名称', index: 'roleName', width: 100 },
{ title: '所属项目', index: 'projectName', width: 100 },
{ title: '收支类型', index: 'incomeTypeLabel', width: 100 },
- { title: '交易金额', index: 'amount', width: 100 },
- { title: '账户余额', index: 'accountBalance', width: 100 },
+ { title: '交易金额',
+ index: 'amount',
+ width: 100,
+ type: 'currency',
+ format: item => `${this.currencyPipe.transform(item.amount)}`
+ },
+ { title: '账户余额',
+ type: 'currency',
+ width: 150,
+ format: item => `${this.currencyPipe.transform(item.accountBalance)}`
+ },
{ title: '网络货运人', index: 'ltdName', width: 120 },
{ title: '银行类型', index: 'bankTypeLabel', width: 100 },
{ title: '银行流水号', index: 'channelPaySn', width: 120 },
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 7c99a5aa..89a3fbf5 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
@@ -1,3 +1,11 @@
+
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html
index f31cd393..399a2165 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@@ -156,7 +156,15 @@
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeViewParams }"
[res]="{ reName: { list: 'data.list', total: 'data.total' } }"
>
-
+