解决冲突

2022-02-28 20:03:30 +08:00
parent 438484699d
commit b22ef98056
7 changed files with 58 additions and 32 deletions
--- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
+++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
@ -131,19 +131,19 @@ export class ContractManagementTemplateDetailComponent 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' },
      {