From bfd843de0186f641c371196228165d15e6fa4444 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 15 Feb 2022 15:40:28 +0800 Subject: [PATCH] edit --- .../advance-collection.component.html | 28 ++++ .../advance-collection.component.ts | 156 ++++++++++++++++++ .../financial-managemen-routing.module.ts | 2 + .../financial-management.module.ts | 4 +- .../services/freight-account.service.ts | 3 + 5 files changed, 192 insertions(+), 1 deletion(-) create mode 100644 src/app/routes/financial-management/components/advance-collection/advance-collection.component.html create mode 100644 src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.html b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.html new file mode 100644 index 00000000..500f15f4 --- /dev/null +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.html @@ -0,0 +1,28 @@ + + + + +
+
+ +
+
+ + + + +
+
+ + + + + + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts new file mode 100644 index 00000000..c6beb5c2 --- /dev/null +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts @@ -0,0 +1,156 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st'; +import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component'; +import { FreightAccountService } from '../../services/freight-account.service'; + +@Component({ + selector: 'app-advance-collection', + templateUrl: './advance-collection.component.html', + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] +}) +export class AdvanceCollectionComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + + searchSchema: SFSchema = this.initSF(); + columns: STColumn[] = this.initST(); + _$expand = false; + + constructor(public service: FreightAccountService, private router: Router, private modal: NzModalService) {} + + ngOnInit(): void {} + + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { ...this.sf.value }); + } + return requestOptions; + }; + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + this._$expand = false; + } + + /** + * 伸缩查询条件 + */ + expandToggle() { + this._$expand = !this._$expand; + this.sf?.setValue('/expand', this._$expand); + } + + exportList() { + this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps }); + } + + private initSF(): SFSchema { + return { + properties: { + expand: { + type: 'boolean', + ui: { + hidden: true + } + }, + ltdId: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + asyncData: () => this.service.getNetworkFreightForwarder() + } + }, + cno: { + type: 'string', + title: '结算客户', + ui: { placeholder: '请输入' } + }, + arto: { + type: 'string', + title: '付款人', + ui: { placeholder: '请输入' } + }, + brmtype: { + type: 'string', + title: '收款类型', + enum: [{ label: '全部', value: null }], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + }, + default: null + }, + bankType: { + type: 'string', + title: '银行类型', + enum: [ + { label: '全部', value: null }, + { label: '平安银行', value: '1' }, + { label: '浦发银行', value: '2' } + ], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + }, + default: null + } + } + }; + } + + private initST(): STColumn[] { + return [ + { title: '网络货运人', width: 160, index: 'ltdName' }, + { title: '银行类型', width: 120, index: 'bankTypeLabel' }, + { title: '银行类型', width: 120, index: 'banktype' }, + { title: '收款类型', width: 120, index: 'brmtype' }, + { + title: '预收余额', + index: 'yskmoney', + width: 140, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) } + }, + { title: '付款人', index: 'arto', width: 180 }, + { title: '结算客户', index: 'cno', width: 150 }, + { + title: '操作', + width: 120, + className: 'text-center', + fixed: 'right', + buttons: [ + { + text: '浏览', + click: item => this.router.navigate(['/financial-management/driver-account/detail/' + item.id]) + }, + { + text: '核销', + click: item => this.router.navigate(['/financial-management/driver-account/detail/' + item.id]) + }, + { + text: '退款', + click: item => this.router.navigate(['/financial-management/driver-account/detail/' + item.id]) + } + ] + } + ]; + } +} diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index 583c91d7..a9ecbcd4 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -29,6 +29,7 @@ import { ReceiptOrderDetailComponent } from './components/receipt-order/receipt- import { PaymentOrderDetailComponent } from './components/payment-order/payment-order-detail/payment-order-detail.component'; import { PlatformAccountComponent } from './components/platform-account/platform-account.component'; import { PlatformAccountDetailComponent } from './components/platform-account/platform-account-detail/platform-account-detail.component'; +import { AdvanceCollectionComponent } from './components/advance-collection/advance-collection.component'; const routes: Routes = [ { path: 'freight-account', component: FreightAccountComponent, data: { guard: { ability: ['FINANCIAL-FREIGHT-ACOUNT-list'] } } }, @@ -37,6 +38,7 @@ const routes: Routes = [ { path: 'driver-account/detail/:id', component: DriverAccountDetailComponent }, { path: 'platform-account', component: PlatformAccountComponent }, { path: 'platform-account/detail/:id', component: PlatformAccountDetailComponent }, + { path: 'advance-collection', component: AdvanceCollectionComponent }, { path: 'recharge-record', component: RechargeRecordComponent }, { path: 'withdrawals-record', component: WithdrawalsRecordComponent }, { path: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent }, diff --git a/src/app/routes/financial-management/financial-management.module.ts b/src/app/routes/financial-management/financial-management.module.ts index a61972f6..4f763c64 100644 --- a/src/app/routes/financial-management/financial-management.module.ts +++ b/src/app/routes/financial-management/financial-management.module.ts @@ -32,6 +32,7 @@ import { VoucherListComponent } from './components/voucher-summary/voucher-list/ import { ReceiptOrderDetailComponent } from './components/receipt-order/receipt-order-detail/receipt-order-detail.component'; import { PlatformAccountComponent } from './components/platform-account/platform-account.component'; import { PlatformAccountDetailComponent } from './components/platform-account/platform-account-detail/platform-account-detail.component'; +import { AdvanceCollectionComponent } from './components/advance-collection/advance-collection.component'; const ROUTESCOMPONENTS = [ FreightAccountComponent, @@ -60,7 +61,8 @@ const ROUTESCOMPONENTS = [ PlatformAccountDetailComponent, PaymentOrderDetailComponent, VoucherListComponent, - ReceiptOrderDetailComponent + ReceiptOrderDetailComponent, + AdvanceCollectionComponent ]; const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, ClearingModalComponent]; diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index a62327d7..7dbddb78 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -101,6 +101,9 @@ export class FreightAccountService extends ShipperBaseService { // 下载银行回单请求 $api_download_receipt_apply = '/api/fcc/spd/callback/receiptApply'; + // 查询预收款余额 + $api_get_advance_collection_page = '/api/fcc/ficoYskBla/list/page'; + constructor(public injector: Injector, public eaCacheSrv: EACacheService) { super(injector, eaCacheSrv); }