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

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

@@ -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' },
       {

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

@@ -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' },
       {

src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-06 15:01:40
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 20:33:56
+ * @LastEditTime : 2022-02-28 20:40:35
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -28,19 +28,22 @@ export class TranAgreementComponent {
     console.log(Object)
     const params = {
       contractType:'1',
-      enterpriseInfoId: '',
       parametersDTO: {
         // 回单付
-        back: '',
+        back: 'dsfgffdsg',
         // 发货地址
-        consignorAddress: '',
+        consignorAddress: 'gfdgdfdg',
         // 发货时间
-        consignorDate: '',
+        consignorDate: 'dsggdsgsfgds',
         // 发货时间
         // consignorDate: '',
-      }
+        
+      },
+      resourceType: '1',
+      signingObject: '1',
+      templateType: 'MX',
     }
-      
+        console.log(params)
     
     this.service.request(this.service.$api_getContractContent,params).subscribe((res) => {
       if (res) {