diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html index 9ba4f0c3..e9aa98e1 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html @@ -1,31 +1,41 @@ - - + -
-
- -
-
- - - - -
+
+
+
+
+ + + + +
+
+ + - - \ 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' } }" > - + + {{ item.amountBeforeChange | currency}} + + + ¥{{ item.amountchangeValue | number: '0.2-2'}} + + + {{ item.amountAfterChange | currency}} +
变更原因:{{ViewCause?.changeCause}}
拒绝原因:{{ViewCause?.refuseCause}}
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 7c8698ee..42169214 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -588,10 +588,20 @@ tabs = { title: '变更前', width: '100px', className: 'text-center', - index: 'amountAfterChange' + index: 'amountAfterChange', + render: 'amountAfterChange' }, - { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center' }, - { title: '变更后', index: 'amountBeforeChange', width: '120px', className: 'text-center' } + { title: '变更值', + index: 'amountchangeValue', + width: '120px', + className: 'text-center', + render: 'amountchangeValue' + }, + { title: '变更后', + index: 'amountBeforeChange', + render: 'amountBeforeChange', + width: '120px', + className: 'text-center' } ]; } /** diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index e6933107..28a707d4 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@

- 总运费:¥{{ data.totalFreight }} + 总运费:{{ data.totalFreight | currency }}

-

运输费:¥{{ data.freight }},附加费:¥{{ data.surcharge }}

+

运输费:{{ data.freight | currency}},附加费:{{ data.surcharge | currency }}

\ No newline at end of file diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html index 5aeb71b4..4194a0fe 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html @@ -1,8 +1,8 @@ @@ -11,9 +11,9 @@

总运费:¥{{ data.totalFreight }}总运费:{{ data.totalFreight | currency }} - (运输费:¥{{ data.freight }},附加费:¥{{ data.surcharge }}) + (运输费:{{ data.freight | currency }},附加费:{{ data.surcharge | currency}})