fix bug

2022-03-29 13:53:23 +08:00
parent ff02b82dc4
commit f5fc1b901d
5 changed files with 44 additions and 60 deletions
--- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-02-24 20:09:49
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-10 15:12:03
+ * @LastEditTime : 2022-03-29 13:40:16
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -33,7 +33,7 @@
  <!-- 数据列表 -->
  <st
    #st
-    [data]="data"
+    [data]="service.$api_get_getIncomeByBillpage"
    [columns]="columns"
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
@ -41,8 +41,8 @@
    [loadingDelay]="500"
    [loading]="service.http.loading"
  >
-  <ng-template st-row='name44' let-item let-index='index'>
-    <div style="color: #f59a23;" (click)="feedback()">1223</div>
+  <ng-template st-row='abnormalFeedback' let-item let-index='index'>
+    <div style="color: #f59a23;" (click)="feedback()">123212{{item?.abnormalFeedback}}</div>
  </ng-template>
  </st>
 </nz-card>
--- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
@ -32,30 +32,12 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
    public shipperservice: ShipperBaseService,
  ) {}
  /**
-   * 查询字段个数
-   */
-  get queryFieldCount(): number {
-    return Object.keys(this.schema?.properties || {}).length;
-  }
-    /**
-  * 伸缩查询条件
-  */
-     expandToggle(): void {
-      this._$expand = !this._$expand;
-      this.sf?.setValue('/_$expand', this._$expand);
-    }
-  /**
 * 查询参数
 */
   get reqParams() {
    const params: any = Object.assign({}, this.sf?.value || {});
-    delete params._$expand;
    return { 
      ...params,
-      deadlineTime: {
-        start: this.sf?.value?.deadlineTime?.[0] || '',
-        end: this.sf?.value?.deadlineTime?.[1] || '',
-      },
     };
  }
  ngOnInit() {
@ -66,7 +48,6 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
  initSF() {
    this.schema = {
      properties: {
-        _$expand: { type: 'boolean', ui: { hidden: true } },
        month: {
          type: 'string',
          title: '时间月份',
@ -90,7 +71,8 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
    this.columns = [
      {
        title: '月份',
-        index: 'name1'
+        index: 'month',
+        format: (item: any) => {return item?.month ? item?.month + '月' : ''}
      },
      {
        title: '返佣金额（元）',
@ -98,7 +80,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
      },
      {
        title: '合伙人名称',
-        index: 'name1'
+        index: 'partnerName'
      },
      {
        title: '实际等级',
@ -106,7 +88,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
      },
      {
        title: '管理费比例',
-        index: 'name1'
+        index: 'rebateRatio'
      },
      {
        title: '返佣时间',
@ -114,7 +96,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
      },
      {
        title: '异常反馈',
-        render: 'name44'
+        render: 'abnormalFeedback'
      },
      {
        title: '操作',
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-02-24 20:09:49
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-29 10:51:52
+ * @LastEditTime : 2022-03-29 11:14:08
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\rebate-setting.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -41,6 +41,7 @@
    #st
    [data]="service.$api_get_rebateConfig"
    [columns]="columns"
+    [scroll]="{x: '1200px'}"
    [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] }"
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
@ -23,7 +23,6 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
  sf!: SFComponent;
  spuStatus = '1';
  _$expand = false;
-  data = [{ name1: 1111 }];
  constructor(
    public router: Router,
    public ar: ActivatedRoute,
@ -32,30 +31,12 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
    public shipperservice: ShipperBaseService,
  ) {}
  /**
-   * 查询字段个数
-   */
-  get queryFieldCount(): number {
-    return Object.keys(this.schema?.properties || {}).length;
-  }
-    /**
-  * 伸缩查询条件
-  */
-     expandToggle(): void {
-      this._$expand = !this._$expand;
-      this.sf?.setValue('/_$expand', this._$expand);
-    }
-  /**
 * 查询参数
 */
   get reqParams() {
    const params: any = Object.assign({}, this.sf?.value || {});
-    delete params._$expand;
    return { 
      ...params,
-      deadlineTime: {
-        start: this.sf?.value?.deadlineTime?.[0] || '',
-        end: this.sf?.value?.deadlineTime?.[1] || '',
-      },
     };
  }
  ngOnInit() {
@ -66,15 +47,22 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
  initSF() {
    this.schema = {
      properties: {
-        _$expand: { type: 'boolean', ui: { hidden: true } },
-        month: {
+        configName: {
          type: 'string',
          title: '配置名称',
-          format: 'configName',
        },
        stateLocked: {
          type: 'string',
-          title: '状态'
+          title: '状态',
+          enum: [
+            {label: '全部', value: ''},
+            {label: '启用', value: 0},
+            {label: '禁用', value: 1},
+          ],
+          ui: {
+            widget: 'select',
+          },
+        
        },
      }
    };
@ -90,35 +78,44 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
    this.columns = [
      {
        title: '配置名称',
-        index: 'configName'
+        index: 'configName',
+        width: '200px',
      },
      {
        title: '配置类型',
-        render: 'configType'
+        render: 'configType',
+        width: '200px',
+
      },
      {
        title: '备注',
-        index: 'remark'
+        index: 'remark',
+        width: '250px',
      },
      {
        title: '关联合伙人范围',
-        render: 'partnerType'
+        render: 'partnerType',
+        width: '200px',
      },
      {
        title: '创建时间',
-        index: 'enableTime'
+        index: 'enableTime',
+        width: '200px',
      },
      {
        title: '启用时间',
-        index: 'enableTime'
+        index: 'enableTime',
+        width: '200px',
      },
      {
        title: '优先级',
-        index: 'priority'
+        index: 'priority',
+        width: '100px',
      },
      {
        title: '状态',
-        render: 'stateLocked'
+        render: 'stateLocked',
+        width: '100px',
      },
      {
        title: '操作',
--- a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts
+++ b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-03-10 11:19:00
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-10 13:51:05
+ * @LastEditTime : 2022-03-29 11:26:38
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\services\\rebate-management.service.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -23,6 +23,10 @@ export class RebateManagementService extends BaseService {
  public $api_save_rebateConfig = '/api/mdc/rebateConfig/save';
  // 启用/禁用返佣配置
  public $api_set_updateRebateConfig = '/api/mdc/rebateConfig/updateRebateConfig';
+
+
+  // 运营端查询合伙人返佣
+  public $api_get_getIncomeByBillpage = '/api/bpc/partnerIncomeHead/getIncomeByBillpage';
    // 查询合伙人信息-分页
  public $api_get_partner_page = '/api/mdc/partner/list/page';
  constructor(public injector: Injector) {