解决冲突

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

@@ -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',
+  selector: 'app-contract-management-contract-partner',
-  templateUrl: './contract-frame.component.html',
+  templateUrl: './contract-partner.component.html',
-  styleUrls: ['./contract-frame.component.less']
+  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;

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

@@ -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>

src/app/routes/contract-management/contract-management-routing.module.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-04 21:05:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:15:03
+ * @LastEditTime : 2022-02-23 19:39:21
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\contract-management-routing.module.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -13,6 +13,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { ContractManagementDetailComponent } from './components/contract-detail/contract-detail.component';
 import { ContractManagementContractListComponent } from './components/contract-list/contract-list.component';
+import { ContractManagementPartnerComponent } from './components/contract-partner/contract-partner.component';
 import { ContractManagementTemplateDetailComponent } from './components/contract-template-detail/contract-template-detail.component';
 import { ContractManagementTemplateComponent } from './components/contract-template/contract-template.component';
 import { ContractManagementIndexComponent } from './components/index/index.component';
@@ -22,7 +23,8 @@ const routes: Routes = [
   { path: 'index/detail/:id', component: ContractManagementDetailComponent },
   { path: 'template', component: ContractManagementTemplateComponent },
   { path: 'template/detail/:id', component: ContractManagementTemplateDetailComponent },
-  { path: 'policy', component: ContractManagementPolicyComponent }
+  { path: 'policy', component: ContractManagementPolicyComponent },
+  { path: 'partner', component: ContractManagementPartnerComponent },
 ];
 
 @NgModule({

src/app/routes/contract-management/contract-management.module.ts

@@ -20,6 +20,7 @@ import { ContractManagementIndexComponent } from './components/index/index.compo
 import { ContractManagementFrameComponent } from './components/contract-frame/contract-frame.component';
 import { ContractManagementTemplateDetailComponent } from './components/contract-template-detail/contract-template-detail.component';
 import { ContractManagementDetailComponent } from './components/contract-detail/contract-detail.component';
+import { ContractManagementPartnerComponent } from './components/contract-partner/contract-partner.component';
 
 const COMPONENTS: any = [
   ContractManagementContractListComponent,
@@ -28,7 +29,8 @@ const COMPONENTS: any = [
   ContractManagementTemplateDetailComponent,
   ContractManagementIndexComponent,
   ContractManagementFrameComponent,
-  ContractManagementDetailComponent
+  ContractManagementDetailComponent,
+  ContractManagementPartnerComponent
 ];
 const NOTROUTECOMPONENTS: any = [];
 @NgModule({