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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-28 20:40:54 +08:00
parent 28f4c8077c
commit 8b03d58fa2
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts
View File

@ -131,19 +131,19 @@ export class ContractManagementTemplateFrameComponent implements OnInit {
title: '签约对象',
width: '100px',
className: 'text-center',
render: 'signingObject'
render: 'signingObjectLabel'
},
{
title: '合同类型',
width: '100px',
className: 'text-center',
index: 'contractType'
index: 'contractTypeLabel'
},
{
title: '货源类型',
width: '100px',
className: 'text-center',
index: 'resourceType'
index: 'resourceTypeLabel'
},
{ title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' },
{

6
src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts
View File

@ -131,19 +131,19 @@ export class ContractManagementTemplatePartnerComponent implements OnInit {
title: '签约对象',
width: '100px',
className: 'text-center',
index: 'signingObject'
index: 'signingObjectLabel'
},
{
title: '合同类型',
width: '100px',
className: 'text-center',
index: 'contractType'
index: 'contractTypeLabel'
},
{
title: '货源类型',
width: '100px',
className: 'text-center',
index: 'resourceType'
index: 'resourceTypeLabel'
},
{ title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' },
{