解决冲突

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

@@ -1,6 +1,5 @@
-
-<h2 >
-  委托运输协议
+<h2 style="text-align: center;">
+  {{ agreement?.agreementName }}
 </h2>
 <div *nzModalFooter>
   <button nz-button nzType="primary" (click)="handleOk()" >我已阅读并同意签署</button>

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

@@ -4,12 +4,13 @@
  * @Author       : Shiming
  * @Date         : 2022-01-06 15:01:40
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:29:05
+ * @LastEditTime : 2022-02-24 16:24:32
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
 import { Component } from '@angular/core';
 import { NzModalRef } from 'ng-zorro-antd/modal';
+import { SupplyManagementService } from '../../services/supply-management.service';
 
 @Component({
   selector: 'publish-goods-tran-agreement',
@@ -18,11 +19,19 @@ import { NzModalRef } from 'ng-zorro-antd/modal';
 })
 export class TranAgreementComponent {
   
-  type: any;
-  constructor(private modal: NzModalRef) {
+  agreement:any;
+  constructor(private modal: NzModalRef,public service: SupplyManagementService,) {
     
   }
 
+  ngOnInit() {
+    this.service.request(this.service.$api_getAgreementInfoByType,{type:'6'}).subscribe((res) => {
+      if (res) {
+        this.agreement = res;
+      }
+    });
+  }
+
   handleOk(){
     this.modal.close(true);
   }