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-04-26 16:51:07
+ * @LastEditTime : 2022-04-26 19:50:16
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -54,7 +54,7 @@
         (ngModelChange)="changePartner(partnerType)"
         style="max-width: 400px; min-width: 200px"
       >
-        <nz-option nzValue="1" nzLabel="全部合伙人"></nz-option>
+        <nz-option nzValue="1" nzLabel="全部合伙人(默认模板)"></nz-option>
         <nz-option nzValue="2" nzLabel="新注册合伙人"></nz-option>
         <nz-option nzValue="3" nzLabel="自定义合伙人"></nz-option>
       </nz-select>

src/app/routes/partner/system-config/components/config/config.component.html

@@ -12,7 +12,7 @@
       <nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab === 0">
         <h3 style="font-weight: 600">提现手续费配置</h3>
         <div nz-row nzGutter="8">
-          <div nz-col nzSpan="24" se-container [labelWidth]="230" [se-container]="1">
+          <div nz-col nzSpan="24" se-container [labelWidth]="125" [se-container]="1">
             <se label="个人提现手续费" style="margin-bottom: 0">
               <div>
                 按照提现金额收取
@@ -20,7 +20,7 @@
                 <span> %手续费 </span>
               </div>
             </se>
-            <se label="企业提现手续费" style="margin-bottom: 0">
+            <se label="企业提现手续费" style="margin:15 0 0 0;">
               <div>
                 按照提现金额收取
                 <nz-input-number
@@ -36,7 +36,7 @@
           </div>
         </div>
         <h3 style="font-weight: 600" class="mb-md">合伙人提现配置</h3>
-        <div nz-row nzGutter="8">
+        <div nz-row nzGutter="8" class="audit">
           <div nz-col nzSpan="24" se-container>
             <se label="提现审核" style="margin-bottom: 0">
               <nz-radio-group [(ngModel)]="auditValue">
@@ -45,25 +45,33 @@
               </nz-radio-group>
             </se>
             <se label="审核时间" style="margin-bottom: 0">
-                <div se-container [se-container]="1"  style="margin-left: 0px;">
+              <div se-container [se-container]="1" style="margin-left: 0px">
-                    <nz-radio-group style="display: block;" [(ngModel)]="auditTime" (ngModelChange)="changeAuto(auditTime)">
+                <nz-radio-group style="display: block" [(ngModel)]="auditTime" (ngModelChange)="changeAuto(auditTime)">
-                      <label nz-radio [nzValue]="1" class="mt-sm">全天</label>
+                  <label nz-radio [nzValue]="1" class="mt-sm">全天</label>
-                      <label nz-radio [nzValue]="2" class="mt-sm">自定义</label>
+                  <label nz-radio [nzValue]="2" class="mt-sm">自定义</label>
-                    </nz-radio-group>
+                </nz-radio-group>
-                </div>
-            </se>
-            <div style="margin-left: 200px;">
-                <ng-container  *ngTemplateOutlet="auditTimes"> </ng-container>
               </div>
+            </se>
+            <div style="margin-left: 200px">
+              <ng-container *ngTemplateOutlet="auditTimes"> </ng-container>
+            </div>
           </div>
         </div>
-        <h3 style="font-weight: 600" class="mb-md">客服电话配置</h3>
+        <h3 style="font-weight: 600" class="mb-md">客户定义配置</h3>
         <div nz-row nzGutter="8">
-          <div nz-col nzSpan="24" se-container [labelWidth]="230">
+            <div nz-col nzSpan="24">
-            <se label="客服电话" style="margin-bottom: 0">
+                <span>客户</span>
-              <input nz-input style="width: 325px" />
+                <nz-input-number style="margin: 0 10px; "  [(ngModel)]="personValue" [nzMin]="0" [nzMax]="3000" [nzPrecision]="2" [nzStep]="0.1"></nz-input-number>
-            </se>
+                <span>天内没有交易订单的视为“沉默客户”</span>
-          </div>
+            </div>
+            <div nz-col nzSpan="24" style="margin-top: 10px;">
+                <span>客户</span>
+                <nz-input-number  style="margin: 0 10px; "   [(ngModel)]="personValue" [nzMin]="0" [nzMax]="3000" [nzPrecision]="2" [nzStep]="0.1"></nz-input-number>
+                <span>天内没有交易订单的视为“沉默客户”</span>
+            </div>
+            <div nz-col nzSpan="24">
+                <span style="color: #797979; font-size: 14px;">说明：交易订单指从司机已接单开始的订单。</span>
+            </div>
         </div>
       </nz-card>
 
@@ -90,7 +98,7 @@
         </sf>
         <h3 style="font-weight: 600; margin-left: 140px" class="mb-md">短信配置</h3>
         <div nz-row nzGutter="8">
