解决冲突

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-09 15:14:50
+ * @LastEditTime : 2022-03-10 14:05:25
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\record-detail\\record-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -23,7 +23,7 @@
   <st
     #st
     [bordered]="true"
-    [data]="data"
+    [data]="service.$api_get_listCompliancePage"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
@@ -32,3 +32,7 @@
     [loading]="service.http.loading"
   >
   </st>
+  <div>合计：2999.00元</div>
+  <div nz-col class="text-center">
+  <button nz-button nzType="primary" (click)="close()">确定</button>
+  </div>

src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.less

@@ -0,0 +1,6 @@
+:host {
+    [nz-button] {
+        margin-right: 8px;
+        margin-bottom: 12px;
+      }
+}

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

@@ -2,10 +2,11 @@ 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';
-import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { processSingleSort, ShipperBaseService } from '@shared';
-import { NzModalService } from 'ng-zorro-antd/modal';
+import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal';
 import { RebateManagementService } from '../../services/rebate-management.service';
+import { NzButtonSize } from 'ng-zorro-antd/button';
 
 @Component({
   selector: 'app-parter-channel-rebate-management-record-detail',
@@ -20,6 +21,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
   @ViewChild('sf', { static: false })
   sf!: SFComponent;
   spuStatus = '1';
+  size: NzButtonSize = 'large';
   _$expand = false;
   data = [{ name1: 1111 }];
   constructor(
@@ -28,6 +30,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
     public service: RebateManagementService,
     private modalService: NzModalService,
     public shipperservice: ShipperBaseService,
+    public modalRef: NzModalRef,
   ) {}
   /**
    * 查询字段个数
@@ -50,10 +53,6 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
     delete params._$expand;
     return { 
       ...params,
-      deadlineTime: {
-        start: this.sf?.value?.deadlineTime?.[0] || '',
-        end: this.sf?.value?.deadlineTime?.[1] || '',
-      },
      };
   }
   ngOnInit() {
@@ -64,54 +63,33 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
   initSF() {
     this.schema = {
       properties: {
-        _$expand: { type: 'boolean', ui: { hidden: true } },
-        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()
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
+            change: (value: any) => {
+              console.log(value)
+              this.st.reload()
+            }
           }
         },
-        phone3: {
-          type: 'string',
-          title: '合伙人名称',
-          ui: {
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
-          }
-        },
-        deadlineTime: {
-          title: '时间范围',
+        paymentStatus: {
+          title: '银行类型',
           type: 'string',
           ui: {
-            widget: 'date',
-            mode: 'range',
-            format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
-            allowClear: true
-          } as SFDateWidgetSchema
+            widget: 'dict-select',
+            params: { dictKey: 'overall:payment:status' },
+            containsAllLabel: true,
+            change: (value: any) => {
+              console.log(value)
+              this.st.reload()
             }
+          } as SFSelectWidgetSchema
+        },
       }
     };
     this.ui = {
@@ -126,7 +104,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
     this.columns = [
       {
         title: '订单号',
-        index: 'name1'
+        index: 'billCode'
       },
       {
         title: '订单金额（元）',
@@ -186,4 +164,8 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
     this.sf.reset();
     this.st.load(1);
   }
+  close() {
+    this.modalRef.destroy()
+  }
 }
+

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

@@ -1,3 +1,13 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-10 11:19:00
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-10 13:51:05
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\services\\rebate-management.service.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 import { Injectable, Injector } from '@angular/core';
 import { BaseService } from '@shared';
 
@@ -5,7 +15,8 @@ import { BaseService } from '@shared';
   providedIn: 'root',
 })
 export class RebateManagementService extends BaseService {
-
+  // 查询规则抽查列表
+  public $api_get_listCompliancePage = '/api/sdc/billRiskOperate/listRiskPage';
   constructor(public injector: Injector) {
     super(injector);
   }