Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-28 20:57:17 +08:00
parent 88f4d1f195
commit 3088476b67
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
<h2 style="text-align: center;"> <h2 style="text-align: center;">
{{ agreement?.agreementName }} <div [innerHTML]="agreement | safehtml"></div>
</h2> </h2>
<div *nzModalFooter> <div *nzModalFooter>
<button nz-button nzType="primary" (click)="handleOk()" >我已阅读并同意签署</button> <button nz-button nzType="primary" (click)="handleOk()" >我已阅读并同意签署</button>

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

@ -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 : * @Description :
* @Version : 1.0 * @Version : 1.0
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-06 15:01:40 * @Date : 2022-01-06 15:01:40
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -47,7 +57,8 @@ export class TranAgreementComponent {
this.service.request(this.service.$api_getContractContent,params).subscribe((res) => { this.service.request(this.service.$api_getContractContent,params).subscribe((res) => {
if (res) { if (res) {
this.agreement = res;
this.agreement = res.contractContent;
} }
}); });
} }