-          <div nz-col nzSpan="24" se-container [labelWidth]="230" [se-container]="1">
+          <div nz-col nzSpan="24" se-container [labelWidth]="80" [se-container]="1">
             <se label="短信内容设置" style="margin-bottom: 0">
               <p style="margin-top: 6px">配置用户端登陆页注册帐号、修改密码、修改手机号时的短信内容</p>
               <textarea
@@ -105,7 +113,7 @@
         <h3 style="font-weight: 600; margin-left: 140px" class="mb-md">通知配置</h3>
         <div nz-row nzGutter="8">
           <div nz-col nzSpan="24">
-            <div se-container [labelWidth]="230" [se-container]="1">
+            <div se-container [labelWidth]="0" [se-container]="1">
               <se class="mb-sm">
                 <nz-radio-group [(ngModel)]="formDate.isAudit">
                   <label nz-radio [nzValue]="false" class="mt-sm">到期系统通知</label>
@@ -135,7 +143,7 @@
         </div>
         <h3 style="font-weight: 600; margin-left: 140px" class="mt-md">客服电话配置</h3>
         <div nz-row nzGutter="8">
-          <div nz-col nzSpan="24" se-container [labelWidth]="230">
+          <div nz-col nzSpan="24" se-container [labelWidth]="80">
             <se label="客服电话">
               <input nz-input style="width: 325px" />
             </se>
@@ -143,7 +151,7 @@
         </div>
         <h3 style="font-weight: 600; margin-left: 140px" class="mt-md">证件提醒配置</h3>
         <div nz-row nzGutter="8">
-          <div nz-col nzSpan="24" se-container [labelWidth]="230" [se-container]="1">
+          <div nz-col nzSpan="24" se-container [labelWidth]="80" [se-container]="1">
             <se label="证件临期提醒" style="margin-bottom: 0">
               距离到期时间
               <input type="number" nz-input style="width: 40px" />
@@ -163,46 +171,48 @@
   </div>
 </nz-card>
 
-<ng-template #auditTimes let-data="data" let-title="title" >
+<ng-template #auditTimes let-data="data" let-title="title">
- 
+  <div *ngIf="auditTimeStatus" >
- <div *ngIf="auditTimeStatus" style="display: flex;"> 
+    <div style="display: flex">
-   <div style="display: flex;">
+      <nz-radio-group [(ngModel)]="everyDay" (ngModelChange)="everyDayChange(everyDay)" style="display: block">
-    <nz-radio-group [(ngModel)]="everyDay" style="display: block;" >
+        <label nz-radio [nzValue]="1" class="mt-sm"
-        <label nz-radio  [nzValue]="1" class="mt-sm">每天<span style="margin-left: 30px; color: #0200ff; cursor: pointer;">添加时间段</span></label>
+          >每天<span *ngIf="TimeStatus" style="margin-left: 30px; color: #0200ff; cursor: pointer" (click)="addEvery()">添加时间段</span></label
-        </nz-radio-group>
+        >
-        <br />
+      </nz-radio-group>
-        <div >
+      <br />
-          <div>
+      <div *ngIf="TimeStatus">
-            <nz-time-picker [(ngModel)]="time" [nzDefaultOpenValue]="defaultOpenValue"></nz-time-picker>--<nz-time-picker
+        <div *ngFor="let item of everyDayData; let i = index">
-              [(ngModel)]="time"
+        <div style="margin-top: 15px;">
-              [nzDefaultOpenValue]="defaultOpenValue"
+            <input type="time" [(ngModel)]="item.startTime" placeHolder="开始时间" style="margin-left: 23px" />
-            ></nz-time-picker>
+            <label class="ml-sm mr-sm"> --</label>
-          </div>
+            <input type="time" [(ngModel)]="item.endTime" placeHolder="结束时间" style="margin-left: 0" class="mr-xl" />
-          <div>
+        
-            <nz-time-picker [(ngModel)]="time" [nzDefaultOpenValue]="defaultOpenValue"></nz-time-picker>--<nz-time-picker
+            <label class="ml-sm mr-sm" style=" color: #0200ff; cursor: pointer" *ngIf="i !== 0" (click)="delEvery(i)">删除</label>
-              [(ngModel)]="time"
-              [nzDefaultOpenValue]="defaultOpenValue"
-            ></nz-time-picker>
-          </div>
-          </div>
-   </div>
-
-     </div>
-
-      <!-- <div *ngIf="auditTimeStatus"> 
-      
-        <div style="display: flex;">
-          <nz-time-picker [(ngModel)]="time" [nzDefaultOpenValue]="defaultOpenValue"></nz-time-picker>--<nz-time-picker
-            [(ngModel)]="time"
-            [nzDefaultOpenValue]="defaultOpenValue"
-          ></nz-time-picker>
         </div>
-        <div>
-          <nz-time-picker [(ngModel)]="time" [nzDefaultOpenValue]="defaultOpenValue"></nz-time-picker>--<nz-time-picker
-            [(ngModel)]="time"
-            [nzDefaultOpenValue]="defaultOpenValue"
-          ></nz-time-picker>
         </div>
