+
+
+
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/driver/driver.component.ts b/src/app/routes/usercenter/components/driver/driver.component.ts
index 9e97d181..d903300b 100644
--- a/src/app/routes/usercenter/components/driver/driver.component.ts
+++ b/src/app/routes/usercenter/components/driver/driver.component.ts
@@ -3,21 +3,19 @@ import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { ModalHelper } from '@delon/theme';
-import { DynamicSettingModalComponent } from '@shared';
+import { 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';
import { CarSettleAddDriverComponent } from './add-driver/add-driver.component';
@Component({
selector: 'app-usercenter-components-driver',
- styleUrls: ['./driver.component.less'],
+ styleUrls: ['../../../commom/less/commom-table.less'],
templateUrl: './driver.component.html'
})
-export class UserCenterComponentsDriverComponent implements OnInit {
- _$expand = false;
+export class UserCenterComponentsDriverComponent extends BasicTableComponent implements OnInit {
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
- ui: SFUISchema = { '*': { spanLabelFixed: 130, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } };
schema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
@@ -31,8 +29,15 @@ export class UserCenterComponentsDriverComponent implements OnInit {
private modal: NzModalService,
private router: Router,
private ar: ActivatedRoute,
- private modalHelper: ModalHelper
- ) {}
+ private modalHelper: ModalHelper,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
+
+ search() {
+ this.st?.load(1);
+ }
/**
* 查询参数
@@ -127,18 +132,6 @@ export class UserCenterComponentsDriverComponent implements OnInit {
});
}
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
-
exportList() {
const params = this.reqParams;
this.service.downloadFile(this.service.$api_export_driver, { ...params, pageSize: -1 });
@@ -188,10 +181,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
],
default: '',
ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ widget: 'select'
}
},
practiceSenioritLicenseStatus: {
@@ -206,10 +196,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
],
default: '',
ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ widget: 'select'
}
},
promotersTelephone: {
@@ -217,10 +204,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
type: 'string',
maxLength: 11,
ui: {
- placeholder: '请输入手机号',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入手机号'
}
},
source: {
@@ -234,10 +218,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
],
default: '',
ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ widget: 'select'
}
},
effectiveDate: {
@@ -246,10 +227,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
ui: {
widget: 'date',
mode: 'range',
- format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
}
}
@@ -304,7 +282,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
'-1': { text: '未提交', color: 'default' },
1: { text: '已提交', color: 'processing' },
2: { text: '已通过', color: 'success' },
- 3: { text: '已过期', color: 'error' },
+ 3: { text: '已过期', color: 'error' }
// 10: { text: '待审核', color: 'default' },
// 20: { text: '审核通过', color: 'success' },
// 30: { text: '驳回', color: 'warning' },
diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html
index 5f0d740a..5e2b9238 100644
--- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html
+++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html
@@ -27,7 +27,7 @@