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

2022-04-26 15:33:14 +08:00
parent d9dff2cbf7 1af572081d
commit 75f9653524
8 changed files with 332 additions and 280 deletions
--- a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
+++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
@ -1,8 +1,19 @@
 import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { SFAutoCompleteWidgetSchema, SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import {
+  SFAutoCompleteWidgetSchema,
+  SFComponent,
+  SFRadioWidgetSchema,
+  SFSchema,
+  SFSchemaEnum,
+  SFSchemaEnumType,
+  SFSelectWidgetSchema,
+  SFTextareaWidgetSchema,
+  SFUISchema
+} from '@delon/form';
 import { _HttpClient } from '@delon/theme';
 import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
+import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
 import { ChannelSalesService } from '../../services/channel-sales.service';
@ -30,29 +41,32 @@ export class ParterChannelSalesEditComponent implements OnInit {
  ) {}

  ngOnInit(): void {
+    this.initSF();
    if (!this.sts) {
      this.service.request(this.service.$api_getChannelSalesInfo, { id: this.i?.id }).subscribe(res => {
+        const List: any = [];
        if (res) {
-         let value1 =  Object.assign({}, res)
+          let value1 = Object.assign({}, res);
          delete value1.employeeVO;
-         this.record = value1;
-         console.log(value1);
-         console.log(this.record);
-         
          let value = res.employeeVO;
-        let yeeVO = {label: value.empName+"/"+value.empNo, value: value.empNo}
-        console.log(yeeVO);
-          
+          List.push({ label: value.empName + '/' + value.empNo, value: value.empNo });
         setTimeout(() => {
-        this.sf.getProperty('/employeeVO')!.schema.enum = [yeeVO];
-        this.sf.getProperty('/employeeVO')!.widget.reset([yeeVO]);
-       })
+          if (this.sf) {
+            console.log(this.sf.getProperty('/employeeVO')!.schema);

-          this.initSF();
+            this.sf.getProperty('/employeeVO')!.schema.enum = List;
+            this.sf.getProperty('/employeeVO')!.widget.reset(List);
+          }
+          if (value.empNo) {
+            this.sf.setValue('/employeeVO', value.empNo);
+            this.currentOAItem  = value;
+            this.sf.setValue('/phoneNumber', res.telephone);
+          }
+         })
+          this.record = value1;
        }
      });
    }
-    
  }
  initSF() {
    this.schema = {
@ -78,23 +92,56 @@ export class ParterChannelSalesEditComponent implements OnInit {
            placeholder: '请输入'
          }
        },
+        // employeeVO: {
+        //   title: '关联OA员工',
+        //   type: 'string',
+        //   ui: {
+        //     widget: 'select',
+        //     placeholder:'请选择',
+        //     asyncData: (input:string) => this.service.request(this.service.$api_fuzzyQuery,{name:input}).pipe(
+        //       map((res: any) => {
+        //         return res.map((item:any)=>{
+        //           return {label: item.empName+"/"+item.empNo, value: item.empNo, obj: item}
+        //         })
+        //       })
+        //     ),
+        //     change:(item:any, org:any)=>{
+        //       this.currentOAItem = org.obj;
+        //     }
+        //   } as SFAutoCompleteWidgetSchema,
+        // },
        employeeVO: {
          title: '关联OA员工',
          type: 'string',
+          maxLength: 30,
          ui: {
-            widget: 'autocomplete',
-            placeholder:'请选择',
-            asyncData: (input:string) => this.service.request(this.service.$api_fuzzyQuery,{name:input}).pipe(
-              map((res: any) => {
-                return res.map((item:any)=>{
-                  return {label: item.empName+"/"+item.empNo, value: item.empNo, obj: item}
-                })
-              })
-            ),
+            widget: 'select',
+            // serverSearch: true,
+            allowClear: true,
+            searchDebounceTime: 300,
+            searchLoadingText: '搜索中...',
+            onSearch: (q: any) => {
+              let str = q?.replace(/^\s+|\s+$/g, '');
+              if (str) {
+                return this.service
+                  .request(this.service.$api_fuzzyQuery, { name: str })
+                  .pipe(map(res => (res as any[]).map(i => ({ label: i.empName + '/' + i.empNo, value: i.empNo, obj: i } as SFSchemaEnum))))
+                  .toPromise();
+              } else {
+                return of([]);
+              }
+            },
+            // asyncData: (input:string) => this.service.request(this.service.$api_fuzzyQuery,{name:input}).pipe(
+            //   map((res: any) => {
+            //     return res.map((item:any)=>{
+            //       return {label: item.empName+"/"+item.empNo, value: item.empNo, obj: item}
+            //     })
+            //   })
+            // ),
            change: (item: any, org: any) => {
              this.currentOAItem = org.obj;
            }
-          } as SFAutoCompleteWidgetSchema,
+          } as SFSelectWidgetSchema
        },
        isAuthorization: {
          type: 'string',
@ -104,9 +151,9 @@ export class ParterChannelSalesEditComponent implements OnInit {
            { label: '是', value: '1' }
          ],
          ui: {
-            widget: 'radio',
+            widget: 'radio'
          } as SFRadioWidgetSchema,
-          default: '0',
+          default: '0'
        },
        roleIds: {
          title: '',
@ -128,7 +175,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
              );
            },
            visibleIf: { isAuthorization: (value: string) => value === '1' }