-        <div nz-radio [nzValue]="4" class="mt-sm">每周</div>
+      </div>
-    </div> -->
+    </div>
+    <div >
+      <nz-radio-group [(ngModel)]="MonthDay" (ngModelChange)="MonthDayChange(MonthDay)"  style="display: block">
+        <label nz-radio [nzValue]="2" class="mt-sm"
+          >每周<span  *ngIf="!TimeStatus" style="margin-left: 30px; color: #0200ff; cursor: pointer" (click)="addMonth()">添加星期</span></label
+        >
+      </nz-radio-group>
+      <div *ngIf="!TimeStatus">
+        <div *ngFor="let item of MonthDayData; let i = index">
+            <nz-checkbox-group style="margin-top: 15px;" [(ngModel)]="item.month" (ngModelChange)="changeMonth(item.month)"></nz-checkbox-group>
+            <br />
+            <div *ngFor="let ite of item.Times; let ii = index">
+                <div style="margin-top: 15px;">
+             <input type="time" [(ngModel)]="ite.startTime" placeHolder="开始时间" style="margin-left: 23px" />
+             <label class="ml-sm mr-sm"> --</label>
+             <input type="time" [(ngModel)]="ite.endTime" placeHolder="结束时间" style="margin-left: 0" class="mr-xl" />
+             <label class="ml-sm mr-sm" style=" color: #0200ff; cursor: pointer" (click)="addMonthEvery(i)">添加时间段</label>
+             <label *ngIf="ii !== 0" class="ml-sm mr-sm" style=" color: #0200ff; cursor: pointer" (click)="delMonth(i,ii)">删除</label>
+            </div>
+            </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </ng-template>

src/app/routes/partner/system-config/components/config/config.component.less

@@ -18,5 +18,8 @@
         width      : 100px;
         margin-left: 10px;
       }
+      .audit .ant-form-item-label{
+        width: 81px !important;
+      }
     }
   }

src/app/routes/partner/system-config/components/config/config.component.ts

@@ -21,6 +21,7 @@ export class PartnerSystemConfigComponent implements OnInit {
   auditTime!: any;
   auditTimeStatus: boolean = false
   everyDay: boolean = false
+  MonthDay: boolean = false
   time: Date | null = null;
   defaultOpenValue = new Date(0, 0, 0, 0, 0, 0);
   tabs = [
@@ -32,6 +33,22 @@ export class PartnerSystemConfigComponent implements OnInit {
     }
   ];
   selectedTab = 0;
+  TimeStatus: boolean = true
+  everyDayData: Array<any> =[];
+  MonthDayData: any = [
+    {month: [
+      { label: '周一', value: '周一', },
+      { label: '周二', value: '周二' },
+      { label: '周三', value: '周三' },
+      { label: '周四', value: '周四' },
+      { label: '周五', value: '周五' },
+      { label: '周六', value: '周六' },
+      { label: '周日', value: '周日' }
+    ], Times:[ {
+      startTime: [],
+      endTime: [],
+    }]}
+  ]
 
   checkOptionsOne = [
     { label: '周一', value: '周一', checked: true },
@@ -64,11 +81,75 @@ export class PartnerSystemConfigComponent implements OnInit {
 
   ngOnInit() {
     this.initSF();
+    this.everyDayData = [
+      {
+        startTime: '',
+        endTime: '',
+      }
+    ]
+  }
+  addEvery() {
+    this.everyDayData.push(
+      {
+        startTime: [],
+        endTime: [],
+      }
+    )
+  }
+  delEvery(index: number) {
+    this.everyDayData.splice(index, 1)
+     
+  }
+  addMonthEvery(value: any) {
+    this.MonthDayData[value].Times.push(
+      {
+        startTime: '',
+        endTime: ''
+      }
+    )
+  }
+  addMonth() {
+    this.MonthDayData.push(
+      {month: [
+        { label: '周一', value: '周一', },
+        { label: '周二', value: '周二' },
+        { label: '周三', value: '周三' },
+        { label: '周四', value: '周四' },
+        { label: '周五', value: '周五' },
+        { label: '周六', value: '周六' },
+        { label: '周日', value: '周日' }
+      ], Times:[{
+        startTime: '',
+        endTime: ''
+      }]}
+    )
+     
+  }
+  delMonth(value: number,index: number) {
+    this.MonthDayData[value].Times.splice(index, 1)
   }
-
   changeType(type: number): void {
     this.selectedTab = type;
   }
+  changeMonth(type: any): void {
+    console.log(type);
+    console.log( this.MonthDayData);
+  }
+  everyDayChange(type: any): void {
+    console.log(type);
+    if(type) {
+      this.MonthDay = false
+      this.TimeStatus = true
+    }
+  }
+  MonthDayChange(type: any): void {
+    console.log(type);
+    if(type) {
+      this.everyDay = false
+      this.TimeStatus = false
+    }
+  }
+
 
   initSF() {