diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html
index f62797c1..c7f1462b 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.html
+++ b/src/app/routes/usercenter/components/freight/list/list.component.html
@@ -1,18 +1,6 @@
-
-
+
-
-
-
-
-
+ -->
+
+
+
+
+
@@ -78,11 +91,11 @@
-
+
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts
index d7d5860c..68658f98 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -2,8 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STChange, STColumn, STColumnBadge, STComponent, STData, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
-import { DynamicSettingModalComponent, ShipperBaseService } from '@shared';
+import { DynamicSettingModalComponent, SearchDrawerService, ShipperBaseService } 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';
import { EditPartnerComponentsAddComponent } from './editPartner/editPartner.component';
@@ -12,15 +13,11 @@ import { ShowServiceComponent } from './showService/showservice.component';
@Component({
selector: 'app-Freight-components-list',
templateUrl: './list.component.html',
- styleUrls: ['../../../../commom/less/expend-but.less']
+ styleUrls: ['../../../../commom/less/commom-table.less']
})
-export class FreightComponentsListComponent implements OnInit {
- _$expand = false;
- ui!: SFUISchema;
- schema!: SFSchema;
+export class FreightComponentsListComponent extends BasicTableComponent implements OnInit {
columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('promoterModal', { static: false })
promoterModal!: any;
@@ -32,8 +29,11 @@ export class FreightComponentsListComponent implements OnInit {
private modal: NzModalService,
private router: Router,
private ar: ActivatedRoute,
- public shipperservice: ShipperBaseService
- ) {}
+ public shipperservice: ShipperBaseService,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
ngOnInit() {
this.initSF();
@@ -43,6 +43,10 @@ export class FreightComponentsListComponent implements OnInit {
});
}
+ search() {
+ this.st?.load(1);
+ }
+
beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, { listSource: 1 });
if (this.sf) {
@@ -129,9 +133,9 @@ export class FreightComponentsListComponent implements OnInit {
return this.st?.list.filter(item => item.checked) || [];
}
editPartner(record?: any) {
- let status = 1
- if(record) {
- status = 2
+ let status = 1;
+ if (record) {
+ status = 2;
}
if (this.selectedRows.length <= 0 && !record) {
this.service.msgSrv.error('请选择订单！');
@@ -159,9 +163,9 @@ export class FreightComponentsListComponent implements OnInit {
});
}
editSale(record?: any) {
- let status = 1
- if(record) {
- status = 2
+ let status = 1;
+ if (record) {
+ status = 2;
}
if (this.selectedRows.length <= 0 && !record) {
this.service.msgSrv.error('请选择订单！');
@@ -237,10 +241,7 @@ export class FreightComponentsListComponent implements OnInit {
enum: [{ label: '全部', value: '' }],
default: '',
ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ widget: 'select'
}
},
oftenUsedServices: {
@@ -253,10 +254,7 @@ export class FreightComponentsListComponent implements OnInit {
],
default: '',
ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ widget: 'select'
}
},
customerType: {
@@ -269,10 +267,7 @@ export class FreightComponentsListComponent implements OnInit {
],
default: '',
ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ widget: 'select'
}
},
promotersTelephone: {
@@ -280,10 +275,7 @@ export class FreightComponentsListComponent implements OnInit {
type: 'string',
ui: {
placeholder: '请输入',
- showRequired: false,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ showRequired: false
}
},
partnerNamee: {
@@ -291,10 +283,7 @@ export class FreightComponentsListComponent implements OnInit {
type: 'string',
ui: {
placeholder: '请输入',
- showRequired: false,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ showRequired: false
}
},
customerServiceId: {
@@ -302,10 +291,7 @@ export class FreightComponentsListComponent implements OnInit {
type: 'string',
ui: {
placeholder: '请输入',
- showRequired: false,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ showRequired: false
}
},
approvalUserName: {
@@ -313,10 +299,7 @@ export class FreightComponentsListComponent implements OnInit {
type: 'string',
ui: {
placeholder: '请输入',
- showRequired: false,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ showRequired: false
}
},
createTime: {
@@ -325,10 +308,7 @@ export class FreightComponentsListComponent implements OnInit {
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd HH:mm:ss',
- nzShowTime: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ nzShowTime: true
} as SFDateWidgetSchema
},
approvalTime: {
@@ -337,10 +317,7 @@ export class FreightComponentsListComponent implements OnInit {
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd HH:mm:ss',
- nzShowTime: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ nzShowTime: true
} as SFDateWidgetSchema
},
lockedStatus: {
@@ -353,10 +330,7 @@ export class FreightComponentsListComponent implements OnInit {
],
default: '',
ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ widget: 'select'
}
},
source: {
@@ -369,10 +343,7 @@ export class FreightComponentsListComponent implements OnInit {
],
default: '',
ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ widget: 'select'
}
},
isExpired: {
@@ -385,10 +356,7 @@ export class FreightComponentsListComponent implements OnInit {
],
default: '',
ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ widget: 'select'
}
},
networkTransporter: {
@@ -398,15 +366,11 @@ export class FreightComponentsListComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
- visibleIf: {
- expand: (value: boolean) => value
- }
+ asyncData: () => this.shipperservice.getNetworkFreightForwarder()
}
}
}
};
- this.ui = { '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } };
}
initST() {
@@ -543,10 +507,6 @@ export class FreightComponentsListComponent implements OnInit {
});
}
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
creat() {
this.router.navigate(['./new'], { relativeTo: this.ar });
}
@@ -566,7 +526,6 @@ export class FreightComponentsListComponent implements OnInit {
*/
resetSF() {
this.sf.reset();
- this._$expand = false;
this.st.reload();
}
}
diff --git a/src/app/shared/components/search-drawer/search-drawer.component.html b/src/app/shared/components/search-drawer/search-drawer.component.html
index 2822fe11..e80aea74 100644
--- a/src/app/shared/components/search-drawer/search-drawer.component.html
+++ b/src/app/shared/components/search-drawer/search-drawer.component.html
@@ -9,7 +9,8 @@
diff --git a/src/app/shared/components/search-drawer/search-drawer.component.ts b/src/app/shared/components/search-drawer/search-drawer.component.ts
index 52a15e2f..f424f093 100644
--- a/src/app/shared/components/search-drawer/search-drawer.component.ts
+++ b/src/app/shared/components/search-drawer/search-drawer.component.ts
@@ -1,5 +1,6 @@
import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
import { Subject } from 'rxjs';
import { SearchDrawerService } from './search-drawer.service';
@@ -17,7 +18,7 @@ export class SearchDrawerComponent implements OnInit, AfterViewInit {
defaultValue = {};
- constructor(public service: SearchDrawerService) {}
+ constructor(public service: SearchDrawerService, public http: _HttpClient) {}
ngAfterViewInit(): void {}
ngOnInit(): void {