diff --git a/src/app/global-config.module.ts b/src/app/global-config.module.ts
index af9999b1..faeed3b0 100644
--- a/src/app/global-config.module.ts
+++ b/src/app/global-config.module.ts
@@ -15,7 +15,8 @@ const alainConfig: AlainConfig = {
req: { method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' } },
res: { reName: { list: 'data.records', total: 'data.total' } },
page: { show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000], toTop: false },
- modal: { size: 'lg' }
+ modal: { size: 'lg' },
+ ps: 20
},
sf: { button: { search: '查询' } },
pageHeader: { homeI18n: 'home', recursiveBreadcrumb: true },
@@ -27,7 +28,7 @@ const alainConfig: AlainConfig = {
'https://gw.alipayobjects.com/os/lib/antv/g2/4.1.4/dist/g2.min.js',
'https://gw.alipayobjects.com/os/lib/antv/data-set/0.11.7/dist/data-set.js'
]
- },
+ }
};
const alainModules = [AlainThemeModule.forRoot(), DelonACLModule.forRoot()];
diff --git a/src/app/routes/commom/components/basic-table/basic-table.component.ts b/src/app/routes/commom/components/basic-table/basic-table.component.ts
index f3645ebf..bba6995f 100644
--- a/src/app/routes/commom/components/basic-table/basic-table.component.ts
+++ b/src/app/routes/commom/components/basic-table/basic-table.component.ts
@@ -4,6 +4,23 @@ import { SearchDrawerService } from '@shared';
import { fromEvent, Subscription } from 'rxjs';
import { debounceTime } from 'rxjs/operators';
+/**
+ * 列表基础组件
+ * 功能:
+ * 1、计算列表滚动高度(scrollY)
+ * 实现:
+ * 1、列表组件需继承BasicTableComponent,并且提供SearchDrawerService派生类
+ * 2、引入commom-table.less 样式文件
+ * 3、列表使用table-box class包裹。组件会自动减去layout-pro-header、page-header-wrapper和nz-tabs-nav标签的高度,以及header_box和height_box class的高度,最后减去deviationHeight的偏移高度
+ * 2、提供筛选抽屉,并返回sf实例(sf)
+ * 实现:
+ * 1、列表组件需继承BasicTableComponent,并且提供SearchDrawerService派生类
+ * 2、实例化schema,及给schema赋值sf配置
+ * 3、重写search()方法。当筛选抽屉触发查询时会调用这个方法
+ * 提供:
+ * 1、抽屉的sf实例
+ * 2、sf.value的数据=>sfValue
+ */
@Component({
template: ''
})
diff --git a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
index 0e8b40a9..bbc32cbc 100644
--- a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
+++ b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
@@ -36,10 +36,39 @@
-
-
-
- 个人信息
+
+
+
+
+
+
个人信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 银行结算信息(暂无银行信息)
-
-
- {{ item.bankName }}
-
-
- {{ item?.bankCardNumber }}
-
-
+
+
+
+
+
+
+ {{ item.bankName }}
+
+
+ {{ item?.bankCardNumber }}
+
+
-
+
+
@@ -147,4 +185,4 @@
-
\ No newline at end of file
+
diff --git a/src/app/routes/usercenter/components/driver/captain/captain.component.html b/src/app/routes/usercenter/components/driver/captain/captain.component.html
index 35a6123f..d05fe6c7 100644
--- a/src/app/routes/usercenter/components/driver/captain/captain.component.html
+++ b/src/app/routes/usercenter/components/driver/captain/captain.component.html
@@ -1,39 +1,14 @@
-
-
-
+
-
-
-
+
+
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/driver/captain/captain.component.less b/src/app/routes/usercenter/components/driver/captain/captain.component.less
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/app/routes/usercenter/components/driver/captain/captain.component.ts b/src/app/routes/usercenter/components/driver/captain/captain.component.ts
index bf8cbf37..d197169b 100644
--- a/src/app/routes/usercenter/components/driver/captain/captain.component.ts
+++ b/src/app/routes/usercenter/components/driver/captain/captain.component.ts
@@ -3,29 +3,39 @@ import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
import { SFComponent, 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 { UsermanageService } from '../../../services/usercenter.service';
import { CtcCaptatinAddComponent } from './add/add.component';
@Component({
selector: 'app-usercenter-components-driver-captain',
templateUrl: './captain.component.html',
- styleUrls: ['./captain.component.less']
+ styleUrls: ['../../../../commom/less/commom-table.less']
})
-export class UserCenterComponentsDriverCaptainComponent implements OnInit {
- _$expand = false;
-
- ui: SFUISchema = { '*': { spanLabelFixed: 120, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } };
+export class UserCenterComponentsDriverCaptainComponent extends BasicTableComponent implements OnInit {
schema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('promoterModal', { static: false })
promoterModal!: any;
promotersTelephone = '';
- constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper,) {}
+ constructor(
+ public service: UsermanageService,
+ private modal: NzModalService,
+ private router: Router,
+ private ar: ActivatedRoute,
+ private modalHelper: ModalHelper,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
+
+ search() {
+ this.st?.load(1);
+ }
/**
* 查询参数
@@ -98,22 +108,9 @@ export class UserCenterComponentsDriverCaptainComponent 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_cap, {...params, pageSize: -1});
+ this.service.downloadFile(this.service.$api_export_driver_cap, { ...params, pageSize: -1 });
}
private initSF(): SFSchema {
@@ -146,10 +143,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
type: 'string',
maxLength: 11,
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
},
identityStatus: {
@@ -163,10 +157,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
],
default: '',
ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ widget: 'select'
}
},
source: {
@@ -176,14 +167,11 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
{ label: '全部', value: '' },
{ label: '用户注册', value: 1 },
{ label: '货主添加', value: 2 },
- { label: '运营添加', value: 3 },
+ { label: '运营添加', value: 3 }
],
default: '',
ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ widget: 'select'
}
}
}
@@ -209,7 +197,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
}
},
{ title: '推广业务员', className: 'text-center', render: 'promotersTelephone' },
- { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' , 3: '运营添加'} },
+ { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加', 3: '运营添加' } },
{ title: '注册时间', className: 'text-center', index: 'createTime' },
{
title: '操作',
@@ -222,7 +210,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
this.router.navigate(['/usercenter/driver/captain/detail', item.appUserId]);
},
acl: { ability: ['USERCENTER-DRIVER-CAPTAIN-view'] }
- },
+ }
// {
// text: '基础设置',
// click: item => this.settingAction(item),
diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html
index 46f78375..9add6b62 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html
@@ -39,10 +39,60 @@
-
-
-
- 个人信息
+
+
+
+
+
+
个人信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- 驾驶证信息
+
+
+
+
+
驾驶证信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{driverDetail.signingOrganization}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{driverDetail.signingOrganization}}
+
+
+
+
+
+
+
+
+
+
+
+
+
从业资格证信息
+
+
+
- 从业资格证信息
+
@@ -262,73 +356,95 @@
-
-
- 载具信息
-
-
- {{ carDatail?.carNo }}
-
-
- {{ carDatail?.carNoColorLabel }}
-
-
- {{ carDatail?.carModelLabel }}
-
-
- {{ carDatail?.carLengthLabel ? carDatail?.carLengthLabel +'米' :'' }}
-
-
- {{ carDatail?.isDefault?'是':'否' }}
-
-
- {{ carDatail?.isSelf?'否':'是' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ carDatail?.carNo }}
+
+
+ {{ carDatail?.carNoColorLabel }}
+
+
+ {{ carDatail?.carModelLabel }}
+
+
+ {{ carDatail?.carLengthLabel ? carDatail?.carLengthLabel +'米' :'' }}
+
+
+ {{ carDatail?.isDefault?'是':'否' }}
+
+
+ {{ carDatail?.isSelf?'否':'是' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
- 银行结算信息 (暂无银行信息)
-
-
-
- {{ item.bankName }}
-
-
- {{ item?.bankCardNumber }}
-
-
-
-
-
-
- 服务评级
+
+
+
+
+
+
+ {{ item.bankName }}
+
+
+ {{ item?.bankCardNumber }}
+
+
+
+
+
+
+
+
服务评级
(暂无评级)
-
-
-
-
-
+
+
+
+
+
+
+
+
-
- 关联企业
+
@@ -383,4 +499,4 @@
-
\ No newline at end of file
+
diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html
index b98f1832..e0a9e0d7 100644
--- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html
+++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html
@@ -1,16 +1,5 @@
-
-
-
+
-
@@ -21,17 +10,22 @@
-
-
-
+ -->
+
+
-
+
{{item?.monthFreightAmount | currency}}
diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
index 46fe8dcd..70e36b6c 100644
--- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
+++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
@@ -2,21 +2,23 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFSchema } from '@delon/form';
-import { DynamicSettingModalComponent } from '@shared';
+import { DynamicSettingModalComponent, SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { UsermanageService } from '../../../services/usercenter.service';
@Component({
selector: 'app-usercenter-components-driver-config',
templateUrl: './driver-config.component.html',
- styleUrls: ['./driver-config.component.less']
+ styleUrls: ['../../../../commom/less/commom-table.less']
})
-export class UserCenterComponentsDriverConfigComponent implements OnInit {
+export class UserCenterComponentsDriverConfigComponent extends BasicTableComponent implements OnInit {
schema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
- constructor(public service: UsermanageService, private modal: NzModalService) {}
+ constructor(public service: UsermanageService, private modal: NzModalService, public searchDrawerService: SearchDrawerService) {
+ super(searchDrawerService);
+ }
/**
* 查询参数
@@ -33,6 +35,10 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
ngOnInit() {}
+ search() {
+ this.st?.load(1);
+ }
+
settingAction(item?: any) {
const modal = this.modal.create({
nzTitle: '配置',
@@ -105,7 +111,7 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
// { title: '', type: 'checkbox', className: 'text-center' },
{ title: '司机姓名', className: 'text-center', width: '170px', index: 'name' },
{ title: '手机号', className: 'text-center', width: '170px', index: 'mobile' },
- { title: '类型', className: 'text-center', width: '170px',render: 'isCaptain' },
+ { title: '类型', className: 'text-center', width: '170px', render: 'isCaptain' },
{ title: '月承运金额上限(元)', className: 'text-center', width: '200px', render: 'monthFreightAmount' },
{ title: '日提现金额上限(元)', className: 'text-center', width: '200px', render: 'dayWithdrawalAmount' },
{ title: '月提现金额上限(元)', className: 'text-center', width: '200px', render: 'monthWithdrawalAmount' },
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
index 4449618b..befa6692 100644
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
@@ -114,10 +114,11 @@
-
-
-
-
+
+
+
+
+
-
-
-
-
- 企业管理员信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
服务评级
(暂无评级)
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+
-
-
-
-
-
- 关联企业
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -159,4 +201,4 @@
-
\ No newline at end of file
+
diff --git a/src/app/routes/usercenter/components/freight/user/detail/detail.component.less b/src/app/routes/usercenter/components/freight/user/detail/detail.component.less
index e30f5583..7f9dfbd0 100644
--- a/src/app/routes/usercenter/components/freight/user/detail/detail.component.less
+++ b/src/app/routes/usercenter/components/freight/user/detail/detail.component.less
@@ -3,7 +3,7 @@
:host {
::ng-deep {
.user-info {
- display : flex;
+ display: flex;
font-size: 16px;
.enterprise-name {
@@ -11,9 +11,9 @@
}
img {
- width : 64px;
- height : 64px;
- margin-right : 15px;
+ width: 64px;
+ height: 64px;
+ margin-right: 15px;
border-radius: 50%;
}
@@ -22,4 +22,5 @@
}
}
}
-}
\ No newline at end of file
+
+}
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.html b/src/app/routes/usercenter/components/freight/user/user.component.html
index e94a51d0..b9054e98 100644
--- a/src/app/routes/usercenter/components/freight/user/user.component.html
+++ b/src/app/routes/usercenter/components/freight/user/user.component.html
@@ -32,7 +32,7 @@
-
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.less b/src/app/routes/usercenter/components/freight/user/user.component.less
deleted file mode 100644
index 6bcd149d..00000000
--- a/src/app/routes/usercenter/components/freight/user/user.component.less
+++ /dev/null
@@ -1,12 +0,0 @@
-:host::ng-deep {
-
- nz-range-picker {
- width: 100%;
- }
-
- .content-box {
- .ant-card-body {
- padding-top: 6px;
- }
- }
-}
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.ts b/src/app/routes/usercenter/components/freight/user/user.component.ts
index 0b92249e..58e2f015 100644
--- a/src/app/routes/usercenter/components/freight/user/user.component.ts
+++ b/src/app/routes/usercenter/components/freight/user/user.component.ts
@@ -22,7 +22,11 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
resourceStatus: any = 0;
- constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute,
+ constructor(
+ public service: UsermanageService,
+ private modal: NzModalService,
+ private router: Router,
+ private ar: ActivatedRoute,
public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
@@ -32,7 +36,6 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
this.st?.load(1);
}
-
ngOnInit() {
this.ar.url.subscribe(params => {
this.st?.load(1);
@@ -114,6 +117,16 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
});
}
+ exportList() {
+ const params = { certificationStatus: this.resourceStatus, pageSize: -1 };
+ if (this.sf) {
+ Object.assign(params, {
+ ...this.sf?.value
+ });
+ }
+ this.service.downloadFile(this.service.$api_get_user_list_export, params);
+ }
+
private initSF(): SFSchema {
return {
properties: {
@@ -157,7 +170,7 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
],
default: '',
ui: {
- widget: 'select',
+ widget: 'select'
}
},
promotersTelephone: {
@@ -165,7 +178,7 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
type: 'string',
maxLength: 11,
ui: {
- placeholder: '请输入手机号',
+ placeholder: '请输入手机号'
}
},
effectiveDate: {
@@ -174,7 +187,7 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
ui: {
widget: 'date',
mode: 'range',
- format: 'yyyy-MM-dd',
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
}
}
@@ -212,19 +225,19 @@ export class FreightComponentsUserComponent extends BasicTableComponent implemen
click: (item: any) => {
this.router.navigate(['./view', item.appUserId], { relativeTo: this.ar });
},
- acl: { ability: ['USERCENTER-FREIGHT-USER-view'] },
+ acl: { ability: ['USERCENTER-FREIGHT-USER-view'] }
},
{
text: '冻结',
iif: item => item.stateLocked === 0,
click: (item: any) => this.userAction(0, [item.appUserId]),
- acl: { ability: ['USERCENTER-FREIGHT-USER-lock'] },
+ acl: { ability: ['USERCENTER-FREIGHT-USER-lock'] }
},
{
text: '启用',
iif: item => item.stateLocked === 1,
click: (item: any) => this.userAction(1, [item.appUserId]),
- acl: { ability: ['USERCENTER-FREIGHT-USER-lock'] },
+ acl: { ability: ['USERCENTER-FREIGHT-USER-lock'] }
}
]
}
diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts
index 7dd0d387..ebec554b 100644
--- a/src/app/routes/usercenter/services/usercenter.service.ts
+++ b/src/app/routes/usercenter/services/usercenter.service.ts
@@ -49,6 +49,8 @@ export class UsermanageService extends ShipperBaseService {
// 货主员工列表(运营后台)
$api_get_user_list = '/api/mdc/cuc/userApp/getShipperUserInfoList';
+ // 货主员工列表(运营后台)
+ $api_get_user_list_export = '/api/mdc/cuc/userApp/getShipperUserInfoList';
// 冻结或恢复员工
$api_lock_staff = '/api/mdc/cuc/userApp/freezeOrResumeStaff';
// 冻结或恢复应用用户
diff --git a/src/app/routes/vehicle/components/audit/audit.component.html b/src/app/routes/vehicle/components/audit/audit.component.html
index 34452531..ef3e82a6 100644
--- a/src/app/routes/vehicle/components/audit/audit.component.html
+++ b/src/app/routes/vehicle/components/audit/audit.component.html
@@ -1,26 +1,6 @@
-
-
-
+
-
-
-
-
-
-
-
-
-
4">
@@ -37,21 +17,34 @@
-
-
+ -->
+
+
+
+
+
+ 筛选
+
+ 导出
+ 添加车辆
+
+
-
-
-
-
-
-
-
+
+
{{item?.carModel}}-{{item?.carLengthLabel? item?.carLengthLabel + '米' : ''}}-{{ item?.carLoad?
item?.carLoad + '吨' : ''}}
@@ -69,11 +62,4 @@
正常
-
-
-
-
- 添加车辆
-
-
+
\ No newline at end of file
diff --git a/src/app/routes/vehicle/components/audit/audit.component.spec.ts b/src/app/routes/vehicle/components/audit/audit.component.spec.ts
deleted file mode 100644
index e815b19d..00000000
--- a/src/app/routes/vehicle/components/audit/audit.component.spec.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * @Author: your name
- * @Date: 2021-12-01 20:05:59
- * @LastEditTime: 2021-12-01 20:35:33
- * @LastEditors: your name
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\list.component.spec.ts
- */
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { VehicleComponentsListComponent } from './list.component';
-
-describe('VehicleComponentsListComponent', () => {
- let component: VehicleComponentsListComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [VehicleComponentsListComponent],
- }).compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(VehicleComponentsListComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts
index 95ad7e8b..bc5fd25f 100644
--- a/src/app/routes/vehicle/components/audit/audit.component.ts
+++ b/src/app/routes/vehicle/components/audit/audit.component.ts
@@ -3,37 +3,32 @@ import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { ModalHelper } from '@delon/theme';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of, Subject } from 'rxjs';
import { map } from 'rxjs/operators';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { VehicleService } from '../../../vehicle/services/vehicle.service';
import { CarSettleCarauthComponent } from '../list/carauth/carauth.component';
@Component({
selector: 'app-Vehicle-components-audit',
- templateUrl: './audit.component.html'
+ templateUrl: './audit.component.html',
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class VehicleComponentsAuditComponent implements OnInit {
- _$expand = false;
+export class VehicleComponentsAuditComponent extends BasicTableComponent implements OnInit {
resourceStatus: any = 1;
defaultTabs = 1;
- ui!: SFUISchema;
- schema!: SFSchema;
columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
constructor(
public service: VehicleService,
- private modal: NzModalService,
private router: Router,
private ar: ActivatedRoute,
- private modalHelper: ModalHelper
- ) {}
- /**
- * 查询字段个数navigate
- */
- get queryFieldCount(): number {
- return Object.keys(this.schema?.properties || {}).length;
+ private modalHelper: ModalHelper,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
}
/**
@@ -65,6 +60,11 @@ export class VehicleComponentsAuditComponent implements OnInit {
this.st?.load(1);
});
}
+
+ search() {
+ this.st?.load(1);
+ }
+
dataProcess(data: STData[]): STData[] {
return data.map((i, index) => {
i.showSortFlag = false;
@@ -101,9 +101,6 @@ export class VehicleComponentsAuditComponent implements OnInit {
return of([]);
}
},
- visibleIf: {
- _$expand: (value: boolean) => value
- }
} as SFSelectWidgetSchema
},
carNoColor: {
@@ -130,12 +127,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
saveUser: {
type: 'string',
title: '录入人员',
- ui: {
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- },
+ }
// approvalStatus: {
// type: 'string',
// title: '审核状态',
@@ -170,7 +162,6 @@ export class VehicleComponentsAuditComponent implements OnInit {
// }
}
};
- this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
}
initST() {
@@ -228,20 +219,9 @@ export class VehicleComponentsAuditComponent implements OnInit {
daoyun(item: any) {
this.router.navigate(['./view', item], { relativeTo: this.ar });
}
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
creat() {
this.router.navigate(['./new'], { relativeTo: this.ar });
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
// 导出
exportFire() {
let params = Object.assign({}, this.reqParams || {});
diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.html b/src/app/routes/vehicle/components/list/carauth/carauth.component.html
index d5804e75..e9c199d7 100644
--- a/src/app/routes/vehicle/components/list/carauth/carauth.component.html
+++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.html
@@ -40,11 +40,12 @@
+
-
+
\ No newline at end of file
diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.less b/src/app/routes/vehicle/components/list/carauth/carauth.component.less
index ee4cb587..8b01f97b 100644
--- a/src/app/routes/vehicle/components/list/carauth/carauth.component.less
+++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.less
@@ -1,129 +1,68 @@
.sfBox {
position: relative;
- .example {
- position: absolute;
- top: 215px;
- right: 265px;
- color: #1890ff;
- cursor: pointer;
- .popBox {
- position: absolute;
- top: -170px;
- left: -125px;
- width: 300px;
- padding: 20px;
- text-align: center;
- background: #fff;
- border: solid 1px #eee;
- border-radius: 6px;
- box-shadow: 0 1px 5px 1px #ececec;
- &::before {
- position: absolute;
- bottom: -5px;
- left: 50%;
- width: 10px;
- height: 10px;
- margin-left: -5px;
- background: #fff;
- box-shadow: 0 1px 5px 1px #ececec;
- transform: rotate(45deg);
- content: '';
- }
- &::after {
- position: absolute;
- bottom: 0;
- left: 0;
- z-index: 10;
- width: 100%;
- height: 10px;
- background: #fff;
- content: '';
- }
- img {
- max-width: 100%;
- max-height: 200px;
- }
- }
- }
- .positionSet{
- top: 356px;
- right: 235px;
- }
- .positionSet01{
- top: 500px;
- right: 200px;
- }
- .positionSet02{
- top: 664px;
- right: 265px;
- }
- .positionSet03{
- top: 808px;
- right: 205px;
-
- }
-}
-.exaA{
- position: absolute;
- top: 0;
- left: 300px
+ height : 550px;
+ overflow: auto;
}
+
.pr {
position: relative;
}
.pa {
position: absolute;
- top: 35px;
- left: 140px;
+ top : 35px;
+ left : 140px;
}
.tips {
- display: flex;
+ display : flex;
margin-bottom: 0;
- color: #333;
+ color : #333;
dt {
width: 150px;
}
dd {
- width: 190px;
+ width : 190px;
margin-bottom: 0;
- text-align: center;
+ text-align : center;
}
}
-.drivercard{
+
+.drivercard {
position: absolute;
- top: 0;
- left: 325px;
- border: solid 1px #ebf0fb;
+ top : 0;
+ left : 325px;
+ border : solid 1px #ebf0fb;
}
-.jopcard{
- position: absolute;
- top: 1356px;
- left: 330px;
- border: solid 1px #ebf0fb;
-}
-.agreement{
- position: absolute;
- top: 425px;
- left: 330px;
- border: solid 1px #ebf0fb;
-}
-:host{
+
+
+:host {
::ng-deep {
- .ant-input-borderless{
- padding: 0;
+ .ant-input-borderless {
+ padding : 0;
padding-top: 4px;
- color: black;
- resize:none;
+ color : black;
+ resize : none;
}
- .setCustom .ant-form-item-control{
- margin-left: -100px !important
+
+ .setCustom {
+ nz-form-item {
+ width: auto !important;
+ }
+
+ .ant-form-item-control {
+ margin-left: -100px !important
+ }
}
- .borderImg{
+
+ .borderImg {
border: solid 1px #ebf0fb;
}
+
+ nz-date-picker {
+ width: 100%;
+ }
}
}
\ No newline at end of file
diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts
index 8ea6e54d..6d823b3c 100644
--- a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts
+++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts
@@ -658,7 +658,7 @@ export class CarSettleCarauthComponent implements OnInit {
grid: { span: 12 }
},
$agreeImg: {
- grid: { span: 4 },
+ grid: { span: 3 },
class: 'setCustom'
},
$titleB: {
diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html
index 7c2dbd77..a647c830 100644
--- a/src/app/routes/vehicle/components/list/list.component.html
+++ b/src/app/routes/vehicle/components/list/list.component.html
@@ -1,16 +1,5 @@
-
-
-
+
-
-
-
-
+ -->
+
+
-
+
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index 04a43d76..96e68569 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -1,25 +1,29 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-import { NzModalService } from 'ng-zorro-antd/modal';
+import { SFSchemaEnum, SFSelectWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { VehicleService } from '../../../vehicle/services/vehicle.service';
@Component({
selector: 'app-Vehicle-components-list',
- templateUrl: './list.component.html'
+ templateUrl: './list.component.html',
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class VehicleComponentsListComponent implements OnInit {
- _$expand = false;
-
- ui!: SFUISchema;
- schema!: SFSchema;
+export class VehicleComponentsListComponent extends BasicTableComponent implements OnInit {
columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
- constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
+ constructor(
+ public service: VehicleService,
+ private router: Router,
+ private ar: ActivatedRoute,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
/**
* 查询参数
@@ -37,6 +41,10 @@ export class VehicleComponentsListComponent implements OnInit {
return params;
}
+ search() {
+ this.st?.load(1);
+ }
+
ngOnInit() {
this.initSF();
this.initST();
@@ -109,10 +117,7 @@ export class VehicleComponentsListComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'car:model' },
- containsAllLabel: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ containsAllLabel: true
}
},
carLength: {
@@ -121,20 +126,12 @@ export class VehicleComponentsListComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'car:length' },
- containsAllLabel: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ containsAllLabel: true
}
},
carLoad: {
title: '载重',
- type: 'string',
- ui: {
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
+ type: 'string'
},
isSelf: {
type: 'string',
@@ -145,10 +142,7 @@ export class VehicleComponentsListComponent implements OnInit {
],
ui: {
widget: 'select',
- allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ allowClear: true
}
},
driverLicenseStatus: {
@@ -162,10 +156,7 @@ export class VehicleComponentsListComponent implements OnInit {
default: '',
ui: {
widget: 'select',
- allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ allowClear: true
}
},
roadTransportStatus: {
@@ -178,12 +169,9 @@ export class VehicleComponentsListComponent implements OnInit {
],
ui: {
widget: 'select',
- allowClear: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ allowClear: true
}
- },
+ }
// isSelfs: {
// type: 'string',
// title: '是否入网',
@@ -216,7 +204,6 @@ export class VehicleComponentsListComponent implements OnInit {
// },
}
};
- this.ui = { '*': { spanLabelFixed: 130, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
}
initST() {
@@ -292,20 +279,9 @@ export class VehicleComponentsListComponent implements OnInit {
}
];
}
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
creat() {
this.router.navigate(['./new'], { relativeTo: this.ar });
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
// 导出
exportFire() {
let params = Object.assign({}, this.reqParams || {});