Merge branch 'feature/partner' of 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,8 +4,8 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-10 15:12:03
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html
+ * @LastEditTime : 2022-03-11 14:45:48
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\rebate-setting.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <page-header-wrapper [title]="''"> </page-header-wrapper>
@@ -31,6 +31,12 @@
 
 <nz-card>
   <!-- 数据列表 -->
+  <!-- +新增 -->
+  <div class="d-flex justify-content-end mb-sm">
+    <div>
+        <button nz-button nzType="primary" (click)="configAction()">新增</button>
+    </div>
+</div>
   <st
     #st
     [data]="data"

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

@@ -90,31 +90,35 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
     this.columns = [
       {
         title: '月份',
+        index: '配置名称'
+      },
+      {
+        title: '配置类型',
         index: 'name1'
       },
       {
-        title: '返佣金额（元）',
+        title: '备注',
         index: 'name1'
       },
       {
-        title: '合伙人名称',
+        title: '关联合伙人范围',
         index: 'name1'
       },
       {
-        title: '实际等级',
+        title: '创建时间',
         index: 'name1'
       },
       {
-        title: '管理费比例',
+        title: '启用时间',
         index: 'name1'
       },
       {
-        title: '返佣时间',
-        index: 'name1'
+        title: '优先级',
+        index: 'name44'
       },
       {
-        title: '异常反馈',
-        render: 'name44'
+        title: '状态',
+        index: 'name44'
       },
       {
         title: '操作',
@@ -123,35 +127,34 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
         className: 'text-left',
         buttons: [
           {
-            text: '明细',
+            text: '查看',
             click: _record => this.viewEvaluate(_record),
-          }
+          },
+          {
+            text: '禁用',
+            click: _record => this.viewEvaluate(_record),
+          },
         ]
       }
     ];
   }
   /**
-   *查看明细
+   *禁用
    */
    viewEvaluate(item: any) {
-    const modal = this.modal.create({
-      nzTitle: '明细',
-      nzWidth: 1200,
-      nzContent: ParterRebateManageMenRecordDetailComponent,
-      nzComponentParams: { },
-      nzFooter: null
-    });
-    modal.afterClose.subscribe((res: any) => {
-      if (res) {
+    this.modal.confirm({
+      nzTitle: '是否禁用该配置？',
+      nzOnOk: () => {
+        
       }
     });
   }
   /**
-   *异常反馈
+   *查看
    */
    feedback(item?: any) {
        const modal = this.modal.create({
-          nzTitle: '异常反馈',
+          nzTitle: '查看',
           nzWidth: 580,
           nzContent: ParterRebateManageMenAbnormalFeedbackComponent,
           nzComponentParams: { i: item },
@@ -161,6 +164,9 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
           if (res) {
           }
         });
+  }
+  configAction() {
+    
   }
   /**
    * 重置表单