diff --git a/src/app/routes/commom/less/box.less b/src/app/routes/commom/less/box.less index a9e86f05..77c5fe87 100644 --- a/src/app/routes/commom/less/box.less +++ b/src/app/routes/commom/less/box.less @@ -23,4 +23,12 @@ .text-truncate { white-space: normal; } + + .bold { + .ant-statistic-title { + font-weight: 600; + color : #000; + font-size : 16px; + } + } } \ No newline at end of file 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 f100323f..9e8ec435 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 @@ -13,13 +13,8 @@
- +
@@ -37,45 +32,30 @@
- - + +
- - - {{ item.armoeny | currency}} - - - {{ item.hrmoney | currency}} - - - {{ item.hrpaymoney | currency}} - - - {{ item.hrvatmoney | currency}} - + [loading]="service.http.loading" [scroll]="{ x: '2000px',y:'450px' }"> + + {{ item.armoeny | currency}} + + + {{ item.hrmoney | currency}} + + + {{ item.hrpaymoney | currency}} + + + {{ item.hrvatmoney | currency}} +
@@ -83,13 +63,9 @@
- +
- + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.less b/src/app/routes/financial-management/components/cost-management/cost-management.component.less deleted file mode 100644 index d969443b..00000000 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.less +++ /dev/null @@ -1,21 +0,0 @@ -:host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 14px; - } - } - - nz-range-picker { - width: 100%; - } - - .text-truncate { - white-space: normal; - } -} \ No newline at end of file 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 bcaedcfd..f4ce440f 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 @@ -8,7 +8,7 @@ import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-cost-management', templateUrl: './cost-management.component.html', - styleUrls: ['./cost-management.component.less'] + styleUrls: ['../../../commom/less/box.less'] }) export class CostManagementComponent implements OnInit { @ViewChild('st', { static: true }) diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html index 6ad0da58..8c870a65 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html @@ -52,7 +52,7 @@
- + { @@ -71,8 +71,7 @@ export class DriverAccountDetailComponent implements OnInit { }); } - stChange(e: STChange): void { - } + stChange(e: STChange): void {} exportList() { this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps }); @@ -165,11 +164,25 @@ export class DriverAccountDetailComponent implements OnInit { return [ { title: '交易时间', index: 'createTime', type: 'date' }, { title: '流水号', index: 'channelPaySn' }, - { title: '交易类型', index: 'tradeTypeLabel' }, + { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' }, { title: '关联单号', index: 'businessNumber' }, - { title: '收支类型', index: 'incomeTypeLabel' }, - { title: '交易金额', index: 'amount' }, - { title: '账户余额', index: 'accountBalance' } + { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' }, + { + title: '交易金额', + index: 'amount', + width: 150, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) } + }, + { + title: '账户余额', + index: 'accountBalance', + width: 150, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } + } ]; } } diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.html b/src/app/routes/financial-management/components/driver-account/driver-account.component.html index 0252bdb6..4ef9a36f 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.html +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.html @@ -27,5 +27,8 @@ [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="service.http.loading" [scroll]="{ y: '370px' }"> + + {{ item.availableBalance | currency}} + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.less b/src/app/routes/financial-management/components/driver-account/driver-account.component.less deleted file mode 100644 index 358d2f27..00000000 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.less +++ /dev/null @@ -1,32 +0,0 @@ -:host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 14px; - } - } - - nz-range-picker { - width: 100%; - } -} - -.expend-options { - margin-top: 0px; -} - - -@media (min-width: 1200px) { - .expend-options { - max-width : 400px; - position : absolute; - right : 0; - bottom : 25px; - } - -} \ No newline at end of file diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 88d44c85..fa7578b8 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -11,8 +11,7 @@ import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-driver-account', templateUrl: './driver-account.component.html', - styleUrls: ['./driver-account.component.less'], - providers: [CurrencyPipe] + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) export class DriverAccountComponent implements OnInit { @ViewChild('st', { static: true }) @@ -24,12 +23,7 @@ export class DriverAccountComponent implements OnInit { columns: STColumn[] = this.initST(); _$expand = false; - constructor( - public service: FreightAccountService, - private router: Router, - private modal: NzModalService, - private currencyPipe: CurrencyPipe - ) {} + constructor(public service: FreightAccountService, private router: Router, private modal: NzModalService) {} ngOnInit(): void {} @@ -172,30 +166,28 @@ export class DriverAccountComponent implements OnInit { { title: '可用余额', index: 'availableBalance', - type: 'currency', - format: item => `${this.currencyPipe.transform(item.availableBalance)}` + width: 140, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.availableBalance }) } }, { title: '冻结余额', index: 'freezeBalance', - type: 'currency', - format: item => `${this.currencyPipe.transform(item.availableBalance)}` + width: 140, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.freezeBalance }) } }, { title: '本月累计提现金额', index: 'withdrawBalance', width: 150, - type: 'currency', - format: item => `${this.currencyPipe.transform(item.availableBalance)}` - }, - { - title: '账户总余额', - index: 'availableBalance', + type: 'widget', className: 'text-right', - type: 'link', - format: item => `${this.currencyPipe.transform(item.availableBalance)}`, - click: item => this.showAccountDetail(item) + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.withdrawBalance }) } }, + { title: '账户总余额', render: 'availableBalance', className: 'text-right' }, { title: '创建时间', index: 'createTime', type: 'date', width: 150 }, { title: '操作', diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html index 56003eb9..135e23a0 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html +++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html @@ -31,7 +31,7 @@ - +
{ @@ -71,8 +71,7 @@ export class FreightAccountDetailComponent implements OnInit { }); } - stChange(e: STChange): void { - } + stChange(e: STChange): void {} exportList() { this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps }); @@ -189,12 +188,26 @@ export class FreightAccountDetailComponent implements OnInit { return [ { title: '交易时间', index: 'createTime', type: 'date' }, { title: '流水号', index: 'transactionNumber' }, - { title: '交易类型', index: 'tradeTypeLabel' }, + { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' }, { title: '关联单号', index: 'businessNumber' }, { title: '所属项目', index: 'projectId' }, - { title: '收支类型', index: 'incomeTypeLabel' }, - { title: '交易金额', index: 'amount' }, - { title: '账户余额', index: 'accountBalance' } + { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' }, + { + title: '交易金额', + index: 'amount', + width: 150, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) } + }, + { + title: '账户余额', + index: 'accountBalance', + width: 150, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } + } ]; } } diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.html b/src/app/routes/financial-management/components/freight-account/freight-account.component.html index 9ac3bbae..1128560a 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.html +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.html @@ -27,5 +27,8 @@ [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="service.http.loading" [scroll]="{ y: '370px' }"> + + {{ item.availableBalance | currency}} + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.less b/src/app/routes/financial-management/components/freight-account/freight-account.component.less deleted file mode 100644 index 12e2f51f..00000000 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.less +++ /dev/null @@ -1,32 +0,0 @@ -:host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 14px; - } - } - - nz-range-picker { - width: 100%; - } -} - -.expend-options { - margin-top: 0px; -} - - -@media (min-width: 1200px) { - .expend-options { - max-width : 400px; - position : absolute; - right : 0; - bottom : 25px; - } - -} \ No newline at end of file diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts index abd75998..3b5dfaf9 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts @@ -14,8 +14,7 @@ import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-freight-account', templateUrl: './freight-account.component.html', - styleUrls: ['./freight-account.component.less'], - providers: [CurrencyPipe] + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) export class FreightAccountComponent implements OnInit { @ViewChild('st', { static: true }) @@ -29,12 +28,7 @@ export class FreightAccountComponent implements OnInit { _$expand = false; - constructor( - public service: FreightAccountService, - private router: Router, - private modal: NzModalService, - private currencyPipe: CurrencyPipe - ) {} + constructor(public service: FreightAccountService, private router: Router, private modal: NzModalService) {} ngOnInit(): void {} @@ -173,22 +167,23 @@ export class FreightAccountComponent implements OnInit { { title: '可用余额', index: 'availableBalance', - type: 'currency', - format: item => `${this.currencyPipe.transform(item.availableBalance)}` + width: 150, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.availableBalance }) } }, { title: '冻结余额', index: 'freezeBalance', - type: 'currency', - format: item => `${this.currencyPipe.transform(item.availableBalance)}` + width: 150, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.freezeBalance }) } }, { title: '账户总余额', - index: 'description', - className: 'text-right', - type: 'link', - format: item => `${this.currencyPipe.transform(item.availableBalance)}`, - click: item => this.showAccountDetail(item) + render: 'description', + className: 'text-right' }, { title: '创建时间', index: 'createTime', type: 'date', width: 150 }, { diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html index d9a3208b..84980855 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html @@ -12,46 +12,45 @@ 基本信息 - {{ costInfo?.ltdid }} + {{ costInfo?.ltdId }} - {{ costInfo?.feetype }} + {{ costInfo?.brmdate }} - {{ costInfo?.arremarks }} + {{ costInfo?.brmmode }} - {{ costInfo?.artoname }} + {{ costInfo?.banktype }} - {{ costInfo?.arvattype }} + {{ costInfo?.artoname }} - {{ costInfo?.armoeny }} + {{ costInfo?.brmtype }} - {{ costInfo?.arkpmoney }} + {{ costInfo?.ltdaccountId }} - {{ costInfo?.arbrmmoney }} + {{ costInfo?.recnopay |currency }} {{ costInfo?.ltdid }} - {{ costInfo?.feetype }} + {{ costInfo?.brmmoney |currency }} - {{ costInfo?.hrremarks }} - {{ costInfo?.hrtoname }} + {{ costInfo?.bankreceipt }} - {{ costInfo?.hrvattype }} + {{ costInfo?.yskmoney |currency}} - {{ costInfo?.hrmoney }} + {{ costInfo?.remarks }}
@@ -78,9 +77,8 @@ + [req]="{ method: 'POST', allInBody: true, process: beforeReq }" [res]="{ reName: { list: 'data' } }" + [page]="{ show: false }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }"> {{ item.vatnotax | currency}}