- {{ item.contactsPhone }}
+
+
+ {{ item.promotersTelephone || '添加' }}
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 f1d1cc49..80dd4355 100644
--- a/src/app/routes/usercenter/components/freight/user/user.component.ts
+++ b/src/app/routes/usercenter/components/freight/user/user.component.ts
@@ -11,7 +11,7 @@ import { UsermanageService } from '../../../services/usercenter.service';
})
export class FreightComponentsUserComponent implements OnInit {
_$expand = false;
- ui: SFUISchema = { '*': { spanLabelFixed: 120, grid: {lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } };
+ ui: SFUISchema = { '*': { spanLabelFixed: 120, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } };
schema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
@ViewChild('st', { static: false }) st!: STComponent;
@@ -190,19 +190,19 @@ export class FreightComponentsUserComponent implements OnInit {
return [
{ title: '用户姓名', className: 'text-center', index: 'name' },
{ title: '手机号', className: 'text-center', index: 'telephone' },
- { title: '身份证件号', className: 'text-center', render: 'certificateNumber' },
+ { title: '身份证件号', className: 'text-center', index: 'certificateNumber' },
{ title: '常用服务', className: 'text-center', index: 'unifiedSocialCreditCode' },
{ title: '推广业务员', className: 'text-center', index: 'promotersTelephone', render: 'promotersTelephone' },
{ title: '申请时间', className: 'text-center', index: 'createTime', type: 'date' },
{
title: '状态',
className: 'text-center',
- index: 'stateLocked',
+ index: 'certificationStatus',
type: 'badge',
badge: {
- 10: { text: '待审核', color: 'default' },
- 20: { text: ' 已成功', color: 'success' },
- 30: { text: '已驳回', color: 'warning' }
+ 0: { text: '待审核', color: 'processing' },
+ 1: { text: '已成功', color: 'success' },
+ 2: { text: '已驳回', color: 'warning' }
}
},
{
@@ -218,10 +218,12 @@ export class FreightComponentsUserComponent implements OnInit {
},
{
text: '冻结',
+ iif: item => item.stateLocked === 0,
click: (item: any) => this.userAction(0)
},
{
text: '启用',
+ iif: item => item.stateLocked === 1,
click: (item: any) => this.userAction(1)
}
]
diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts
index 8b836af6..6232602f 100644
--- a/src/app/routes/usercenter/services/usercenter.service.ts
+++ b/src/app/routes/usercenter/services/usercenter.service.ts
@@ -42,7 +42,7 @@ export class UsermanageService extends BaseService {
// 查询司机列表
$api_get_driver_list = '/api/mdc/cuc/driver/list/page';
-
+
// 根据应用用户id获取用户详情
$api_get_user_detail = '/api/mdc/cuc/user/getUserDetailByAppUserId';
// 根据应用用户ID获取身份信息表
@@ -53,12 +53,18 @@ export class UsermanageService extends BaseService {
$api_get_driver_practice_seniority = '/api/mdc/cuc/driver/getDriversPracticeSeniority';
// 司机详情查看-载具信息
$api_get_driver_car_license = '/api/mdc/cuc/driver/getUserCarLicense';
-
+
// 人工审核实名认证
$api_approve_identity = '/api/mdc/cuc/identityInfo/identityAudit';
// 审核驾驶证信息
$api_approve_driver_license = '/api/mdc/cuc/driver/auditDriverLicense';
+ // 查询企业管理员审核信息
+ $api_get_enterprise_admin_list = '/api/mdc/cuc/enterpriseAdmin/operate/list/page';
+ // 根据主键ID获取企业管理员审核信息
+ $api_get_enterprise_user_by_id = '/api/mdc/cuc/enterpriseAdmin/operate/get';
+ // 审核企业管理员
+ $api_audit_enterprise_admin = '/api/mdc/cuc/enterpriseAdmin/operate/audit';
constructor(public injector: Injector) {
super(injector);
diff --git a/src/app/routes/usercenter/usercenter.module.ts b/src/app/routes/usercenter/usercenter.module.ts
index 294a49c2..33ba86e0 100644
--- a/src/app/routes/usercenter/usercenter.module.ts
+++ b/src/app/routes/usercenter/usercenter.module.ts
@@ -20,6 +20,7 @@ import { FreightComponentsListViewComponent } from './components/freight/list/vi
import { FreightComponentsUserDetailComponent } from './components/freight/user/detail/detail.component';
import { FreightComponentsUserComponent } from './components/freight/user/user.component';
import { UsercenterRoutingModule } from './usercenter-routing.module';
+import { AuditAdminComponent } from './components/freight/enterprise-audit/audit-admin/audit-admin.component';
const COMPONENTS = [
FreightComponentsListComponent,
@@ -37,6 +38,6 @@ const COMPONENTS = [
@NgModule({
imports: [SharedModule, UsercenterRoutingModule],
- declarations: [...COMPONENTS],
+ declarations: [...COMPONENTS, AuditAdminComponent],
})
export class UsercenterModule {}
diff --git a/src/app/shared/components/dict-select/dict-select.component.spec.ts b/src/app/shared/components/dict-select/dict-select.component.spec.ts
deleted file mode 100644
index d5aa71e4..00000000
--- a/src/app/shared/components/dict-select/dict-select.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DictSelectComponent } from './dict-select.component';
-
-describe('DictSelectComponent', () => {
- let component: DictSelectComponent;
- let fixture: ComponentFixture
;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [ DictSelectComponent ]
- })
- .compileComponents();
- });
-
- beforeEach(() => {
- fixture = TestBed.createComponent(DictSelectComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/app/shared/components/dict-select/index.ts b/src/app/shared/components/dict-select/index.ts
index 446b7507..e217fb6b 100644
--- a/src/app/shared/components/dict-select/index.ts
+++ b/src/app/shared/components/dict-select/index.ts
@@ -6,6 +6,5 @@
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\shared\components\dict-select\index.ts
*/
-export * from './dict-select.component.spec';
export * from './dict-select.component';
export * from './dict-select.service';
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index d59b0484..e77a54ec 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -29,6 +29,7 @@ import { SharedThirdModule } from './shared-third.module';
import { LogisticsTimeLineComponent } from './components/logistics-time-line/logistics-time-line.component';
import { AmapModule } from './components/amap/amap.module';
import { ImageListModule } from './components/imagelist';
+import { DictSelectComponent } from './components/dict-select';
const MODULES = [
AddressModule,
@@ -46,7 +47,7 @@ const MODULES = [
];
// #endregion
-const SHAREDCOMPONENTS = [LogisticsTimeLineComponent];
+const SHAREDCOMPONENTS = [LogisticsTimeLineComponent, DictSelectComponent];
@NgModule({
imports: [