Merge branch 'feature/partner' of https://gitlab.eascs.com/tms-ui/tms-obc-web into feature/partner

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-11 14:45:48
+ * @LastEditTime : 2022-03-22 14:42:27
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\rebate-setting.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -39,7 +39,7 @@
 </div>
   <st
     #st
-    [data]="data"
+    [data]="service.$api_get_rebateConfig"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"

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

@@ -72,7 +72,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
           title: '时间月份',
           format: 'month',
         },
-        phone: {
+        partnerId: {
           type: 'string',
           title: '合伙人名称'
         },
@@ -94,31 +94,31 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
       },
       {
         title: '配置类型',
-        index: 'name1'
+        index: 'configType'
       },
       {
         title: '备注',
-        index: 'name1'
+        index: 'remark'
       },
       {
         title: '关联合伙人范围',
-        index: 'name1'
+        index: 'partnerType'
       },
       {
         title: '创建时间',
-        index: 'name1'
+        index: 'enableTime'
       },
       {
         title: '启用时间',
-        index: 'name1'
+        index: 'enableTime'
       },
       {
         title: '优先级',
-        index: 'name44'
+        index: 'priority'
       },
       {
         title: '状态',
-        index: 'name44'
+        index: 'stateLocked'
       },
       {
         title: '操作',

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

@@ -17,6 +17,8 @@ import { BaseService } from '@shared';
 export class RebateManagementService extends BaseService {
   // 查询规则抽查列表
   public $api_get_listCompliancePage = '/api/sdc/billRiskOperate/listRiskPage';
+  // 查询返佣配置表
+  public $api_get_rebateConfig = '/api/mdc/rebateConfig/list/page';
   constructor(public injector: Injector) {
     super(injector);
   }