fix bug

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-07 15:42:10
+ * @LastEditTime : 2022-05-11 16:40:32
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -23,7 +23,14 @@
     <sv-title> 固定结算费率配置</sv-title>
 
     <sv label="固定结算费率">
-      <nz-input-number [disabled]="hiden" [nzMin]="0" [nzMax]="100" [(ngModel)]="accountingRate" [nzPrecision]="precision" nzPlaceHolder="请输入"></nz-input-number
+      <nz-input-number
+        [disabled]="hiden"
+        [nzMin]="0"
+        [nzMax]="100"
+        [(ngModel)]="accountingRate"
+        [nzPrecision]="precision"
+        nzPlaceHolder="请输入"
+      ></nz-input-number
       >&nbsp;%</sv
     >
 
@@ -74,15 +81,26 @@
     </sv>
 
     <sv label="优先级" col="1">
-      <!-- <nz-select [(ngModel)]="priority" [disabled]="hiden" style="max-width: 400px; min-width: 200px; margin-left: 28px">
+      <nz-input-number
-        <nz-option nzValue="1" nzLabel="1">1</nz-option>
+        style="max-width: 400px; min-width: 200px; margin-left: 28px"
-        <nz-option nzValue="2" nzLabel="2">2</nz-option>
+        [(ngModel)]="priority"
-        <nz-option nzValue="3" nzLabel="3">3</nz-option>
+        [nzMin]="0"
-        <nz-option nzValue="4" nzLabel="4">4</nz-option>
+        [nzMax]="9999"
-        <nz-option nzValue="5" nzLabel="5">5</nz-option>
+        [nzStep]="1"
-      </nz-select> -->
+      ></nz-input-number>
-      <nz-input-number style="max-width: 400px; min-width: 200px; margin-left: 28px" [(ngModel)]="priority" [nzMin]="0" [nzMax]="9999" [nzStep]="1"></nz-input-number>
+      <div style="color: #7F7F7F;margin-left: 28px">
+        1、指全部合伙人、新注册合伙人、自定义合伙人三种范围优先执行的顺序，等级数字越大，优先执行该返佣模板<br />
+        2、同一合伙人范围的按创建时间最新的执行返佣模板
+      </div>
     </sv>
+    <!-- <sv label="生效时间" col="1">
+      <nz-date-picker
+      nzShowTime
+      nzFormat="yyyy-MM-dd HH:mm:ss"
+      [(ngModel)]="enableTime"
+      nzPlaceHolder="请选择，精确到秒"
+    ></nz-date-picker>
+    </sv> -->
 
     <sv label="规则说明" col="1">
       <sf

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-05-07 15:38:49
+ * @LastEditTime : 2022-05-11 16:49:20
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -12,6 +12,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFSchema } from '@delon/form';
+import { DatePipe } from '@delon/theme';
 import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { RebateManagementService } from '../../../services/rebate-management.service';
@@ -19,7 +20,8 @@ import { ParterRebateManageMentAddPartnerListComponent } from '../add-partnerlis
 @Component({
   selector: 'app-parter-channel-rebate-management-add',
   styleUrls: ['./add.component.less'],
-  templateUrl: './add.component.html'
+  templateUrl: './add.component.html',
+  providers: [DatePipe]
 })
 export class ParterRebateManageMentAddComponent implements OnInit {
   @ViewChild('table') table!: any;
@@ -27,6 +29,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
   tabelData: any;
   tabelType: any;
   formData: any;
+  enableTime: any;
   addStatus: boolean = false;
   hiden: boolean = false;
   configName: string = '';
@@ -48,7 +51,8 @@ export class ParterRebateManageMentAddComponent implements OnInit {
     public ar: ActivatedRoute,
     public service: RebateManagementService,
     private modal: NzModalService,
-    public shipperservice: ShipperBaseService
+    public shipperservice: ShipperBaseService,
+    private datePipe: DatePipe
   ) {}
   columns: STColumn[] = [];
   initSF(data?: any) {
@@ -200,6 +204,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
       accountingRate: this.accountingRate,
       configName: this.configName,
       configType: this.configType,
+      // enableTime:this.datePipe.transform(this.enableTime,'yyyy-MM-dd HH:mm:ss'),
       rebateConfigLineDTO: this.table.data,
       priority: this.priority, // 优先级
       partnerIds: this.partnerId,
@@ -229,6 +234,8 @@ export class ParterRebateManageMentAddComponent implements OnInit {
         this.priority = res?.priority + '';
         this.formData = { ruleDescription: res?.ruleDescription };
         this.remark = res.remark;
+        // this.enableTime = res.enableTime;
+        // this.enableTime = new Date(Date.parse(res?.enableTime?.replace(/-/g, '/')))
       }
     });
   }