+
-
+
@@ -38,6 +39,12 @@
+
+
+
+ 已过期
+
+
{{ item.contacter }}
/{{item.mobile}}
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.less b/src/app/routes/usercenter/components/freight/list/list.component.less
deleted file mode 100644
index e69de29b..00000000
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 0e075e82..a5f9f08c 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -1,7 +1,7 @@
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, SFSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { DynamicSettingModalComponent, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
@@ -9,7 +9,7 @@ import { UsermanageService } from '../../../services/usercenter.service';
@Component({
selector: 'app-Freight-components-list',
templateUrl: './list.component.html',
- styleUrls: ['./list.component.less']
+ styleUrls: ['../../../../commom/less/expend-but.less']
})
export class FreightComponentsListComponent implements OnInit {
_$expand = false;
@@ -116,17 +116,60 @@ export class FreightComponentsListComponent implements OnInit {
showRequired: false
}
},
-
- networkTransporter: {
+ enterpriseType: {
type: 'string',
- title: '网络货运人',
+ title: '企业类型',
+ enum: [
+ { label: '全部', value: '' },
+ { label: '物流企业', value: 1 },
+ { label: '货运代理', value: 2 },
+ { label: '生产型企业', value: 3 },
+ { label: '贸易类企业', value: 4 },
+ { label: '科技型企业', value: 5 },
+ { label: '化学化工企业', value: 6 },
+ { label: '其他', value: 7 }
+ ],
+ default: '',
ui: {
- widget: 'select',
- placeholder: '请选择',
- allowClear: true,
- asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+ widget: 'select'
}
},
+ sou11rce: {
+ type: 'string',
+ title: '公司所在地',
+ enum: [{ label: '全部', value: '' }],
+ default: '',
+ ui: {
+ widget: 'select',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ oftenUsedServices: {
+ type: 'string',
+ title: '常用服务',
+ enum: [{ label: '全部', value: '' }],
+ default: '',
+ ui: {
+ widget: 'select',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ // sou1r3ce: {
+ // type: 'string',
+ // title: '客户类型',
+ // enum: [{ label: '全部', value: '' }],
+ // default: '',
+ // ui: {
+ // widget: 'select',
+ // visibleIf: {
+ // expand: (value: boolean) => value
+ // }
+ // }
+ // },
promotersTelephone: {
title: '业务员',
type: 'string',
@@ -138,23 +181,63 @@ export class FreightComponentsListComponent implements OnInit {
}
}
},
- source: {
+ // promotersTe1le3phone: {
+ // title: '合伙人',
+ // type: 'string',
+ // ui: {
+ // placeholder: '请输入',
+ // showRequired: false,
+ // visibleIf: {
+ // expand: (value: boolean) => value
+ // }
+ // }
+ // },
+ // promotersTe1lep1hone: {
+ // title: '客服人员',
+ // type: 'string',
+ // ui: {
+ // placeholder: '请输入',
+ // showRequired: false,
+ // visibleIf: {
+ // expand: (value: boolean) => value
+ // }
+ // }
+ // },
+ approvalUserName: {
+ title: '审核人',
type: 'string',
- title: '注册渠道',
- enum: [
- { label: '全部', value: '' },
- { label: '用户注册', value: 1 },
- { label: '货主添加', value: 2 },
- { label: '运营添加', value: 3 }
- ],
- default: '',
ui: {
- widget: 'select',
+ placeholder: '请输入',
+ showRequired: false,
visibleIf: {
expand: (value: boolean) => value
}
}
},
+ createTime: {
+ title: '申请时间',
+ type: 'string',
+ ui: {
+ widget: 'sl-from-to-search',
+ format: 'yyyy-MM-dd HH:mm:ss',
+ nzShowTime: true,
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ } as SFDateWidgetSchema
+ },
+ approvalTime: {
+ title: '审核时间',
+ type: 'string',
+ ui: {
+ widget: 'sl-from-to-search',
+ format: 'yyyy-MM-dd HH:mm:ss',
+ nzShowTime: true,
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ } as SFDateWidgetSchema
+ },
lockedStatus: {
type: 'string',
title: '企业状态',
@@ -170,6 +253,47 @@ export class FreightComponentsListComponent implements OnInit {
expand: (value: boolean) => value
}
}
+ },
+ source: {
+ type: 'string',
+ title: '注册渠道',
+ enum: [
+ { label: '全部', value: '' },
+ { label: '货主注册', value: 1 },
+ { label: '平台添加', value: 2 }
+ ],
+ default: '',
+ ui: {
+ widget: 'select',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ isExpired: {
+ type: 'string',
+ title: '证件是否过期',
+ enum: [{ label: '全部', value: '' }],
+ default: '',
+ ui: {
+ widget: 'select',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ networkTransporter: {
+ type: 'string',
+ title: '网络货运人',
+ ui: {
+ widget: 'select',
+ placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
}
}
};
@@ -180,10 +304,23 @@ export class FreightComponentsListComponent implements OnInit {
this.columns = [
// { title: '', type: 'checkbox', className: 'text-center' },
{ title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
- { title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 200 },
+ { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 },
+ {
+ title: '公司所在地',
+ className: 'text-center',
+ index: 'province',
+ width: 200,
+ format: item => `${item.provinceName}${item.cityName}${item.areaName}`
+ },
+ {
+ title: '企业类型',
+ className: 'text-center',
+ index: 'enterpriseType',
+ width: 200,
+ type: 'enum',
+ enum: { 1: '物流企业', 2: '货运代理', 3: '生产型企业', 4: '贸易类企业', 5: '科技型企业', 6: '化学化工企业', 7: '其他' }
+ },
{ title: '管理员', className: 'text-center', render: 'contacter', width: 150 },
- { title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 },
- { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
{
title: '常用服务',
className: 'text-center',
@@ -192,7 +329,10 @@ export class FreightComponentsListComponent implements OnInit {
enum: { 10: '整车发货', 20: '大宗发货' },
width: 140
},
- { title: '推广业务员', className: 'text-center', render: 'promotersTelephone', width: 150 },
+ { title: '业务员', className: 'text-center', render: 'promotersTelephone', width: 150 },
+ // { title: '合伙人', className: 'text-center', render: 'promoter1sTelephone', width: 150 },
+ // { title: '客服人员', className: 'text-center', render: 'promoter1sTelephone', width: 150 },
+ { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
{
title: '注册渠道',
className: 'text-center',
@@ -201,6 +341,20 @@ export class FreightComponentsListComponent implements OnInit {
enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' },
width: 130
},
+ { title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' },
+ { title: '审核时间', className: 'text-center', index: 'approvalTime', width: 180, type: 'date' },
+ { title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 },
+ {
+ title: '保险认证状态',
+ className: 'text-center',
+ index: 'insuranceAuthState',
+ type: 'badge',
+ badge: {
+ 10: { text: '成功', color: 'success' },
+ 20: { text: '失败', color: 'error' }
+ },
+ width: 130
+ },
{
title: '企业状态',
className: 'text-center',
diff --git a/src/app/routes/usercenter/components/freight/list/new/new.component.ts b/src/app/routes/usercenter/components/freight/list/new/new.component.ts
index 904ac081..9b1cbc6e 100644
--- a/src/app/routes/usercenter/components/freight/list/new/new.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/new/new.component.ts
@@ -206,9 +206,9 @@ export class FreightComponentsListNewComponent implements OnInit {
if (res.name) {
this.sf1.setValue('/enterpriseName', res.name);
}
- if (res.type) {
- this.sf1.setValue('/enterpriseType', res.type);
- }
+ // if (res.type) {
+ // this.sf1.setValue('/enterpriseType', res.type);
+ // }
if (res.addressRegionCodes) {
this.sf1.setValue('/enterpriseAddressCode', res.addressRegionCodes);
}
@@ -291,13 +291,21 @@ export class FreightComponentsListNewComponent implements OnInit {
enterpriseType: {
title: '公司类型',
type: 'string',
- minLength: 1,
- maxLength: 30,
+ enum: [
+ { label: '物流企业', value: 1 },
+ { label: '货运代理', value: 2 },
+ { label: '生产型企业', value: 3 },
+ { label: '贸易类企业', value: 4 },
+ { label: '科技型企业', value: 5 },
+ { label: '化学化工企业', value: 6 },
+ { label: '其他', value: 7 }
+ ],
ui: {
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
- placeholder: '请输入公司类型',
+ widget: 'select',
+ placeholder: '请选择公司类型',
errors: {
- required: '请输入公司类型'
+ required: '请选择公司类型'
}
}
},