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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-04-27 13:45:07 +08:00
parent 5a429bafdf 26321be920
commit aad0b9d461
1 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,8 +97,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
initST() {
this.columns = [
{ title: '修改后合伙人', index: 'newPartnerName', className: 'text-center' },
{ title: '修改前合伙人', index: 'originalPartnerNamel', className: 'text-center' },
{ title: '备注', render: 'remark', className: 'text-center' },
{ title: '修改前合伙人', index: 'originalPartnerName', className: 'text-center' },
{ title: '结算起算日', index: 'settStartTime', className: 'text-center' },
{ title: '生效节点', index: 'effectiveNode', className: 'text-center', type: 'enum', enum: {
1: '立即生效',
@ -115,38 +114,38 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
},
className: 'text-center'
},
{ title: '修改时间', render: 'modifyTime', className: 'text-center' },
{ title: '生效时间', index: 'effectiveTime', className: 'text-center' },
{ title: '操作人', render: 'approvalUser', className: 'text-center' },
];
}
/**
* 初始化数据列表
*/
initRecordST() {
this.recordColumns = [
{ title: '修改后渠道销售', index: 'newChannelName', className: 'text-center' },
{ title: '修改前渠道销售地', index: 'originalChannelName', className: 'text-center' },
{ title: '备注', render: 'remark', className: 'text-center' },
{ title: '生效节点', index: 'effectiveNode', className: 'text-center', type: 'enum', enum: {
1: '立即生效',
2: 'CRM审核后生效',
3: '审核通过生效',
} },
{
title: 'CRM审核状态', index: 'effectiveStatus',
type: 'enum',
enum: {
0: '已失效',
1: '未生效',
2: '已生效',
},
className: 'text-center'
},
{ title: '修改时间', index: 'modifyTime', className: 'text-center' },
{ title: '生效时间', index: 'effectiveTime', className: 'text-center' },
{ title: '操作人', index: 'modifyUserId', className: 'text-center' }
{ title: '操作人', index: 'modifyUserId', className: 'text-center' },
{ title: '备注', render: 'remark', className: 'text-center' },
];
}
/**
* 初始化数据列表
*/
initRecordST() {
this.recordColumns = [
{ title: '修改后渠道销售', index: 'newChannelName', className: 'text-center' },
{ title: '修改前渠道销售地', index: 'originalChannelName', className: 'text-center' },
{ title: '生效节点', index: 'effectiveNode', className: 'text-center', type: 'enum', enum: {
1: '立即生效',
2: 'CRM审核后生效',
3: '审核通过生效',
} },
{
title: 'CRM审核状态', index: 'effectiveStatus',
type: 'enum',
enum: {
0: '已失效',
1: '未生效',
2: '已生效',
},
className: 'text-center'
},
{ title: '修改时间', index: 'modifyTime', className: 'text-center' },
{ title: '生效时间', index: 'effectiveTime', className: 'text-center' },
{ title: '操作人', index: 'modifyUserId', className: 'text-center' },
{ title: '备注', render: 'remark', className: 'text-center' },
];
}
loadPartnerInfo(){