-          },
+          }
        },
        remark: {
          type: 'string',
@ -138,8 +185,8 @@ export class ParterChannelSalesEditComponent implements OnInit {
            widget: 'textarea',
            autosize: { minRows: 3, maxRows: 6 },
            placeholder: '请输入50字符'
-          } as SFTextareaWidgetSchema,
-        },
+          } as SFTextareaWidgetSchema
+        }
      },
      required: ['name', 'phoneNumber', 'employeeVO', 'roleIds', 'remark']
    };
@ -149,9 +196,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
        grid: { span: 24 }
      },
      $isAuthorization: { grid: { span: 12 } },
-      $roleIds:{ spanLabelFixed: 10, grid: { span: 12 }},
-      
-
+      $roleIds: { spanLabelFixed: 10, grid: { span: 12 } }
    };
  }

@ -160,12 +205,16 @@ export class ParterChannelSalesEditComponent implements OnInit {
  }
  save() { 
    this.sf.validator({ emitError: true });
+    
    if (!this.sf.valid) return;
-    this.service.request(this.service.$api_save, { ...this.sf.value, employeeVO: this.currentOAItem}).subscribe(res => {
+    let params: any= {
+      ...this.sf.value,
+    }
+    delete params.telephone
+    this.service.request(this.service.$api_save, { ...params, employeeVO: this.currentOAItem }).subscribe(res => {
      if (res) {
+        this.service.msgSrv.success(res.msg);
        this.modalRef.destroy(true);
-      } else {
-        this.service.msgSrv.error(res.msg);
      }
    });
  }
--- a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
+++ b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
@ -617,15 +617,8 @@ export class AddEtpPartnerComponent {
  }

  private setInfo(info: any) {
-    if (info.name) {
      this.sf.setValue('/adminUserInfo/name', info.name);
-    }
-    if (info.certificatePhotoFront) {
      this.sf.setValue('/adminUserInfo/certificatePhotoFront', info.certificatePhotoFront);
-    }
-    if (info.certificatePhotoFrontWatermark) {
-      console.log(this.sf.getProperty('/adminUserInfo/certificatePhotoFrontWatermark'));
-
      this.sf.setValue('/adminUserInfo/certificatePhotoFrontWatermark', [
        {
          uid: -1,
@ -635,11 +628,7 @@ export class AddEtpPartnerComponent {
          response: info.certificatePhotoFrontWatermark
        }
      ]);
-    }
-    if (info.certificatePhotoBack) {
      this.sf.setValue('/adminUserInfo/certificatePhotoBack', info.certificatePhotoBack);
-    }
-    if (info.certificatePhotoBackWatermark) {
      this.sf.setValue('/adminUserInfo/certificatePhotoBackWatermark', [
        {
          uid: -1,
@ -649,18 +638,9 @@ export class AddEtpPartnerComponent {
          response: info.certificatePhotoBackWatermark
        }
      ]);
-    }
-    if (info.certificateNumber) {
      this.sf.setValue('/adminUserInfo/certificateNumber', info.certificateNumber);
-    }
-    if (info.validStartTime) {
      this.sf.setValue('/adminUserInfo/validStartTime', info.validStartTime);
-    }
-    if (info.validEndTime) {
-      this.sf.setValue('/adminUserInfo/validEndTime', info.validEndTime);
-      this.sf.setValue('/adminUserInfo/_isLoingDate', false);
-    } else {
-      this.sf.setValue('/adminUserInfo/_isLoingDate', true);
-    }
+      this.sf.setValue('/adminUserInfo/validEndTime', info?.validEndTime ? info?.validEndTime: null);
+      this.sf.setValue('/adminUserInfo/_isLoingDate', info?.validEndTime ? false: true);
  }
 }
--- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
+++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
@ -339,50 +339,30 @@ export class AddPersonalPartnerComponent {
  }

  private setInfo(info: any) {
-    if (info.name) {
-      this.sf.setValue('/adminUserInfo/name', info.name);
-    }
-    if (info.certificatePhotoFront) {
-      this.sf.setValue('/adminUserInfo/certificatePhotoFront', info.certificatePhotoFront);
-    }
-    if (info.certificatePhotoFrontWatermark) {
-      console.log(this.sf.getProperty('/adminUserInfo/certificatePhotoFrontWatermark'));
-
+      this.sf.setValue('/adminUserInfo/name', info?.name);
+      this.sf.setValue('/adminUserInfo/certificatePhotoFront', info?.certificatePhotoFront);
      this.sf.setValue('/adminUserInfo/certificatePhotoFrontWatermark', [
        {
          uid: -1,
          name: '文件',
          status: 'done',
-          url: info.certificatePhotoFrontWatermark,
-          response: info.certificatePhotoFrontWatermark
+          url: info?.certificatePhotoFrontWatermark,
+          response: info?.certificatePhotoFrontWatermark
        }
      ]);
-    }
-    if (info.certificatePhotoBack) {
-      this.sf.setValue('/adminUserInfo/certificatePhotoBack', info.certificatePhotoBack);
-    }
-    if (info.certificatePhotoBackWatermark) {
+      this.sf.setValue('/adminUserInfo/certificatePhotoBack', info?.certificatePhotoBack);
      this.sf.setValue('/adminUserInfo/certificatePhotoBackWatermark', [
        {
          uid: -1,
          name: '文件',
          status: 'done',
-          url: info.certificatePhotoBackWatermark,
-          response: info.certificatePhotoBackWatermark
+          url: info?.certificatePhotoBackWatermark,
+          response: info?.certificatePhotoBackWatermark
        }
      ]);
-    }
-    if (info.certificateNumber) {
-      this.sf.setValue('/adminUserInfo/certificateNumber', info.certificateNumber);
-    }
-    if (info.validStartTime) {
-      this.sf.setValue('/adminUserInfo/validStartTime', info.validStartTime);
-    }
-    if (info.validEndTime) {
-      this.sf.setValue('/adminUserInfo/validEndTime', info.validEndTime);
-      this.sf.setValue('/adminUserInfo/_isLoingDate', false);
-    } else {
-      this.sf.setValue('/adminUserInfo/_isLoingDate', true);
-    }
+      this.sf.setValue('/adminUserInfo/certificateNumber', info?.certificateNumber);
+      this.sf.setValue('/adminUserInfo/validStartTime', info?.validStartTime);
+      this.sf.setValue('/adminUserInfo/validEndTime', info?.validEndTime ? info?.validEndTime: null);
+      this.sf.setValue('/adminUserInfo/_isLoingDate', info?.validEndTime ? false: true);
  }
 }
--- 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,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-02-24 20:09:49
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-26 10:53:50
+ * @LastEditTime : 2022-04-26 14:04:41
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -61,7 +61,7 @@
  </sv>

   <sv label="规则说明" col="1" >
-    <sf #sf mode="edit" [disabled]="hiden"  [formData]="formData" [schema]="schema1" [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 12 }} }"
+    <sf #sf mode="edit" [disabled]="hiden"  [formData]="formData" [schema]="schema1" [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 16 }} }"
    button="none"> </sf>
  </sv>

--- a/src/app/routes/partner/system-config/components/config/config.component.html
+++ b/src/app/routes/partner/system-config/components/config/config.component.html
@ -2,8 +2,7 @@
  <div nz-row [nzGutter]="8">
    <div nz-col nzSpan="4">
      <ul nz-menu nzMode="inline" class="card-height">
-                <li nz-menu-item [nzSelected]="idx === 0" (click)="changeType(idx)"
-                    *ngFor="let item of tabs; let idx = index">
+        <li nz-menu-item [nzSelected]="idx === 0" (click)="changeType(idx)" *ngFor="let item of tabs; let idx = index">
          {{ item.name }}
        </li>
      </ul>
@ -11,59 +10,76 @@

    <div nz-col nzSpan="20" style="overflow: scroll">
      <nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab === 0">
-                <h3 style="font-weight: 600;">提现手续费配置</h3>
+        <h3 style="font-weight: 600">提现手续费配置</h3>
        <div nz-row nzGutter="8">
          <div nz-col nzSpan="24" se-container [labelWidth]="230" [se-container]="1">
-                        <se label="个人提现手续费" style="margin-bottom: 0;">
+            <se label="个人提现手续费" style="margin-bottom: 0">
              <div>
                按照提现金额收取
-                            <nz-input-number [(ngModel)]="personValue" [nzMin]="0" [nzMax]="100" [nzPrecision]='2' [nzStep]="0.01"></nz-input-number> 
-                            <span>
-                                %手续费
-                            </span>
+                <nz-input-number [(ngModel)]="personValue" [nzMin]="0" [nzMax]="100" [nzPrecision]="2" [nzStep]="0.01"></nz-input-number>
+                <span> %手续费 </span>
              </div>
            </se>
-                        <se label="企业提现手续费" style="margin-bottom: 0;">
+            <se label="企业提现手续费" style="margin-bottom: 0">
              <div>
                按照提现金额收取
-                            <nz-input-number [(ngModel)]="enterpriseValue" [nzMin]="0" [nzMax]="100" [nzPrecision]='2' [nzStep]="0.01"></nz-input-number> 
-                            <span>
-                                %手续费
-                            </span>
+                <nz-input-number
+                  [(ngModel)]="enterpriseValue"
+                  [nzMin]="0"
+                  [nzMax]="100"
+                  [nzPrecision]="2"
+                  [nzStep]="0.01"
+                ></nz-input-number>
+                <span> %手续费 </span>
              </div>
            </se>
          </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>
-                        <se label="提现审核" style="margin-bottom: 0;">
+            <se label="提现审核" style="margin-bottom: 0">
              <nz-radio-group [(ngModel)]="auditValue">
                <label nz-radio [nzValue]="false" class="mt-sm">关闭</label>
                <label nz-radio [nzValue]="true" class="mt-sm">开启</label>
              </nz-radio-group>
            </se>
-                        <ng-container *ngTemplateOutlet="auditTimes;context:{$implicit: 'auto', title:'审核时间'}">
-                        </ng-container>
+            <se label="审核时间" style="margin-bottom: 0">
+                <div se-container [se-container]="1"  style="margin-left: 0px;">
+                    <nz-radio-group style="display: block;" [(ngModel)]="auditTime" (ngModelChange)="changeAuto(auditTime)">
+                      <label nz-radio [nzValue]="1" class="mt-sm">全天</label>
+                      <label nz-radio [nzValue]="2" class="mt-sm">自定义</label>
+                    </nz-radio-group>
+                </div>
+            </se>
+            <div style="margin-left: 200px;">
+                <ng-container  *ngTemplateOutlet="auditTimes"> </ng-container>
              </div>
          </div>
-                <h3 style="font-weight: 600;" class="mb-md">客服电话配置</h3>
+        </div>
+        <h3 style="font-weight: 600" class="mb-md">客服电话配置</h3>
        <div nz-row nzGutter="8">
          <div nz-col nzSpan="24" se-container [labelWidth]="230">
-                        <se label="客服电话" style="margin-bottom: 0;">
-                            <input nz-input style="width: 325px;" />
+            <se label="客服电话" style="margin-bottom: 0">
+              <input nz-input style="width: 325px" />
            </se>
          </div>
        </div>
      </nz-card>

      <nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab === 1">
-                <h2 style="font-weight: 800;">司机端配置</h2>
-                <h3 style="font-weight: 600;margin-left: 120px;">图片配置</h3>
-                <sf style="margin-left: 30px" #sf mode="default" [formData]="i" [schema]="schema"
-                    [ui]="{ '*': { spanLabelFixed: 200,grid: { span: 24 }} }" button="none">
-                    <ng-template sf-template="start" let-me let-ui="ui" let-schema="schema">
-                    </ng-template>
+        <h2 style="font-weight: 800">司机端配置</h2>
+        <h3 style="font-weight: 600; margin-left: 120px">图片配置</h3>
+        <sf
+          style="margin-left: 14px"
+          #sf
+          mode="default"
+          [formData]="i"
+          [schema]="schema"
+          [ui]="{ '*': { spanLabelFixed: 200, grid: { span: 24 } } }"
+          button="none"
+        >
+          <ng-template sf-template="start" let-me let-ui="ui" let-schema="schema"> </ng-template>
          <template id="tpl">
            <span>so good </span>
          </template>
@ -72,18 +88,21 @@
            <nz-range-picker extend nzFormat="HH:mm:ss"></nz-range-picker>
          </ng-template>
        </sf>
-                <h3 style="font-weight: 600;margin-left: 140px;" class="mb-md">短信配置</h3>
+        <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">
-                        <se label="短信内容设置" style="margin-bottom: 0;">
-                            <p style="margin-top: 6px;">配置用户端登陆页注册帐号、修改密码、修改手机号时的短信内容</p>
-                            <textarea nz-input rows="4"
+            <se label="短信内容设置" style="margin-bottom: 0">
+              <p style="margin-top: 6px">配置用户端登陆页注册帐号、修改密码、修改手机号时的短信内容</p>
+              <textarea
+                nz-input
+                rows="4"
                placeholder="【运多星】您的验证码：XXXXXX。有效期10分钟，请及时输入，请勿向他人泄露您的验证码。如非本人操作，请忽略。"
-                                style="width: 400px;"></textarea>
+                style="width: 400px"
+              ></textarea>
            </se>
          </div>
        </div>
-                <h3 style="font-weight: 600;margin-left: 140px;" class="mb-md">通知配置</h3>
+        <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">
@ -114,22 +133,22 @@
            </div>
          </div>
        </div>
-                <h3 style="font-weight: 600;margin-left: 140px;" class="mt-md">客服电话配置</h3>
+        <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 label="客服电话">
-                            <input nz-input style="width: 325px;" />
+              <input nz-input style="width: 325px" />
            </se>
          </div>
        </div>
-                <h3 style="font-weight: 600;margin-left: 140px;" class="mt-md">证件提醒配置</h3>
+        <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">
-                        <se label="证件临期提醒" style="margin-bottom: 0;">
+            <se label="证件临期提醒" style="margin-bottom: 0">
              距离到期时间
-                            <input type="number" nz-input  style="width: 40px;"/>
+              <input type="number" nz-input style="width: 40px" />
              天开始提醒，每隔
-                            <input type="number" nz-input  style="width: 40px;" />
+              <input type="number" nz-input style="width: 40px" />
              天提醒一次
            </se>
          </div>
@ -145,23 +164,42 @@
 </nz-card>

 <ng-template #auditTimes let-data="data" let-title="title" >
-    <div se-container [labelWidth]="230" [se-container]="1">
-        <se [label]="title" style="margin-bottom: 0;">
-            <nz-radio-group [(ngModel)]="auditTime">
-                <label nz-radio [nzValue]="false" class="mt-sm">全天</label>
-                <label nz-radio [nzValue]="true" class="mt-sm">自定义</label>
+ 
+ <div *ngIf="auditTimeStatus" style="display: flex;"> 
+   <div style="display: flex;">
+    <nz-radio-group [(ngModel)]="everyDay" style="display: block;" >
+        <label nz-radio  [nzValue]="1" class="mt-sm">每天<span style="margin-left: 30px; color: #0200ff; cursor: pointer;">添加时间段</span></label>
        </nz-radio-group>
-        </se>
-        <div *ngIf="">
-            <se class="mb-sm">
-                <label for="">通知标题 : </label>
-                <input nz-input placeholder="请不要超过20个汉字" style="width: 325px;" maxlength="20" />
-            </se>
-            <se class="mb-sm">
-                <label for="">通知内容 : </label>
-                <input nz-input placeholder="请不要超过50个汉字" style="width: 325px;" maxlength="50" />
-            </se>
+        <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>

     </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> -->
 </ng-template>
--- a/src/app/routes/partner/system-config/components/config/config.component.ts
+++ b/src/app/routes/partner/system-config/components/config/config.component.ts
@ -20,6 +20,9 @@ export class PartnerSystemConfigComponent implements OnInit {
  auditValue!: number;
  auditTime!: any;
  auditTimeStatus: boolean = false
+  everyDay: boolean = false
+  time: Date | null = null;
+  defaultOpenValue = new Date(0, 0, 0, 0, 0, 0);
  tabs = [
    {
      name: '基础配置'
@ -172,11 +175,6 @@ export class PartnerSystemConfigComponent implements OnInit {
      required: ['sysMinLogo', 'sysMaxLogo', 'sysMaxLogo1', 'sysMaxLogo2', 'sysMaxLogo3', 'sysMaxLogo4']
    };
  }
-  auditTimeChange(ss: any,value: any) {
-    console.log(value);
-    this.auditTimeStatus = true
-
-  }
  private uploadBefore = (file: any, fileList: any) => {
    return new Observable((observer: Observer<boolean>) => {
      const isLt1M = file.size / 1024 / 1024 < 2;
@ -196,7 +194,14 @@ export class PartnerSystemConfigComponent implements OnInit {
      observer.complete();
    });
  };
-
+  changeAuto(value: any) {
+    console.log(value);
+    if(value == '2') {
+      this.auditTimeStatus = true
+    } else {
+      this.auditTimeStatus = false
+    }
+  }
  private getImageModel(args: any, key: any) {
    return [
      {
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
@ -422,7 +422,7 @@
    <nz-tab nzTitle="修改渠道销售记录">
      <st #st1 multiSort bordered [columns]="recordColumns" [ps]="20" [data]="service.$api_findEnterpriceChannelRelLog"
        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+        [res]="{ reName: { list: 'data', total: 'data' } }"
        [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
        <ng-template st-row="remark" let-item let-index="index">
          <span *ngIf="item.remark" class="overflowText" nz-tooltip [nzTooltipTitle]="item.remark">{{ item.remark
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
@ -144,9 +144,9 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
        },
        className: 'text-center'
      },
-      { title: '修改时间', render: 'mybidDetailInfo', className: 'text-center' },
-      { title: '生效时间', index: 'eeffectiveTime', className: 'text-center' },
-      { title: '操作人', index: 'approvalUser', className: 'text-center' }
+      { title: '修改时间', index: 'modifyTime', className: 'text-center' },
+      { title: '生效时间', index: 'effectiveTime', className: 'text-center' },
+      { title: '操作人', index: 'modifyUserId', className: 'text-center' }
    ];
  }
  loadPartnerInfo(){