解决冲突
This commit is contained in:
@ -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>
|
||||
|
||||
@ -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;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user