diff --git a/src/app/routes/commom/less/basic-board.less b/src/app/routes/commom/less/basic-board.less new file mode 100644 index 00000000..84354724 --- /dev/null +++ b/src/app/routes/commom/less/basic-board.less @@ -0,0 +1,5 @@ +:host::ng-deep { + .ant-form-item { + margin-bottom: 0; + } +} \ No newline at end of file diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html new file mode 100644 index 00000000..336c1d58 --- /dev/null +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html @@ -0,0 +1,83 @@ + + + + + + + +
+
+ + 基本信息 + + {{ costInfo?.ltdId }} + + + {{ costInfo?.brmdate }} + + + {{ costInfo?.brmModeLabel }} + + + {{ costInfo?.banktypeLabel }} + + + {{ costInfo?.artoname }} + + + {{ costInfo?.recnopay |currency }} + + + {{ costInfo?.ltdaccountId }} + + +
+
+ + + + + +
+
+ +
+
+ + +
+
+ + + {{index+1}} + + + + +
+
+ +
+
+ + +
+
+ + + {{index+1}} + + + + + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts new file mode 100644 index 00000000..3d627fe1 --- /dev/null +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts @@ -0,0 +1,150 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form'; +import { FreightAccountService } from '../../../services/freight-account.service'; + +@Component({ + selector: 'app-advance-collection-detail', + templateUrl: './advance-collection-detail.component.html', + styleUrls: ['../../../../commom/less/box.less', '../../../../commom/less/basic-board.less'] +}) +export class AdvanceCollectionDetailComponent implements OnInit { + @ViewChild('inputST', { static: true }) + inputST!: STComponent; + columns: { [key: string]: STColumn[] } = this.initST(); + @ViewChild('infoST', { static: true }) + infoST!: STComponent; + costInfo: any = {}; + id: any = null; + + @ViewChild('sf', { static: false }) + inputSF!: SFComponent; + @ViewChild('sf', { static: false }) + infoSF!: SFComponent; + inputSearchSchema: SFSchema = this.initInputSF(); + infoSearchSchema: SFSchema = this.initInfoSF(); + constructor(public service: FreightAccountService, private route: ActivatedRoute) { + this.id = route.snapshot.params.id; + this.loadDetail(this.id); + } + + ngOnInit(): void {} + + beforeReq = (requestOptions: STRequestOptions) => { + Object.assign(requestOptions.body, { + id: this.id + }); + return requestOptions; + }; + + loadDetail(id: any) { + this.service.request(this.service.$api_get_receipt_header, { id }).subscribe(res => { + if (res) { + this.costInfo = res; + } + }); + } + + /** + * 重置表单 + */ + resetInputSF() { + this.inputSF.reset(); + } + /** + * 重置表单 + */ + resetInfoSF() { + this.infoSF.reset(); + } + + goBack() { + history.go(-1); + } + + private initInputSF(): SFSchema { + return { + properties: { + feedate: { + title: '到账日期', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema + }, + billHCode: { + type: 'string', + title: '收款单号', + ui: { + placeholder: '请输入' + } + } + } + }; + } + + private initInfoSF(): SFSchema { + return { + properties: { + feedate: { + title: '核销日期', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema + }, + billHCode: { + type: 'string', + title: '核销单号', + ui: { + placeholder: '请输入' + } + } + } + }; + } + + private initST(): { [key: string]: STColumn[] } { + return { + input: [ + { title: '序号', render: 'no', width: 70, className: 'text-left' }, + { title: '收款单号', index: 'feeHId', className: 'text-left', width: 200 }, + { title: '到账日期', index: 'billHId', className: 'text-center', width: 150 }, + { + title: '到账金额', + index: 'hrvatrate', + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }, + width: 140 + }, + { + title: '转预收金额', + index: 'hrvatrate', + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }, + width: 140 + }, + { title: '预收备注', index: 'callNo', width: 200 } + ], + info: [ + { title: '序号', render: 'no', width: 70, className: 'text-left' }, + { title: '核销单号', index: 'cnoName', className: 'text-left', width: 200 }, + { title: '核销日期', index: 'billHId', className: 'text-center', width: 150 }, + { + title: '核销金额', + index: 'yskmoney', + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }, + width: 200 + }, + { title: '核销备注', index: 'vatapptype', className: 'text-left', width: 200 } + ] + }; + } +} 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 index c6beb5c2..cb7e3c37 100644 --- 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 @@ -119,7 +119,7 @@ export class AdvanceCollectionComponent implements OnInit { return [ { title: '网络货运人', width: 160, index: 'ltdName' }, { title: '银行类型', width: 120, index: 'bankTypeLabel' }, - { title: '银行类型', width: 120, index: 'banktype' }, + { title: '收款账户', width: 120, index: 'ltdaccountId' }, { title: '收款类型', width: 120, index: 'brmtype' }, { title: '预收余额', @@ -139,15 +139,13 @@ export class AdvanceCollectionComponent implements OnInit { buttons: [ { text: '浏览', - click: item => this.router.navigate(['/financial-management/driver-account/detail/' + item.id]) + click: item => this.router.navigate(['/financial-management/advance-collection/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 a9ecbcd4..bcef4941 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -30,6 +30,7 @@ import { PaymentOrderDetailComponent } from './components/payment-order/payment- 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'; +import { AdvanceCollectionDetailComponent } from './components/advance-collection/advance-collection-detail/advance-collection-detail.component'; const routes: Routes = [ { path: 'freight-account', component: FreightAccountComponent, data: { guard: { ability: ['FINANCIAL-FREIGHT-ACOUNT-list'] } } }, @@ -38,7 +39,6 @@ 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 }, @@ -59,6 +59,8 @@ const routes: Routes = [ { path: 'payment-order/detail/:id', component: PaymentOrderDetailComponent }, { path: 'receipt-order', component: ReceiptOrderComponent }, { path: 'receipt-order/detail/:id', component: ReceiptOrderDetailComponent }, + { path: 'advance-collection', component: AdvanceCollectionComponent }, + { path: 'advance-collection/detail/:id', component: AdvanceCollectionDetailComponent }, { path: 'receivable-order', component: ReceivableOrderComponent }, { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent }, { path: 'payable-order', component: PayableOrderComponent }, diff --git a/src/app/routes/financial-management/financial-management.module.ts b/src/app/routes/financial-management/financial-management.module.ts index 4f763c64..1da0af17 100644 --- a/src/app/routes/financial-management/financial-management.module.ts +++ b/src/app/routes/financial-management/financial-management.module.ts @@ -33,6 +33,7 @@ import { ReceiptOrderDetailComponent } from './components/receipt-order/receipt- 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'; +import { AdvanceCollectionDetailComponent } from './components/advance-collection/advance-collection-detail/advance-collection-detail.component'; const ROUTESCOMPONENTS = [ FreightAccountComponent, @@ -62,7 +63,8 @@ const ROUTESCOMPONENTS = [ PaymentOrderDetailComponent, VoucherListComponent, ReceiptOrderDetailComponent, - AdvanceCollectionComponent + AdvanceCollectionComponent, + AdvanceCollectionDetailComponent ]; const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, ClearingModalComponent];