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

src/app/routes/financial-management/services/freight-account.service.ts

@@ -124,8 +124,8 @@ export class FreightAccountService extends ShipperBaseService {
   // 根据预收款ID获取收款单明细
   $api_get_advance_collection_detail = '/api/fcc/ficoBrmYsk/getBrmYskByYskblaId';
 
-  constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
+  constructor(public injector: Injector) {
-    super(injector, eaCacheSrv);
+    super(injector);
   }
 
   getReceiptUrl(url: string, params: any) {

src/app/routes/insurance-management/services/insurance-management.service.ts

@@ -28,7 +28,7 @@ export class InsuranceManagementService extends ShipperBaseService {
   //  保险费公司认证
   $api_get_submitAuthInfo = `/api/sdc/premiumInfo/submitAuthInfo`;
 
-  constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
+  constructor(public injector: Injector) {
-    super(injector, eaCacheSrv);
+    super(injector);
   }
 }

src/app/routes/order-management/services/order-management.service.ts

@@ -190,7 +190,7 @@ export class OrderManagementService extends ShipperBaseService {
       })
     );
   }
-  constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
+  constructor(public injector: Injector) {
-    super(injector, eaCacheSrv);
+    super(injector);
   }
 }

src/app/routes/partner/partner-list/components/index/partner-list.component.html

@@ -36,8 +36,7 @@
       <se [col]="1" label="合伙人名称"> {{selectItem?.enterpriseName}} </se>
       <se [col]="1" label="返佣模板" required>
         <nz-select [(ngModel)]="templateId" style="width: 100%">
-          <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
+          <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of customers"></nz-option>
-          <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
         </nz-select>
       </se>
     </div>

src/app/routes/partner/partner-list/components/index/partner-list.component.ts

