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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-23 19:39:42 +08:00
parent 6fffab32a4
commit 6f8929037e
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts
View File

@ -6,11 +6,11 @@ import { NzModalService } from 'ng-zorro-antd/modal';
import { ContractManagementService } from '../../services/contract-management.service';
@Component({
selector: 'app-contract-management-contract-frame',
templateUrl: './contract-frame.component.html',
styleUrls: ['./contract-frame.component.less']
selector: 'app-contract-management-contract-partner',
templateUrl: './contract-partner.component.html',
styleUrls: ['./contract-partner.component.less']
})
export class ContractManagementFrameComponent implements OnInit {
export class ContractManagementPartnerComponent implements OnInit {
url = `/rule?_allow_anonymous=true`;
@ViewChild('st', { static: true })
st!: STComponent;

4
src/app/routes/contract-management/components/index/index.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-07 13:27:10
* @LastEditors : Shiming
* @LastEditTime : 2022-02-23 19:30:19
* @LastEditTime : 2022-02-23 19:39:38
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\index\\index.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -20,7 +20,7 @@
<app-contract-management-contract-frame></app-contract-management-contract-frame>
</nz-tab>
<nz-tab nzTitle="合伙人合同">
<app-contract-management-contract-frame></app-contract-management-contract-frame>
<app-contract-management-contract-partner></app-contract-management-contract-partner>
</nz-tab>
</nz-tabset>
</ng-template>