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 6880be7b..322866ce 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
@@ -354,6 +354,46 @@
[placeholder]="isEdit?'':'-'">
+
+
+ 合伙人信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 渠道销售信息
+
+
+
+
+
+
+
+
+
+
+
+
+
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 afb394a1..3ddef9e3 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -166,137 +166,6 @@ export class FreightComponentsListComponent implements OnInit {
showRequired: false
}
},
- lockedStatus8: {
- type: 'string',
- title: '公司所在地',
- enum: [
- { label: '全部', value: '' },
- { label: '物流企业', value: 0 }
- ],
- default: '',
- ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- },
- oftenUsedServices: {
- type: 'string',
- title: '常用服务',
- enum: [
- { label: '全部', value: '' },
- { label: '整车服务', value: 0 },
- { label: '大宗服务', value: 1 }
- ],
- default: '',
- ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- },
- customerType: {
- type: 'string',
- title: '客户类型',
- enum: [
- { label: '全部', value: '' },
- { label: '直客', value: 1 },
- { label: '渠道客户', value: 20 }
- ],
- default: '',
- ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- },
- contactName5: {
- title: '渠道销售',
- type: 'string',
- ui: {
- placeholder: '请输入',
- showRequired: false,
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- },
- partnerName: {
- title: '合伙人',
- type: 'string',
- ui: {
- placeholder: '请输入',
- showRequired: false,
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- },
- contactName3: {
- title: '客服人员',
- type: 'string',
- ui: {
- placeholder: '请输入',
- showRequired: false,
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- },
- contactName2: {
- title: '审核人',
- type: 'string',
- ui: {
- placeholder: '请输入',
- showRequired: false,
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- },
- applyDate: {
- type: 'string',
- title: '申请时间',
- ui: {
- widget: 'sl-from-to',
- type: 'date',
- format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
- } as SFDateWidgetSchema,
- },
- applyDate1: {
- type: 'string',
- title: '审核时间',
- ui: {
- widget: 'sl-from-to',
- type: 'date',
- format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
- } as SFDateWidgetSchema,
- },
- lockedStatus3: {
- type: 'string',
- title: '企业状态',
- enum: [
- { label: '全部', value: '' },
- { label: '正常', value: 0 },
- { label: '冻结', value: 1 }
- ],
- default: '',
- ui: {
- widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- },
enterpriseType: {
type: 'string',
title: '企业类型',
@@ -322,26 +191,41 @@ export class FreightComponentsListComponent implements OnInit {
default: '',
ui: {
widget: 'select',
- placeholder: '请选择',
- allowClear: true,
- asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
visibleIf: {
expand: (value: boolean) => value
}
}
},
- // sou1r3ce: {
- // type: 'string',
- // title: '客户类型',
- // enum: [{ label: '全部', value: '' }],
- // default: '',
- // ui: {
- // widget: 'select',
- // visibleIf: {
- // expand: (value: boolean) => value
- // }
- // }
- // },
+ oftenUsedServices: {
+ type: 'string',
+ title: '常用服务',
+ enum: [
+ { label: '全部', value: '' },
+ { label: '整车发货', value: 10 },
+ { label: '大宗发货', value: 20 }
+ ],
+ default: '',
+ ui: {
+ widget: 'select',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ customerType: {
+ type: 'string',
+ title: '客户类型',
+ enum: [{ label: '全部', value: '' },
+ { label: '直客', value: 1 },
+ { label: '渠道客户', value: 20 }],
+ default: '',
+ ui: {
+ widget: 'select',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
promotersTelephone: {
title: '业务员',
type: 'string',
@@ -353,28 +237,28 @@ 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
- // }
- // }
- // },
+ partnerNamee: {
+ title: '合伙人',
+ type: 'string',
+ ui: {
+ placeholder: '请输入',
+ showRequired: false,
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ customerServiceId: {
+ title: '客服人员',
+ type: 'string',
+ ui: {
+ placeholder: '请输入',
+ showRequired: false,
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
approvalUserName: {
title: '审核人',
type: 'string',
@@ -442,13 +326,13 @@ export class FreightComponentsListComponent implements OnInit {
}
}
},
- source2: {
+ isExpired: {
type: 'string',
title: '证件是否过期',
enum: [
{ label: '全部', value: '' },
- { label: '是', value: 1 },
- { label: '否', value: 2 }
+ { label: '是', value: true },
+ { label: '否', value: false }
],
default: '',
ui: {
@@ -506,8 +390,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: 'partnerName', width: 150 },
+ { title: '客服人员', className: 'text-center', render: 'customerServiceId', width: 150 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
{
title: '注册渠道',
@@ -544,8 +428,9 @@ export class FreightComponentsListComponent implements OnInit {
},
{
title: '操作',
- width: '250px',
- className: 'text-center btnBox',
+ width: '200px',
+ className: 'text-center block-td',
+ fixed: 'right',
buttons: [
{
text: '查看',