@@ -25,6 +25,7 @@ export class PartnerListComponent {
   @ViewChild('editTemplate', { static: true })
   editTemplate: any;
   templateId: any;
+  templates: any[] = [];
 
   @ViewChild('editCannel', { static: true })
   editCannel: any;
@@ -32,7 +33,13 @@ export class PartnerListComponent {
 
   selectItem: any = {};
 
-  constructor(public service: PartnerListService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(public service: PartnerListService, private nzModalService: NzModalService, private router: Router) {
+    this.service.getRebateConfig().subscribe(res => {
+      if (res) {
+        this.customers = res;
+      }
+    });
+  }
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
@@ -60,6 +67,10 @@ export class PartnerListComponent {
       nzTitle: '修改返佣模板',
       nzContent: this.editTemplate,
       nzOnOk: () => {
+        if (!this.templateId) {
+          this.service.msgSrv.warning('请选择返佣模板');
+          return false;
+        }
         this.confirmEditTemplate();
         return false;
       }
@@ -367,9 +378,9 @@ export class PartnerListComponent {
             text: '详情',
             click: item => {
               if (item.partnerType === 1) {
-                this.router.navigate([`/partner/partner-list/etp-detail/${item.appUserId}`]);
+                this.router.navigate([`/partner/partner-list/etp-detail/${item.id}`]);
               } else {
-                this.router.navigate([`/partner/partner-list/personal-detail/${item.appUserId}`]);
+                this.router.navigate([`/partner/partner-list/personal-detail/${item.id}`]);
               }
             }
           },

src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html

@@ -121,19 +121,19 @@
       </div>
     </sv>
     <sv label="身份证有效期" col="1">
-      <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+      <nz-date-picker [(ngModel)]="detailData.adminUserInfo.validStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
         [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
       </nz-date-picker>
       -
-      <ng-container *ngIf="!isEdit && !detailData?.operatingEndTime && detailData?.operatingStartTime">
+      <ng-container *ngIf="!isEdit && !detailData?.adminUserInfo.validEndTime && detailData?.adminUserInfo.validStartTime">
         <label style="padding-left: 11px">长期</label>
       </ng-container>
-      <nz-date-picker [(ngModel)]="detailData.operatingEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+      <nz-date-picker [(ngModel)]="detailData.adminUserInfo.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
         [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
       </nz-date-picker>
       <ng-container *ngIf="isEdit">
-        <label nz-checkbox [ngModel]="!!!detailData.operatingEndTime"
+        <label nz-checkbox [ngModel]="!!!detailData.adminUserInfo.validEndTime"
-          (ngModelChange)="$event ? (detailData.operatingEndTime = '') : ''" class="ml-sm">长期</label>
+          (ngModelChange)="$event ? (detailData.adminUserInfo.validEndTime = '') : ''" class="ml-sm">长期</label>
       </ng-container>
     </sv>
   </sv-container>
@@ -165,12 +165,14 @@
       </p>
     </sv-title>
     <sv label="公司名称">
-      <input nz-input type="text" [(ngModel)]="detailData.enterpriseName" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+      <!-- <input nz-input type="text" [(ngModel)]="" [readonly]="!isEdit" [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'" />
+        [placeholder]="isEdit ? '' : '-'" /> -->
+      {{detailData.enterpriseName}}
     </sv>
     <sv label="统一社会信用代码">
-      <input nz-input type="text" [(ngModel)]="detailData.unifiedSocialCreditCode" [readonly]="!isEdit"
+      <!-- <input nz-input type="text" [(ngModel)]="detailData.unifiedSocialCreditCode" [readonly]="!isEdit"
-        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" /> -->
+      {{detailData.unifiedSocialCreditCode}}
     </sv>
     <sv label="营业执照" col="2">
       <ng-container *ngTemplateOutlet="
@@ -306,14 +308,9 @@
     </ng-container>
     <div *ngIf="data[key]" (mouseover)="detailData[hover] = true" (mouseleave)="detailData[hover] = false"
       (click)="$event.cancelBubble = true" class="image-hover">
-      <img [src]="data[key]" style="width: 200px; height: 160px" (click)="service.showImg(data[key])" />
+      <img nz-image [nzSrc]="data[key]" style="width: 200px; height: 160px" />
-      <div class="mask" *ngIf="detailData[hover] && isEdit"></div>
+      <i nz-icon *ngIf="detailData[hover] && isEdit" nzType="close-circle" nzTheme="fill" class="delete-icon"
-      <div class="mask-over" *ngIf="detailData[hover] && isEdit">
+        (click)="deleteImg(data, key, key2)"></i>
-        <i nz-icon nzType="close-circle" nzTheme="fill" class="delete-icon" (click)="deleteImg(data, key, key2)"></i>
-        <div style="display: flex; align-items: center">
-          <i nz-icon nzType="eye" nzTheme="fill" class="show-icon" (click)="service.showImg(data[key])"></i>
-        </div>
-      </div>
     </div>
   </nz-upload>
 </ng-template>

src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.less

@@ -27,4 +27,11 @@
     z-index : 999 !important;
     width   : 100% !important;
   }
+
+  .image-hover .delete-icon {
+    top        : unset !important;
+    right      : unset !important;
+    margin-top : -15px;
+    margin-left: -15px;
+  }
 }

src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts

@@ -253,49 +253,35 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
   }
 
   save() {
+    if (this.enterpriseAddressCode?.length > 3) {
+      this.service.msgSrv.warning('所属城市不能超过3个');
+      return;
+    }
     const dateil = { ...this.detailData };
     Object.assign(dateil.legalPersonIdentity, {
       validStartTime: this.datePipe.transform(dateil.legalPersonIdentity.validStartTime, 'yyyy-MM-dd'),
       validEndTime: this.datePipe.transform(dateil.legalPersonIdentity.validEndTime, 'yyyy-MM-dd')
     });
+    Object.assign(dateil.adminUserInfo, {
+      validStartTime: this.datePipe.transform(dateil.adminUserInfo.validStartTime, 'yyyy-MM-dd'),
+      validEndTime: this.datePipe.transform(dateil.adminUserInfo.validEndTime, 'yyyy-MM-dd')
+    });
     const params = {};
     Object.assign(params, {
-      adminMobile: dateil.adminMobile,
+      ...dateil,
-      adminAppUserId: dateil.adminAppUserId,
+      cityCodesList: this.enterpriseAddressCode,
-      adminUserInfo: { ...dateil.adminUserInfo },
-      bankAccount: dateil.bankAccount,
-      businessScope: dateil.businessScope,
-      createBank: dateil.createBank,
-      creditPhoto: dateil.creditPhoto,
-      creditPhotoWatermark: dateil.creditPhotoWatermark,
-      enterpriseAddress: dateil.enterpriseAddress,
-      enterpriseAddressCode: this.enterpriseAddressCode[2],
-      enterpriseLogo: dateil.enterpriseLogo,
-      enterpriseName: dateil.enterpriseName,
       enterpriseRegistrationTime: this.datePipe.transform(dateil.enterpriseRegistrationTime, 'yyyy-MM-dd'),
-      enterpriseType: dateil.enterpriseType,
-      id: dateil.id,
-      legalPersonIdentityDTO: { ...dateil.legalPersonIdentity },
-      licensePhoto: dateil.licensePhoto,
-      licensePhotoWatermark: dateil.licensePhotoWatermark,
-      networkTransporter: dateil.networkTransporter,
-      oftenUsedServices: dateil.oftenUsedServices,
       operatingEndTime: this.datePipe.transform(dateil.operatingEndTime, 'yyyy-MM-dd'),
-      operatingStartTime: this.datePipe.transform(dateil.operatingStartTime, 'yyyy-MM-dd'),
+      operatingStartTime: this.datePipe.transform(dateil.operatingStartTime, 'yyyy-MM-dd')
-      promotersTelephone: dateil.promotersTelephone,
+    });
-      registerAddress: dateil.registerAddress,
+    
-      registerPhone: dateil.registerPhone,
+    this.service.request(this.service.$api_save_entp_partner, params).subscribe(res => {
-      registrationCapital: dateil.registrationCapital,
+      if (res) {
-      taxAuthority: dateil.taxAuthority,
+        this.service.msgSrv.success('企业合伙人修改成功');
-      unifiedSocialCreditCode: dateil.unifiedSocialCreditCode
+        this.initData();
+        this.isEdit = false;
+      }
     });
-    // this.service.request(this.service.$api_save_enterprise_admin, params).subscribe(res => {
-    //   if (res) {
-    //     this.service.msgSrv.success('企业修改成功');
-    //     this.initData();
-    //     this.isEdit = false;
-    //   }
-    // });
   }
 
   // 识别身份证 参数isFront：front-正面、back-背面；type：0-申请人身份证，1-法定代表人身份证
@@ -304,85 +290,77 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
       idCardUrl: imgurl,
       side: isFront
     };
-    // this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
+    this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
-    //   if (res) {
+      if (res) {
-    //     if (type === 1) {
+        if (type === 1) {
-    //       // 法定代表人证件照
+          // 法定代表人证件照
-    //       if (isFront === 'front') {
+          if (isFront === 'front') {
-    //         // 正面
+            // 正面
-    //         if (res.name) {
+            if (res.name) {
-    //           this.detailData.legalPersonIdentity.name = res.name;
+              this.detailData.legalPersonIdentity.name = res.name;
-    //         }
+            }
-    //         if (res.number) {
+            if (res.number) {
-    //           this.detailData.legalPersonIdentity.certificateNumber = res.number;
+              this.detailData.legalPersonIdentity.certificateType = 0;
-    //         }
+              this.detailData.legalPersonIdentity.certificateNumber = res.number;
-    //       }
+            }
-    //       if (isFront === 'back') {
+          }
-    //         // 背面
+          if (isFront === 'back') {
-    //         if (res.validFrom) {
+            // 背面
-    //           this.detailData.legalPersonIdentity.validStartTime = res.validFrom;
+            if (res.validFrom) {
-    //         }
+              this.detailData.legalPersonIdentity.validStartTime = res.validFrom;
-    //         if (res.validTo) {
+            }
-    //           this.detailData.legalPersonIdentity.validEndTime = res.validTo;
+            if (res.validTo) {
-    //         } else {
+              this.detailData.legalPersonIdentity.validEndTime = res.validTo;
-    //           this.detailData.legalPersonIdentity.validEndTime = null;
+            } else {
-    //         }
+              this.detailData.legalPersonIdentity.validEndTime = null;
-    //       }
+            }
-    //     }
+          }
-    //     // 企业管理员证件照
+        }
-    //     if (type === 0) {
+        // 企业管理员证件照
-    //       if (isFront === 'front') {
+        if (type === 0) {
-    //         // 正面
+          if (isFront === 'front') {
-    //         if (res.name) {
+            // 正面
-    //           this.detailData.adminUserInfo.name = res.name;
+            if (res.name) {
-    //         }
+              this.detailData.adminUserInfo.name = res.name;
-    //         if (res.number) {
+            }
-    //           this.detailData.adminUserInfo.certificateNumber = res.number;
+            if (res.number) {
-    //         }
+              this.detailData.adminUserInfo.certificateNumber = res.number;
-    //       }
+            }
-    //     }
+          }
-    //   }
+          if (isFront === 'back') {
-    // });
+            // 背面
+            if (res.validFrom) {
+              this.detailData.adminUserInfo.validStartTime = res.validFrom;
+            }
+            if (res.validTo) {
+              this.detailData.adminUserInfo.validEndTime = res.validTo;
+            }
+          }
+        }
+      }
+    });
   }
 
   // 识别营业执照
   checkBusinessLicense(imgurl: any) {
-    // this.service.request(this.service.$api_ocr_recognize_business_license, { businessLicenseUrl: imgurl }).subscribe(res => {
+    this.service.request(this.service.$api_ocr_recognize_business_license, { businessLicenseUrl: imgurl }).subscribe(res => {
-    //   if (res) {
+      if (res) {
         // if (res.registrationNumber) {
         //   this.detailData.unifiedSocialCreditCode = res.registrationNumber;
         // }
         // if (res.name) {
         //   this.detailData.enterpriseName = res.name;
         // }
-    //     if (res.type) {
+        if (res.businessTermStartDate) {
-    //       this.detailData.enterpriseType = res.type;
+          this.detailData.operatingStartTime = res.businessTermStartDate;
-    //     }
+        }
-    //     if (res.addressRegionCodes) {
+        if (res.businessTermEndDate) {
-    //       this.detailData.enterpriseAddressCode = res.addressRegionCodes;
+          this.detailData.operatingEndTime = res.businessTermEndDate;
-    //     }
+        } else {
-    //     if (res.address) {
+          this.detailData.operatingEndTime = null;
-    //       this.detailData.enterpriseAddress = res.address;
+        }
-    //     }
+      }
-    //     if (res.registeredCapital) {
+    });
-    //       this.detailData.registrationCapital = res.registeredCapital;
-    //     }
-    //     if (res.foundDate) {
-    //       this.detailData.enterpriseRegistrationTime = res.foundDate;
-    //     }
-    //     if (res.businessTermStartDate) {
-    //       this.detailData.operatingStartTime = res.businessTermStartDate;
-    //     }
-    //     if (res.businessTermEndDate) {
-    //       this.detailData.operatingEndTime = res.businessTermEndDate;
-    //     } else {
-    //       this.detailData.operatingEndTime = null;
-    //     }
-    //     if (res.businessScope) {
-    //       this.detailData.businessScope = res.businessScope;
-    //     }
-    //   }
-    // });
   }
 
   private initST(): { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } {

src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html

@@ -87,8 +87,9 @@
         [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
     </sv>
     <sv label="手机号">
-      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
+      <!-- <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
-        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" /> -->
+        {{detailData.adminUserInfo.mobile}}
     </sv>
     <sv label="身份证号">
       <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
@@ -173,14 +174,9 @@
     </ng-container>
     <div *ngIf="data[key]" (mouseover)="detailData[hover] = true" (mouseleave)="detailData[hover] = false"
       (click)="$event.cancelBubble = true" class="image-hover">
-      <img [src]="data[key]" style="width: 200px; height: 160px" (click)="service.showImg(data[key])" />
+      <img nz-image [nzSrc]="data[key]" style="width: 200px; height: 160px" />
-      <div class="mask" *ngIf="detailData[hover] && isEdit"></div>
+      <i nz-icon *ngIf="detailData[hover] && isEdit" nzType="close-circle" nzTheme="fill" class="delete-icon"
-      <div class="mask-over" *ngIf="detailData[hover] && isEdit">
+        (click)="deleteImg(data, key, key2)"></i>
-        <i nz-icon nzType="close-circle" nzTheme="fill" class="delete-icon" (click)="deleteImg(data, key, key2)"></i>
-        <div style="display: flex; align-items: center">
-          <i nz-icon nzType="eye" nzTheme="fill" class="show-icon" (click)="service.showImg(data[key])"></i>
-        </div>
-      </div>
     </div>
   </nz-upload>
 </ng-template>

src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.less

@@ -27,4 +27,11 @@
     z-index : 999 !important;
     width   : 100% !important;
   }
+
+  .image-hover .delete-icon {
+    top        : unset !important;
+    right      : unset !important;
+    margin-top : -15px;
+    margin-left: -15px;
+  }
 }

