-
+
+ [loading]="false" [scroll]="{ x:'1200px',y:scrollY }" (change)="stChange($event)">
\ No newline at end of file
diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
index 21a19041..f096e39d 100644
--- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
+++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
@@ -2,7 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { AddCollectionInvoiceModalComponent } from 'src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component';
import { TicketService } from 'src/app/routes/ticket-management/services/ticket.service';
import { FreightAccountService } from '../../services/freight-account.service';
@@ -10,23 +12,30 @@ import { FreightAccountService } from '../../services/freight-account.service';
@Component({
selector: 'app-payment-order',
templateUrl: './payment-order.component.html',
- styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class PaymentOrderComponent implements OnInit {
+export class PaymentOrderComponent extends BasicTableComponent implements OnInit {
@ViewChild('st', { static: true })
st!: STComponent;
- @ViewChild('sf', { static: false })
- sf!: SFComponent;
columns: STColumn[] = this.initST();
- searchSchema: SFSchema = this.initSF();
-
- _$expand = false;
+ schema: SFSchema = this.initSF();
selectedRows: any[] = [];
- constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+ constructor(
+ public service: FreightAccountService,
+ private nzModalService: NzModalService,
+ private router: Router,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
ngOnInit(): void {}
+ search() {
+ this.st?.load(1);
+ }
+
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
let params = { ...this.sf.value };
@@ -68,31 +77,9 @@ export class PaymentOrderComponent implements OnInit {
});
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
-
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
-
private initSF(): SFSchema {
return {
properties: {
- expand: {
- type: 'boolean',
- ui: {
- hidden: true
- }
- },
paycode: {
type: 'string',
title: '付款单号'
@@ -135,10 +122,7 @@ export class PaymentOrderComponent implements OnInit {
widget: 'dict-select',
containsAllLabel: true,
params: { dictKey: 'pay:mode' },
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
}
},
arto: {
@@ -147,10 +131,7 @@ export class PaymentOrderComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
- allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ allowClear: true
}
},
billCode: {
@@ -159,10 +140,7 @@ export class PaymentOrderComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
- allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ allowClear: true
}
},
payDate: {
@@ -170,10 +148,7 @@ export class PaymentOrderComponent implements OnInit {
type: 'string',
ui: {
widget: 'sl-from-to-search',
- format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
payDate2: {
@@ -181,20 +156,12 @@ export class PaymentOrderComponent implements OnInit {
type: 'string',
ui: {
widget: 'sl-from-to-search',
- format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
waybillCode: {
type: 'string',
- title: '运单号',
- ui: {
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
+ title: '运单号'
},
// feeCode: {
// type: 'string',
@@ -210,20 +177,14 @@ export class PaymentOrderComponent implements OnInit {
type: 'string',
ui: {
widget: 'sl-from-to-search',
- format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
payRemarks: {
type: 'string',
title: '付款备注',
ui: {
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
}
}
}
@@ -233,9 +194,9 @@ export class PaymentOrderComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox', fixed: 'left', className: 'text-center' },
- { title: '付款单号', index: 'payCode', type: 'link', width: 180 },
- { title: '网络货运人', index: 'ltdName', width: 180 },
- { title: '运单号', index: 'waybillCode', width: 180 },
+ { title: '付款单号', index: 'payCode', className: 'text-left', type: 'link', width: 180 },
+ { title: '网络货运人', index: 'ltdName', className: 'text-left', width: 180 },
+ { title: '运单号', index: 'waybillCode', className: 'text-left', width: 180 },
// { title: '费用号', index: 'feeCode', width: 180 },
{ title: '要求付款日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
{
diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.html b/src/app/routes/financial-management/components/payment-record/payment-record.component.html
index ecea67f6..a609c79b 100644
--- a/src/app/routes/financial-management/components/payment-record/payment-record.component.html
+++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.html
@@ -1,14 +1,4 @@
-
-
+
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
{{ item?.orderPaymentCode }}
{{ item?.paymentStatusLabel }}
diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.less b/src/app/routes/financial-management/components/payment-record/payment-record.component.less
deleted file mode 100644
index cd8c3436..00000000
--- a/src/app/routes/financial-management/components/payment-record/payment-record.component.less
+++ /dev/null
@@ -1,41 +0,0 @@
-:host::ng-deep {
- .search-box {
- .ant-card-body {
- padding-bottom: 18px;
- }
- }
-
- .content-box {
- .ant-card-body {
- padding-top: 0;
- }
- }
-
- nz-range-picker {
- width: 100%;
- }
-
- .ant-tabs-tab-btn {
- padding-left : 16px;
- padding-right: 16px;
- }
-
- .text-truncate {
- white-space: normal;
- }
-}
-
-.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/payment-record/payment-record.component.ts b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts
index 1442d8fd..8acbf17f 100644
--- a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts
+++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts
@@ -2,31 +2,39 @@ 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 { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { FreightAccountService } from '../../services/freight-account.service';
import { ClearingModalComponent } from '../abnormal-gold/clearing-modal/clearing-modal.component';
@Component({
selector: 'app-payment-record',
templateUrl: './payment-record.component.html',
- styleUrls: ['./payment-record.component.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class PaymentRecordComponent implements OnInit {
+export class PaymentRecordComponent extends BasicTableComponent implements OnInit {
@ViewChild('st', { static: true })
st!: STComponent;
- @ViewChild('sf', { static: false })
- sf!: SFComponent;
columns: STColumn[] = this.initST();
- searchSchema: SFSchema = this.initSF();
-
- _$expand = false;
+ schema: SFSchema = this.initSF();
paymentStatus: any = '';
- constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+ constructor(
+ public service: FreightAccountService,
+ private nzModalService: NzModalService,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
ngOnInit(): void {}
+ search() {
+ this.st?.load(1);
+ }
+
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
@@ -38,10 +46,10 @@ export class PaymentRecordComponent implements OnInit {
handlerDate: {
start: this.sf.value.handlerDate?.[0] || '',
end: this.sf.value.handlerDate?.[1] || ''
- },
- paymentStatus: this.paymentStatus || null
+ }
});
}
+ Object.assign(requestOptions.body, { paymentStatus: this.paymentStatus || null });
return requestOptions;
};
@@ -57,22 +65,6 @@ export class PaymentRecordComponent implements OnInit {
});
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
-
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
-
private initSF(): SFSchema {
return {
properties: {
@@ -109,10 +101,7 @@ export class PaymentRecordComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'service:type' },
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
},
default: ''
},
@@ -120,46 +109,34 @@ export class PaymentRecordComponent implements OnInit {
type: 'string',
title: '承运司机',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
},
driverLicensePlate: {
type: 'string',
title: '车牌号',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
},
captain: {
type: 'string',
title: '收款人',
ui: {
- placeholder: '请输入收款人姓名/手机号',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入收款人姓名/手机号'
}
},
isCaptain: {
type: 'string',
title: '车队长收款',
enum: [
- {label: '全部', value: ''},
- {label: '是', value: '1'},
- {label: '否', value: '2'}
+ { label: '全部', value: '' },
+ { label: '是', value: '1' },
+ { label: '否', value: '2' }
],
ui: {
widget: 'select',
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
},
default: ''
},
@@ -169,10 +146,7 @@ export class PaymentRecordComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'paybill:type' },
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
},
default: ''
},
@@ -183,10 +157,7 @@ export class PaymentRecordComponent implements OnInit {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
placeholder: '请选择',
- nzShowTime: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ nzShowTime: true
} as SFDateWidgetSchema
},
handlerDate: {
@@ -196,10 +167,7 @@ export class PaymentRecordComponent implements OnInit {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
placeholder: '请选择',
- nzShowTime: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ nzShowTime: true
} as SFDateWidgetSchema
},
bankType: {
@@ -212,10 +180,7 @@ export class PaymentRecordComponent implements OnInit {
],
ui: {
widget: 'select',
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
},
default: ''
},
@@ -226,10 +191,7 @@ export class PaymentRecordComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- asyncData: () => this.service.getNetworkFreightForwarder(),
- visibleIf: {
- expand: (value: boolean) => value
- }
+ asyncData: () => this.service.getNetworkFreightForwarder()
}
}
}
diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
index 43e46e5b..d2e4b20c 100644
--- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
@@ -119,7 +119,7 @@ export class PlatformAccountDetailComponent implements OnInit {
nzShowTime: true
} as SFDateWidgetSchema
},
- businessNumber: {
+ channelPaySn: {
type: 'string',
title: '流水号',
ui: {
diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html
index 58f7732c..47ffbda4 100644
--- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html
+++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html
@@ -1,14 +1,4 @@
-
-
+
+
+