fix bug

2022-04-22 14:50:58 +08:00
parent b67401d311
commit 33963ed45d
11 changed files with 431 additions and 238 deletions
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-03-28 14:53:52
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-28 17:03:21
+ * @LastEditTime : 2022-04-22 10:30:33
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add-partnerlist\\add-partnerlist.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -25,6 +25,6 @@
        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"
        [scroll]="{ x: '1000' }">
      </st>
-    <button *ngIf="selectedIndex===0" (click)="batchReply()" nz-button nzType="primary" acl
-      [acl-ability]="['AbnormalAppear-batchReply']">批量回复</button>
+    <button style="float: right;" *ngIf="selectedIndex===0" (click)="batchReply()" nz-button nzType="primary" acl
+      [acl-ability]="['AbnormalAppear-batchReply']">批量选择</button>
 </nz-card>
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
@ -4,38 +4,44 @@
 * @Author       : Shiming
 * @Date         : 2022-02-24 20:09:49
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-29 10:47:02
+ * @LastEditTime : 2022-04-22 14:29:23
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <page-header-wrapper [title]="'新增'"> </page-header-wrapper>
 <nz-card>
-  <div nz-row>
- 
  <!-- 数据列表 -->
 <sv-container col="1">
-  &nbsp;&nbsp;<sv label="配置名称">  <input style="max-width: 400px;" nz-input placeholder="请输入" [(ngModel)]="configName" /></sv>
+    <sv label="配置名称">  <input style="max-width: 400px;" nz-input placeholder="请输入" [(ngModel)]="configName" /></sv>
+
   <sv-title>固定结算费率配置</sv-title>
-   &nbsp;&nbsp;<sv label="固定结算费率"> <nz-input-number [(ngModel)]="accountingRate" [nzPrecision]="precision" nzPlaceHolder="请输入"></nz-input-number>&nbsp;%</sv>
+
+   <sv label="固定结算费率"> <nz-input-number [(ngModel)]="accountingRate" [nzPrecision]="precision" nzPlaceHolder="请输入"></nz-input-number>&nbsp;%</sv>
+
   <sv-title>业务量和管理费比例配置</sv-title>
-   &nbsp;&nbsp;<sv label="选择配置类型">
+
+   <sv label="选择配置类型">
    <nz-radio-group [(ngModel)]="configType">
      <label nz-radio nzValue="1">按全部等级配置</label>
      <label nz-radio nzValue="2">按不同等级配置</label>
    </nz-radio-group>
    </sv>
-    <sv col="1">
-      &nbsp;&nbsp;
-      <app-rebate-table #table [(data)]='tabelData'></app-rebate-table>
+
+    <sv col="1" >
+      <div style='width: 850px'>
+        <app-rebate-table  #table [(data)]='tabelData'></app-rebate-table>
+      </div>
    </sv>
+
   <sv-title>关联合伙人配置</sv-title>
-   &nbsp;&nbsp;<sv label="合伙人选择">
-    <nz-select [(ngModel)]="partnerType" style="max-width: 400px; min-width: 200px;">
+
+   <sv label="合伙人选择">
+    <nz-select [(ngModel)]="partnerType" (ngModelChange)="changePartner(partnerType)" style="max-width: 400px; min-width: 200px;">
      <nz-option nzValue="1" nzLabel="全部合伙人"></nz-option>
      <nz-option nzValue="2" nzLabel="新注册合伙人"></nz-option>
      <nz-option nzValue="3" nzLabel="自定义合伙人"></nz-option>
    </nz-select>
-    &nbsp;&nbsp;<span style="color: #0000FF;" (click)="add()">添加</span>
+    <span *ngIf="addStatus" style="padding-left: 15px; color: #0000FF;" (click)="add()">添加</span>
    <st  *ngIf="partnerPeopleList?.length > 0" #st [data]="partnerPeopleList" [columns]="columns"
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' } }"
    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
@ -43,7 +49,8 @@
    [scroll]="{ x: '1000' }">
  </st>
  </sv>
-   &nbsp;&nbsp;<sv label="优先级" col="1">
+
+   <sv label="优先级" col="1">
    <nz-select [(ngModel)]="priority" style="max-width: 400px; min-width: 200px;">
      <nz-option nzValue=1 nzLabel="1">1</nz-option>
      <nz-option nzValue=2 nzLabel="2">2</nz-option>
@ -52,19 +59,22 @@
      <nz-option nzValue=5 nzLabel="5">5</nz-option>
    </nz-select>
  </sv>
-   &nbsp;&nbsp;<sv label="规则说明" col="1">
-    <sf #sf mode="edit" [schema]="schema1" [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 16 }} }"
+
+   <sv label="规则说明" col="1">
+    <sf #sf mode="edit" [schema]="schema1" [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 12 }} }"
    button="none"> </sf>
  </sv>
-   &nbsp;&nbsp;<sv label="备注" col="1">
+
+   <sv label="备注" col="1" style="margin-top: 16px;">
    <textarea style="max-width: 400px; min-width: 200px;" rows="4" nz-input [(ngModel)]="remarke"></textarea>
  </sv>
+
 </sv-container>
+
 <div class="align-center" style="margin-top: 15px;">
  <button nz-button nzType="primary" (click)="goBack()">取消</button>
  <button  nz-button nzType="primary" style="margin-left: 48px" (click)="save()"
  acl  [acl-ability]="['SUPPLY-VEHICLE-AMEND-submitChange']">提交</button
  >
 </div>
- </div>
 </nz-card>
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-03-21 09:26:45
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-29 10:53:39
+ * @LastEditTime : 2022-04-22 14:44:12
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -26,6 +26,7 @@ import { inRange } from '@delon/util';
 export class ParterRebateManageMentAddComponent implements OnInit {
  @ViewChild('table') table!: any;
  tabelData: any;
+  addStatus: boolean = false;
  configName: string = '';
  partnerType: string = '';
  remarke: string = '';
@ -78,7 +79,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
            widget: 'tinymce',
            loadingTip: 'loading...',
            config: {
-              height: 650
+              height: 500,
            }
          },
          // default: data?.agreementContent || ''
@ -87,6 +88,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
    };
  }
  ngOnInit() {
+    this.addStatus =false
    this.initSF();
  }
  goBack() {
@ -123,7 +125,9 @@ export class ParterRebateManageMentAddComponent implements OnInit {
    });
  }
  delete(item: any) {
-  console.log(item);
+  this.partnerPeopleList = this.partnerPeopleList.filter((d:any, i: any) => {
+   return item.id != d.id
+  });
  }
  save () {
    const params = {
@ -146,4 +150,10 @@ export class ParterRebateManageMentAddComponent implements OnInit {
      }
    })
  }
+  changePartner(value: any) {
+    console.log(value);
+    if(value) {
+      this.addStatus = true
+    }
+  }
 }