fix bug

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-27 10:17:31
+ * @LastEditTime : 2022-05-05 15:12:33
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\particulars\\particulars.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -56,6 +56,7 @@
   <st
     #st
     [bordered]="true"
+    [scroll]="{x: '1200px'}"
     [data]="data"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"

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

@@ -51,13 +51,8 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
  */
    get reqParams() {
     const params: any = Object.assign({}, this.sf?.value || {});
-    const a: any = {};
-    if (this.resourceStatus) {
-      a.representationsStatus = this.resourceStatus;
-    }
     delete params._$expand;
     return { 
-      ...a,
       ...params,
       deadlineTime: {
         start: this.sf?.value?.deadlineTime?.[0] || '',
@@ -74,19 +69,19 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
     this.schema = {
       properties: {
         _$expand: { type: 'boolean', ui: { hidden: true } },
-        name: {
+        billCode: {
           type: 'string',
           title: '订单号'
         },
-        phone: {
+        orderPaymentCode: {
           type: 'string',
           title: '付款单号'
         },
-        phone2: {
+        enterpriseInfoName: {
           type: 'string',
           title: '下单客户'
         },
-        enterpriseInfoId: {
+        ltdId: {
           type: 'string',
           title: '网络货运人',
           ui: {
@@ -99,7 +94,7 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
             asyncData: () => this.shipperservice.getNetworkFreightForwarder()
           }
         },
-        phone3: {
+        partnerName: {
           type: 'string',
           title: '合伙人名称',
           ui: {
@@ -108,7 +103,7 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
             },
           }
         },
-        deadlineTime: {
+        handlerTime: {
           title: '时间范围',
           type: 'string',
           ui: {
@@ -134,7 +129,11 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
     this.resourceStatus = e;
     this.initST();
     setTimeout(() => {
-      this.data = this.service.$api_get_searchRefundPageList
+      if(e == 1) {
+        this.data = this.service.$api_get_searchRefundPageList
+      } else {
+        this.data = this.service.$api_get_searchPageList
+      }
       this.st.load();
     }, 500);
   }
@@ -142,55 +141,68 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
     this.columns = [
       {
         title: '订单号',
-        index: 'name1'
+        width: 150,
+        index: 'billCode'
       },
       {
         title: '订单金额（元）',
-        index: 'name1'
+        width: 150,
+        index: 'orderAmount'
       },
       {
         title: '付款金额（元）',
-        index: 'name1'
+        width: 150,
+        index: 'payAmount'
       },
       {
         title: '预估返佣金额（元）',
-        index: 'name1'
+        width: 150,
+        index: 'profitAmount'
       },
       {
         title: '附加费率',
-        index: 'name1'
+        width: 150,
+        index: 'additionalRate'
       },
       {
         title: '下单客户',
-        index: 'name1'
+        width: 150,
+        index: 'enterpriseInfoName'
       },
       {
         title: '网络货运人',
-        index: 'name1'
+        width: 180,
+        index: 'ltdName'
       },
       {
         title: '销售渠道',
-        index: 'name1'
+        width: 180,
+        index: 'salesmanName'
       },
       {
         title: '合伙人名称',
-        index: 'name1'
+        width: 180,
+        index: 'partnerName'
       },
       {
         title: '合伙人等级',
-        index: 'name1'
+        width: 150,
+        index: 'partnerLevelName'
       },
       {
         title: '管理费比例',
-        index: 'name1'
+        width: 150,
+        index: 'manageFee'
       },
       {
         title: '固定结算费率',
-        index: 'name1'
+        width: 150,
+        index: 'settlementFee'
       },
       {
         title: '返佣时间',
-        index: 'name1'
+        width: 180,
+        index: 'returnCommissionTime'
       }
     ];
   }

src/app/shared/components/rebate-table/rebate-table.component.ts

@@ -43,6 +43,8 @@ export class RebateTableComponent implements OnInit {
       this.data = [
         {
           gradeConfigId: '0',
+          startAmount: 0,
+          endAmount: 0,
           managementFeeRatio: 0,
         }
       ];