From 3088476b6760827c9e3aee142c6aebe351f84c8c Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 28 Feb 2022 20:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tran-agreement/tran-agreement.component.html  |  2 +-
 .../tran-agreement/tran-agreement.component.ts    | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html
index 156e8383..025765ab 100644
--- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html
+++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html
@@ -1,5 +1,5 @@
 <h2 style="text-align: center;">
-  {{ agreement?.agreementName }}
+  <div [innerHTML]="agreement | safehtml"></div>
 </h2>
 <div *nzModalFooter>
   <button nz-button nzType="primary" (click)="handleOk()" >我已阅读并同意签署</button>
diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
index 52574266..05977ab4 100644
--- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
+++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
@@ -1,10 +1,20 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-02-24 20:19:51
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-02-28 20:55:59
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 /*
  * @Description  : 
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2022-01-06 15:01:40
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 20:40:35
+ * @LastEditTime : 2022-02-28 20:55:07
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -47,7 +57,8 @@ export class TranAgreementComponent {
     
     this.service.request(this.service.$api_getContractContent,params).subscribe((res) => {
       if (res) {
-        this.agreement = res;
+        
+        this.agreement = res.contractContent;
       }
     });
   }