src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts

@@ -152,10 +152,7 @@ export class PersonalPartnerDetailComponent implements OnInit {
       data[key] = file.response.data?.fullFileWatermarkPath;
       data[key2] = file.response.data?.fullFilePath;
       if (id === 'legalFront' || id === 'legalBack') {
-        this.checkIdCard(file.response.data?.fullFilePath, id === 'legalFront' ? 'front' : 'back', 1);
+        this.checkIdCard(file.response.data?.fullFilePath, id === 'legalFront' ? 'front' : 'back');
-      }
-      if (id === 'certificateBackFront' || id === 'certificateBack') {
-        this.checkIdCard(file.response.data?.fullFilePath, id === 'certificateBackFront' ? 'front' : 'back', 0);
       }
     }
   }
@@ -215,95 +212,53 @@ export class PersonalPartnerDetailComponent implements OnInit {
   }
 
   save() {
-    const dateil = { ...this.detailData };
+    if (this.enterpriseAddressCode?.length > 3) {
-    Object.assign(dateil.legalPersonIdentity, {
+      this.service.msgSrv.warning('所属城市不能超过3个');
-      validStartTime: this.datePipe.transform(dateil.legalPersonIdentity.validStartTime, 'yyyy-MM-dd'),
+      return;
-      validEndTime: this.datePipe.transform(dateil.legalPersonIdentity.validEndTime, 'yyyy-MM-dd')
+    }
+    const dateil = { ...this.detailData, cityCodesList: this.enterpriseAddressCode };
+    Object.assign(dateil.adminUserInfo, {
+      validStartTime: this.datePipe.transform(dateil.adminUserInfo.validStartTime, 'yyyy-MM-dd'),
+      validEndTime: this.datePipe.transform(dateil.adminUserInfo.validEndTime, 'yyyy-MM-dd')
     });
-    const params = {};
+
-    Object.assign(params, {
+    this.service.request(this.service.$api_save_personal_partner, dateil).subscribe(res => {
-      adminMobile: dateil.adminMobile,
+      if (res) {
-      adminAppUserId: dateil.adminAppUserId,
+        this.service.msgSrv.success('个人合伙人修改成功');
-      adminUserInfo: { ...dateil.adminUserInfo },
+        this.initData();
-      bankAccount: dateil.bankAccount,
+        this.isEdit = false;
-      businessScope: dateil.businessScope,
+      }
-      createBank: dateil.createBank,
-      creditPhoto: dateil.creditPhoto,
-      creditPhotoWatermark: dateil.creditPhotoWatermark,
-      enterpriseAddress: dateil.enterpriseAddress,
-      enterpriseAddressCode: this.enterpriseAddressCode[2],
-      enterpriseLogo: dateil.enterpriseLogo,
-      enterpriseName: dateil.enterpriseName,
-      enterpriseRegistrationTime: this.datePipe.transform(dateil.enterpriseRegistrationTime, 'yyyy-MM-dd'),
-      enterpriseType: dateil.enterpriseType,
-      id: dateil.id,
-      legalPersonIdentityDTO: { ...dateil.legalPersonIdentity },
-      licensePhoto: dateil.licensePhoto,
-      licensePhotoWatermark: dateil.licensePhotoWatermark,
-      networkTransporter: dateil.networkTransporter,
-      oftenUsedServices: dateil.oftenUsedServices,
-      operatingEndTime: this.datePipe.transform(dateil.operatingEndTime, 'yyyy-MM-dd'),
-      operatingStartTime: this.datePipe.transform(dateil.operatingStartTime, 'yyyy-MM-dd'),
-      promotersTelephone: dateil.promotersTelephone,
-      registerAddress: dateil.registerAddress,
-      registerPhone: dateil.registerPhone,
-      registrationCapital: dateil.registrationCapital,
-      taxAuthority: dateil.taxAuthority,
-      unifiedSocialCreditCode: dateil.unifiedSocialCreditCode
     });
-    // this.service.request(this.service.$api_save_enterprise_admin, params).subscribe(res => {
-    //   if (res) {
-    //     this.service.msgSrv.success('企业修改成功');
-    //     this.initData();
-    //     this.isEdit = false;
-    //   }
-    // });
   }
 
   // 识别身份证 参数isFront：front-正面、back-背面；type：0-申请人身份证，1-法定代表人身份证
-  checkIdCard(imgurl: any, isFront: string, type: number) {
+  checkIdCard(imgurl: any, isFront: string) {
     const params = {
       idCardUrl: imgurl,
       side: isFront
     };
-    // this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
+    this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
-    //   if (res) {
+      if (res) {
-    //     if (type === 1) {
+        // 企业管理员证件照
-    //       // 法定代表人证件照
+        if (isFront === 'front') {
-    //       if (isFront === 'front') {
+          // 正面
-    //         // 正面
+          if (res.name) {
-    //         if (res.name) {
+            this.detailData.adminUserInfo.name = res.name;
-    //           this.detailData.legalPersonIdentity.name = res.name;
+          }
-    //         }
+          if (res.number) {
-    //         if (res.number) {
+            this.detailData.adminUserInfo.certificateNumber = res.number;
-    //           this.detailData.legalPersonIdentity.certificateNumber = res.number;
+          }
-    //         }
+        }
-    //       }
+        if (isFront === 'back') {
-    //       if (isFront === 'back') {
+          // 背面
-    //         // 背面
+          if (res.validFrom) {
-    //         if (res.validFrom) {
+            this.detailData.adminUserInfo.validStartTime = res.validFrom;
-    //           this.detailData.legalPersonIdentity.validStartTime = res.validFrom;
+          }
-    //         }
+          if (res.validTo) {
-    //         if (res.validTo) {
+            this.detailData.adminUserInfo.validEndTime = res.validTo;
-    //           this.detailData.legalPersonIdentity.validEndTime = res.validTo;
+          }
-    //         } else {
+        }
-    //           this.detailData.legalPersonIdentity.validEndTime = null;
+      }
-    //         }
+    });
-    //       }
-    //     }
-    //     // 企业管理员证件照
-    //     if (type === 0) {
-    //       if (isFront === 'front') {
-    //         // 正面
-    //         if (res.name) {
-    //           this.detailData.adminUserInfo.name = res.name;
-    //         }
-    //         if (res.number) {
-    //           this.detailData.adminUserInfo.certificateNumber = res.number;
-    //         }
-    //       }
-    //     }
-    //   }
-    // });
   }
 }

src/app/routes/partner/partner-list/services/partner-list.service.ts

@@ -1,10 +1,10 @@
 import { Injectable, Injector } from '@angular/core';
-import { BaseService, EACacheService } from '@shared';
+import { BaseService, EACacheService, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { ImageViewComponent } from 'src/app/shared/components/imagelist';
 
 @Injectable()
-export class PartnerListService extends BaseService {
+export class PartnerListService extends ShipperBaseService {
   $mock_url = '/rule?_allow_anonymous=true';
 
   // 查询合伙人信息-分页
@@ -18,13 +18,13 @@ export class PartnerListService extends BaseService {
   // 获取合伙人信息
   $api_get_personal_partner_detail = '/api/mdc/partner/getPersonally';
   // 审核合伙人
-  $api_audit_partner= '/api/mdc/partner/audit';
+  $api_audit_partner = '/api/mdc/partner/audit';
   // 修改返佣模板
-  $api_update_partner_template= '/api/mdc/partner/updateTemplate';
+  $api_update_partner_template = '/api/mdc/partner/updateTemplate';
   // 更新渠道销售
-  $api_update_partner_channel= '/api/mdc/partner/updateChannelSale';
+  $api_update_partner_channel = '/api/mdc/partner/updateChannelSale';
   // 重新发起CRM
-  $api_resend_crm= '/api/mdc/partner/reSendCrm';
+  $api_resend_crm = '/api/mdc/partner/reSendCrm';
   // 查询合伙人修改渠道渠道销售记录
   $api_get_personal_channel_list = '/api/mdc/partnerChannelRelLog/list/page';
   // 冻结/启用企业业

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 14:45:48
+ * @LastEditTime : 2022-03-22 14:42:27
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\rebate-setting.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -39,7 +39,7 @@
 </div>
   <st
     #st
-    [data]="data"
+    [data]="service.$api_get_rebateConfig"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"

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

@@ -72,7 +72,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
           title: '时间月份',
           format: 'month',
         },
-        phone: {
+        partnerId: {
           type: 'string',
           title: '合伙人名称'
         },
@@ -94,31 +94,31 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
       },
       {
         title: '配置类型',
-        index: 'name1'
+        index: 'configType'
       },
       {
         title: '备注',
-        index: 'name1'
+        index: 'remark'
       },
       {
         title: '关联合伙人范围',
-        index: 'name1'
+        index: 'partnerType'
       },
       {
         title: '创建时间',
-        index: 'name1'
+        index: 'enableTime'
       },
       {
         title: '启用时间',
-        index: 'name1'
+        index: 'enableTime'
       },
       {
         title: '优先级',
-        index: 'name44'
+        index: 'priority'
       },
       {
         title: '状态',
-        index: 'name44'
+        index: 'stateLocked'
       },
       {
         title: '操作',

src/app/routes/partner/rebate-management/services/rebate-management.service.ts

@@ -17,6 +17,8 @@ import { BaseService } from '@shared';
 export class RebateManagementService extends BaseService {
   // 查询规则抽查列表
   public $api_get_listCompliancePage = '/api/sdc/billRiskOperate/listRiskPage';
+  // 查询返佣配置表
+  public $api_get_rebateConfig = '/api/mdc/rebateConfig/list/page';
   constructor(public injector: Injector) {
     super(injector);
   }

src/app/routes/ticket-management/services/ticket.service.ts

@@ -99,8 +99,8 @@ export class TicketService extends ShipperBaseService {
   // 查询快递轨迹
   $api_get_express_routes = '/api/fcc/ficoExpressH/searchRoutes';
 
-  constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
+  constructor(public injector: Injector) {
-    super(injector, eaCacheSrv);
+    super(injector);
   }
 
   reviewPDF(url: string) {

src/app/routes/usercenter/services/usercenter.service.ts

@@ -136,8 +136,8 @@ export class UsermanageService extends ShipperBaseService {
   // 查询司机配置列表
   $api_configPage = '/api/mdc/cuc/driver/list/configPage';
 
-  constructor(public injector: Injector, private nzModalService: NzModalService, public eaCacheSrv: EACacheService) {
+  constructor(public injector: Injector, private nzModalService: NzModalService) {
-    super(injector, eaCacheSrv);
+    super(injector);
   }
 
   showImg(url: any) {

src/app/shared/services/business/shipper-base.service.ts

@@ -17,10 +17,10 @@ export class ShipperBaseService extends BaseService {
   $api_get_network_freight_forwarder_one = `/api/mdc/cuc/networkTransporter/get`; // 获取网络货运人
   // 根据FullKey获取系统子配置(树)
   $api_getSysConfigTreeByParentFullKey = `/api/mdc/pbc/sysConfig/getSysConfigTreeByParentFullKey`;
-  envCache: any;
+  // 获取全部返佣配置
-  constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
+  $api_get_rebate_config = `/api/mdc/rebateConfig/list/listRebateConfig`;
+  constructor(public injector: Injector) {
     super(injector);
-    this.envCache = this.eaCacheSrv.get(cacheConf.env);
   }
 
   /**
@@ -50,16 +50,16 @@ export class ShipperBaseService extends BaseService {
         if (!res) {
           return [];
         }
-        const list = res.map(((item: any) => {
+        const list = res.map((item: any) => {
           return {
             label: item.projectName,
             value: item.id
-          }
+          };
-        }))
+        });
         const obj = [{ value: '', label: '全部' }];
         return [...obj, ...list];
       })
-    )
+    );
   }
 
   /**
@@ -204,4 +204,23 @@ export class ShipperBaseService extends BaseService {
       })
     );
   }
+
+  /**
+   * 获取全部返佣配置
+   * @returns
+   */
+  getRebateConfig() {
+    const params = {};
+    return this.request(this.$api_get_rebate_config, params, 'POST').pipe(
+      map(res => {
+        if (res) {
+          return res.map((m: any) => {
+            return { label: m.configName, value: m.id };
+          });
+        } else {
+          return [];
+        }
+      })
+    );
+  }
 }