+
-
+
@@ -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 2ae8a923..a5f9f08c 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -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,10 +116,19 @@ export class FreightComponentsListComponent implements OnInit {
showRequired: false
}
},
- sou1rce: {
+ enterpriseType: {
type: 'string',
title: '企业类型',
- enum: [{ label: '全部', value: '' }],
+ 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'
@@ -137,7 +146,7 @@ export class FreightComponentsListComponent implements OnInit {
}
}
},
- sou3rce: {
+ oftenUsedServices: {
type: 'string',
title: '常用服务',
enum: [{ label: '全部', value: '' }],
@@ -149,18 +158,18 @@ export class FreightComponentsListComponent implements OnInit {
}
}
},
- sou1r3ce: {
- 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',
@@ -172,29 +181,29 @@ export class FreightComponentsListComponent implements OnInit {
}
}
},
- 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
- }
- }
- },
- promotersTe1lep12hone: {
+ // 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',
ui: {
@@ -205,7 +214,7 @@ export class FreightComponentsListComponent implements OnInit {
}
}
},
- time: {
+ createTime: {
title: '申请时间',
type: 'string',
ui: {
@@ -217,7 +226,7 @@ export class FreightComponentsListComponent implements OnInit {
}
} as SFDateWidgetSchema
},
- tim1e: {
+ approvalTime: {
title: '审核时间',
type: 'string',
ui: {
@@ -250,9 +259,8 @@ export class FreightComponentsListComponent implements OnInit {
title: '注册渠道',
enum: [
{ label: '全部', value: '' },
- { label: '用户注册', value: 1 },
- { label: '货主添加', value: 2 },
- { label: '运营添加', value: 3 }
+ { label: '货主注册', value: 1 },
+ { label: '平台添加', value: 2 }
],
default: '',
ui: {
@@ -262,7 +270,7 @@ export class FreightComponentsListComponent implements OnInit {
}
}
},
- sourc2e: {
+ isExpired: {
type: 'string',
title: '证件是否过期',
enum: [{ label: '全部', value: '' }],
@@ -296,9 +304,22 @@ 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', index: 'unifi1edSocialCreditCode', width: 200 },
- { title: '企业类型', className: 'text-center', index: 'unifiedSoci1alCreditCode', 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: '常用服务',
@@ -309,8 +330,8 @@ export class FreightComponentsListComponent implements OnInit {
width: 140
},
{ 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', render: 'promoter1sTelephone', width: 150 },
+ // { title: '客服人员', className: 'text-center', render: 'promoter1sTelephone', width: 150 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
{
title: '注册渠道',
@@ -320,17 +341,17 @@ export class FreightComponentsListComponent implements OnInit {
enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' },
width: 130
},
- { title: '申请时间', className: 'text-center', index: 'netTra1nName', width: 180 },
- { title: '审核时间', className: 'text-center', index: 'netTr1anName', width: 180 },
+ { 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: 'lockedSta1tus',
+ index: 'insuranceAuthState',
type: 'badge',
badge: {
- 0: { text: '正常', color: 'success' },
- 1: { text: '冻结', color: 'error' }
+ 10: { text: '成功', color: 'success' },
+ 20: { text: '失败', color: 'error' }
},
width: 130
},
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: '请选择公司类型'
}
}
},