Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edit

Browse Source
This commit is contained in:
Taric Xin
2022-04-01 09:52:10 +08:00
parent cd7b1775f6
commit 0b7de5d43e
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/routes/partner/partner-list/components/index/partner-list.component.ts
View File

@ -367,13 +367,12 @@ export class PartnerListComponent {
return [
{
title: '合伙人名称',
index: 'enterpriseName',
width: 180,
format: item => (item.partnerType ? `${item.enterpriseName || item.contactName}` : '')
index: 'contactName',
width: 180
},
{ title: '付款编码', index: 'payCode', width: 160 },
{ title: '邀请码', index: 'invitationCode', className: 'text-center', width: 130 },
{ title: '企业管理员', index: 'contactName', width: 150, format: item => (item.partnerType ? `${item.contactName}` : '') },
{ title: '企业管理员', index: 'adminName', width: 150 },
{ title: '手机号', index: 'contactMobile', className: 'text-center', width: 150 },
{ title: '类型', index: 'partnerType', className: 'text-center', width: 130, type: 'enum', enum: { 1: '企业', 2: '个人' } },
{ title: '注册渠道', index: 'source', type: 'enum', enum: { 1: '合伙人注册', 2: '平台添加' }, width: 130 },

26
src/app/routes/usercenter/components/freight/list/list.component.ts
View File

@ -49,6 +49,22 @@ export class FreightComponentsListComponent implements OnInit {
Object.assign(requestOptions.body, {
...this.sf.value
});
if (this.sf.value.createTime) {
Object.assign(requestOptions.body, {
createTime: {
start: this.sf.value.createTime[0],
end: this.sf.value.createTime[1]
}
});
}
if (this.sf.value.approvalTime) {
Object.assign(requestOptions.body, {
approvalTime: {
start: this.sf.value.approvalTime[0],
end: this.sf.value.approvalTime[1]
}
});
}
}
this.loadingList = true;
return requestOptions;
@ -215,9 +231,11 @@ export class FreightComponentsListComponent implements OnInit {
customerType: {
type: 'string',
title: '客户类型',
enum: [{ label: '全部', value: '' },
{ label: '直客', value: 1 },
{ label: '渠道客户', value: 20 }],
enum: [
{ label: '全部', value: '' },
{ label: '直客', value: 1 },
{ label: '渠道客户', value: 20 }
],
default: '',
ui: {
widget: 'select',
@ -363,7 +381,7 @@ export class FreightComponentsListComponent implements OnInit {
initST() {
this.columns = [
// { title: '', type: 'checkbox', className: 'text-center' },
{ title: '企业名称', render: 'enterpriseName', width: 350 },
{ title: '企业名称', render: 'enterpriseName', width: 350 },
{ title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 },
{
title: '公司所在地',