-
-
-
-
-
-
-
-
+
+
-
-
+ [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/receivable-order/receivable-order.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
index 19007ae6..c27928e7 100644
--- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
+++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
@@ -3,25 +3,22 @@ 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 { TicketService } from 'src/app/routes/ticket-management/services/ticket.service';
import { FreightAccountService } from '../../services/freight-account.service';
@Component({
selector: 'app-receivable-order',
templateUrl: './receivable-order.component.html',
- styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'],
- providers: [CurrencyPipe]
+ styleUrls: ['../../../commom/less/commom-table.less','../../../commom/less/common-table-bar.less']
})
-export class ReceivableOrderComponent implements OnInit {
+export class ReceivableOrderComponent 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[] = [];
@@ -30,10 +27,15 @@ export class ReceivableOrderComponent implements OnInit {
public service: FreightAccountService,
private nzModalService: NzModalService,
private router: Router,
- private currencyPipe: CurrencyPipe
- ) {}
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
- ngOnInit(): void {
+ ngOnInit(): void {}
+
+ search() {
+ this.st?.load(1);
}
loadInfo() {
@@ -78,21 +80,6 @@ export class ReceivableOrderComponent implements OnInit {
}
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
-
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
private initSF(): SFSchema {
return {
@@ -135,9 +122,6 @@ export class ReceivableOrderComponent implements OnInit {
widget: 'dict-select',
params: { dictKey: 'driverrecord:receive:type' },
placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
}
},
arvattype: {
@@ -147,9 +131,6 @@ export class ReceivableOrderComponent implements OnInit {
widget: 'dict-select',
params: { dictKey: 'pay:type' },
placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
}
},
cno: {
@@ -160,9 +141,6 @@ export class ReceivableOrderComponent implements OnInit {
placeholder: '请选择',
allowClear: true,
asyncData: () => this.service.getCloseAccount(),
- visibleIf: {
- expand: (value: boolean) => value
- }
}
},
arto: {
@@ -175,9 +153,6 @@ export class ReceivableOrderComponent implements OnInit {
searchLoadingText: '搜索中...',
allowClear: true,
onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
- visibleIf: {
- expand: (value: boolean) => value
- }
}
},
sts: {
@@ -190,9 +165,7 @@ export class ReceivableOrderComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+
}
},
banktype: {
@@ -206,9 +179,7 @@ export class ReceivableOrderComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+
},
default: ''
},
@@ -218,9 +189,7 @@ export class ReceivableOrderComponent implements OnInit {
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
+
} as SFDateWidgetSchema
},
createTime: {
@@ -229,9 +198,6 @@ export class ReceivableOrderComponent implements OnInit {
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
} as SFDateWidgetSchema
},
billHCode: {
@@ -239,9 +205,6 @@ export class ReceivableOrderComponent implements OnInit {
title: '订单号',
ui: {
placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
}
},
// orderS3: {
@@ -260,9 +223,6 @@ export class ReceivableOrderComponent implements OnInit {
ui: {
autocomplete: 'off',
placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
}
}
}
@@ -282,15 +242,17 @@ export class ReceivableOrderComponent implements OnInit {
title: '核销金额',
index: 'ahxmoney',
width: 140,
+ type: 'widget',
className: 'text-right',
- format: item => `${this.currencyPipe.transform(item.ahxmoney)}`
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ahxmoney }) }
},
{
title: '应收金额',
index: 'armoney',
width: 140,
+ type: 'widget',
className: 'text-right',
- format: item => `${this.currencyPipe.transform(item.armoney)}`
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.armoney }) }
},
{ title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 },
{ title: '收款类型', index: 'arvattype', type: 'enum', enum: { '1': '费用款项' }, width: 120 },
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 7cdee930..07e9f0d6 100644
--- a/src/app/routes/financial-management/financial-managemen-routing.module.ts
+++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts
@@ -64,8 +64,12 @@ const routes: Routes = [
{ path: 'voucher-summary/detail/:id', component: SummaryDetailComponent },
{ path: 'voucher-summary/list/:id', component: VoucherListComponent },
{ path: 'voucher-summary/list/detail/:id', component: VoucherDetailComponent },
- { path: 'cost-management', component: CostManagementComponent },
- { path: 'cost-management/detail/:id', component: CostManagementDetailComponent },
+ { path: 'cost-management', component: CostManagementComponent, data: { guard: { ability: ['FINANCIAL-COST-list'] } } },
+ {
+ path: 'cost-management/detail/:id',
+ component: CostManagementDetailComponent,
+ data: { guard: { ability: ['FINANCIAL-COST-DETAIL-view'] } }
+ },
{ path: 'cost-management/expenses-receivable/:id', component: ExpensesReceivableComponent },
{ path: 'cost-management/expenses-payable/:id', component: ExpensesPayableComponent },
{ path: 'abnormal-gold', component: AbnormalGoldComponent },
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
index 43781ffc..f97c7974 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@@ -128,7 +128,7 @@