fix bug

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

@@ -4,15 +4,14 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-24 20:14:21
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\list\\particulars.component.html
+ * @LastEditTime : 2022-03-09 15:04:50
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <page-header-wrapper [title]="''"> </page-header-wrapper>
 <nz-card>
   <div nz-row nzGutter="8">
     <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
-    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
       <sf
         #sf
         [schema]="schema"
@@ -20,26 +19,13 @@
         [mode]="'search'"
         [disabled]="!sf?.valid"
         [loading]="service.http.loading"
-        (formSubmit)="st?.load(1)"
-        (formReset)="resetSF()"
+        [button]="'none'"
       ></sf>
-    </div>
-
-    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
-    <ng-container *ngIf="queryFieldCount > 4">
-      <div nz-col [nzSpan]="_$expand ? 24 : 18">
-        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
-      </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1);">查询</button>
-        <button nz-button nzType="primary" [disabled]="service.http.loading" >导出</button>
-        <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
-        <button nz-button nzType="link" (click)="expandToggle()">
-          {{ !_$expand ? '展开' : '收起' }}
-          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-        </button>
-      </div>
-    </ng-container>
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1);">查询</button>
+      <button nz-button nzType="primary" [disabled]="service.http.loading" >导出</button>
+      <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+    </div>
   </div>
 </nz-card>
 
@@ -47,7 +33,6 @@
   <!-- 数据列表 -->
   <st
     #st
-    [bordered]="true"
     [data]="data"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"

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

@@ -1,3 +1,4 @@
+import { ModalHelper } from '@delon/theme';
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
@@ -5,12 +6,13 @@ import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/fo
 import { processSingleSort, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { RebateManagementService } from '../../services/rebate-management.service';
+import { ParterRebateManageMenRecordDetailComponent } from '../../model/record-detail/record-detail.component';
 
 @Component({
-  selector: 'app-parter-channel-rebate-management-particulars',
-  templateUrl: './particulars.component.html'
+  selector: 'app-parter-channel-rebate-management-record',
+  templateUrl: './rebate-record.component.html'
 })
-export class ParterRebateManageMentParticularsComponent implements OnInit {
+export class ParterRebateManageMentRecordComponent implements OnInit {
   schema: SFSchema = {};
   columns!: STColumn[];
   ui!: SFUISchema;
@@ -26,7 +28,8 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
     public ar: ActivatedRoute,
     public service: RebateManagementService,
     private modalService: NzModalService,
-    public shipperservice: ShipperBaseService
+    public shipperservice: ShipperBaseService,
+    private modal: ModalHelper
   ) {}
   /**
    * 查询字段个数
@@ -64,53 +67,15 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
     this.schema = {
       properties: {
         _$expand: { type: 'boolean', ui: { hidden: true } },
-        name: {
+        month: {
           type: 'string',
-          title: '订单号'
+          title: '时间月份',
+          format: 'month',
         },
         phone: {
           type: 'string',
-          title: '付款单号'
+          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: '合伙人名称',
-          ui: {
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
-          }
-        },
-        deadlineTime: {
-          title: '时间范围',
-          type: 'string',
-          ui: {
-            widget: 'date',
-            mode: 'range',
-            format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
-            allowClear: true
-          } as SFDateWidgetSchema
-        }
       }
     };
     this.ui = {
@@ -124,35 +89,11 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
   initST() {
     this.columns = [
       {
-        title: '订单号',
+        title: '月份',
         index: 'name1'
       },
       {
-        title: '订单金额（元）',
-        index: 'name1'
-      },
-      {
-        title: '付款金额（元）',
-        index: 'name1'
-      },
-      {
-        title: '预估返佣金额（元）',
-        index: 'name1'
-      },
-      {
-        title: '附加费率',
-        index: 'name1'
-      },
-      {
-        title: '下单客户',
-        index: 'name1'
-      },
-      {
-        title: '网络货运人',
-        index: 'name1'
-      },
-      {
-        title: '销售渠道',
+        title: '返佣金额（元）',
         index: 'name1'
       },
       {
@@ -160,7 +101,7 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
         index: 'name1'
       },
       {
-        title: '合伙人等级',
+        title: '实际等级',
         index: 'name1'
       },
       {
@@ -168,16 +109,38 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
         index: 'name1'
       },
       {
-        title: '固定结算费率',
+        title: '返佣时间',
         index: 'name1'
       },
       {
-        title: '返佣时间',
+        title: '异常反馈',
         index: 'name1'
+      },
+      {
+        title: '操作',
+        fixed: 'right',
+        width: '90px',
+        className: 'text-left',
+        buttons: [
+          {
+            text: '明细',
+            click: _record => this.viewEvaluate(_record),
+          }
+        ]
       }
     ];
   }
+  /**
+   *查看详情
+   */
+   viewEvaluate(item: any) {
+    //  this.modalService
+    this.modal.createStatic(ParterRebateManageMenRecordDetailComponent, {i:item}).subscribe((res: boolean)=> {
+      if(res) {
 
+      }
+    })
+  }
   /**
    * 重置表单
    */