解决冲突

src/app/routes/partner/partner-routing.module.ts

@@ -1,3 +1,13 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-02-24 15:07:57
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-02-24 15:23:48
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\partner-routing.module.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { PartnerBusinessStatisticsIndexComponent } from './business-statistics/components/index/index.component';
@@ -7,6 +17,7 @@ import { ParterLevelConfigEditComponent } from './level-config/components/edit/e
 import { ParterLevelConfigListComponent } from './level-config/components/list/list.component';
 import { PartnerPartnerStatisticsComponent } from './business-statistics/components/partner-statistics/partner-statistics.component';
 import { PartnerSaleStatisticsComponent } from './business-statistics/components/sale-statistics/sale-statistics.component';
+import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/list/particulars.component';
 
 const routes: Routes = [
   { path: 'index', component: PartnerBusinessStatisticsIndexComponent },
@@ -26,6 +37,11 @@ const routes: Routes = [
       {path: 'edit', component: ParterLevelConfigEditComponent},
     ]
   },
+  { path: 'rebate',
+  children:[
+    {path: 'particulars', component: ParterRebateManageMentParticularsComponent},
+  ]
+},
 
 ];
 @NgModule({

src/app/routes/partner/partner.module.ts

@@ -9,6 +9,7 @@ import { ParterLevelConfigEditComponent } from './level-config/components/edit/e
 import { ParterLevelConfigListComponent } from './level-config/components/list/list.component';
 import { PartnerPartnerStatisticsComponent } from './business-statistics/components/partner-statistics/partner-statistics.component';
 import { PartnerSaleStatisticsComponent } from './business-statistics/components/sale-statistics/sale-statistics.component';
+import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/list/particulars.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -17,7 +18,8 @@ const COMPONENTS: any[] = [
   ParterLevelConfigListComponent,
   ParterLevelConfigEditComponent,
   PartnerPartnerStatisticsComponent,
-  PartnerSaleStatisticsComponent
+  PartnerSaleStatisticsComponent,
+  ParterRebateManageMentParticularsComponent
 ];
 
 @NgModule({

src/app/routes/partner/rebate-management/components/list/particulars.component.html

@@ -0,0 +1,27 @@
+<nz-card>
+  <!-- 搜索区 -->
+  <sf
+    #sf
+    [ui]="ui"
+    [schema]="schema"
+    [mode]="'search'"
+    (formSubmit)="st?.load(1)"
+    (formReset)="resetSF()"
+  ></sf>
+</nz-card>
+
+<nz-card>
+  <!-- 数据列表 -->
+  <st
+    #st
+    [bordered]="true"
+    [data]="data"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500"
+    [loading]="service.http.loading"
+  >
+  </st>
+</nz-card>

src/app/routes/partner/rebate-management/components/list/particulars.component.ts

@@ -0,0 +1,165 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { processSingleSort, ShipperBaseService } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import {  RebateManagementService } from '../../services/rebate-management.service';
+
+@Component({
+  selector: 'app-parter-channel-rebate-management-particulars',
+  templateUrl: './particulars.component.html'
+})
+export class ParterRebateManageMentParticularsComponent implements OnInit {
+  schema: SFSchema = {};
+  columns!: STColumn[];
+  ui!: SFUISchema;
+  @ViewChild('st', { static: false })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  spuStatus = '1';
+
+  data=[{name1:1111}]
+  constructor(
+    public router: Router,
+    public ar: ActivatedRoute,
+    public service: RebateManagementService,
+    private modalService: NzModalService,
+    public shipperservice: ShipperBaseService
+
+  ) {}
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    return { ...this.sf?.value };
+  }
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        name: {
+          type: 'string',
+          title: '订单号'
+        },
+        phone: {
+          type: 'string',
+          title: '付款单号'
+        },
+        phone2: {
+          type: 'string',
+          title: '下单客户'
+        },
+        enterpriseInfoId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
+          },
+        },
+        phone3: {
+          type: 'string',
+          title: '合伙人名称'
+        },
+        deadlineTime: {
+          title: '时间范围',
+          type: 'string',
+          ui: {
+            widget: 'date',
+            mode: 'range',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+          } as SFDateWidgetSchema,
+        },
+      }
+    };
+    this.ui = {
+      '*': {
+        grid: { span: 8, gutter: 4 }
+      }
+    };
+  }
+
+  initST() {
+    this.columns = [
+      {
+        title: '订单号',
+        index: 'name1'
+      },
+      {
+        title: '订单金额（元）',
+        index: 'name1'
+      },
+      {
+        title: '付款金额（元）',
+        index: 'name1'
+      },
+      {
+        title: '返佣金额（元）',
+        index: 'name1'
+      },
+      {
+        title: '附加费率',
+        index: 'name1'
+      },
+      {
+        title: '下单客户',
+        index: 'name1'
+      },
+      {
+        title: '网络货运人',
+        index: 'name1'
+      },
+      {
+        title: '合伙人名称',
+        index: 'name1'
+      },
+      {
+        title: '网络货运人',
+        index: 'name1'
+      },
+      {
+        title: '合伙人等级',
+        index: 'name1'
+      },
+      {
+        title: '管理费比例',
+        index: 'name1'
+      },
+      {
+        title: '固定结算费率',
+        index: 'name1'
+      },
+      {
+        title: '返佣时间',
+        index: 'name1'
+      },
+
+    ];
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this.st.load(1);
+  }
+
+
+}

src/app/routes/partner/rebate-management/services/rebate-management.service.ts

@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class RebateManagementService extends BaseService {
+
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}

src/assets/mocks/menu-data.json

@@ -513,6 +513,24 @@
             "text": "业务统计",
             "link": "/partner/business-statistics/index"
             },
+            {
+              "text": "返佣管理",
+              "group": true,
+              "children": [
+                {
+                  "text": "返佣配置",
+                  "link": "/partner/rebate/"
+                },
+                {
+                  "text": "返佣明细",
+                  "link": "/partner/rebate/particulars"
+                },
+                {
+                  "text": "返佣记录",
+                  "link": "/partner/rebate/"
+                }
+              ]
+            },
             {
             "text": "销售渠道管理",
             "link": "/partner/channel-sales/list"