diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html
index e590f998..12b02806 100644
--- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html
+++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html
@@ -1,16 +1,5 @@
-
-
+
-
-
+ -->
+
+
+
+
diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
index 26add0e2..9574f30a 100644
--- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
+++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
@@ -2,21 +2,21 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { STColumn, STComponent, STRequestOptions, STData, STChange } from '@delon/abc/st';
import { SFUISchema, SFSchema, SFComponent, SFDateWidgetSchema } from '@delon/form';
-import { ShipperBaseService, DynamicSettingModalComponent } from '@shared';
+import { ShipperBaseService, DynamicSettingModalComponent, SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
import { UsermanageService } from '../../../services/usercenter.service';
@Component({
selector: 'app-freight-config',
templateUrl: './freight-config.component.html',
- styleUrls: ['../../../../commom/less/box.less', '../../../../commom/less/expend-but.less']
+ styleUrls: ['../../../../commom/less/commom-table.less']
})
-export class FreightConfigComponent implements OnInit {
+export class FreightConfigComponent extends BasicTableComponent implements OnInit {
schema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
selectedRows: any[] = [];
@ViewChild('IWModal', { static: false })
@@ -27,8 +27,18 @@ export class FreightConfigComponent implements OnInit {
roles: any = [];
networkTransporter = null;
roleId = null;
- _$expand = false;
- constructor(public service: UsermanageService, private modal: NzModalService, public shipperservice: ShipperBaseService) {}
+ constructor(
+ public service: UsermanageService,
+ private modal: NzModalService,
+ public shipperservice: ShipperBaseService,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
+
+ search() {
+ this.st?.load(1);
+ }
ngOnInit() {
this.initST();
@@ -191,21 +201,6 @@ export class FreightConfigComponent implements OnInit {
});
}
- /**
- * 伸缩查询条件
- */
- expandToggle(): void {
- this._$expand = !this._$expand;
- this.sf?.setValue('/_$expand', this._$expand);
- }
- /**
- * 重置表单
- */
- resetSF(): void {
- this.sf.reset();
- this._$expand = false;
- }
-
private initSF(): SFSchema {
return {
properties: {
@@ -235,7 +230,7 @@ export class FreightConfigComponent implements OnInit {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
placeholder: '请选择',
- nzShowTime: true,
+ nzShowTime: true
} as SFDateWidgetSchema
}
}
diff --git a/src/app/routes/usercenter/usercenter-routing.module.ts b/src/app/routes/usercenter/usercenter-routing.module.ts
index 5cbf597a..53be222d 100644
--- a/src/app/routes/usercenter/usercenter-routing.module.ts
+++ b/src/app/routes/usercenter/usercenter-routing.module.ts
@@ -44,7 +44,8 @@ const routes: Routes = [
},
{
path: 'freight/config',
- component: FreightConfigComponent
+ component: FreightConfigComponent,
+ data: { guard: { ability: ['USERCENTER-FREIGHT-CONFIG-list'] } }
},
{ path: 'freight/user', component: FreightComponentsUserComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-USER-list'] } } },
{