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

2022-05-12 17:20:23 +08:00
parent b5da3a1e14 317f6e73b1
commit cde9b95ca2
11 changed files with 96 additions and 74 deletions
--- a/src/app/routes/partner/level-config/components/list/list.component.html
+++ b/src/app/routes/partner/level-config/components/list/list.component.html
@ -4,10 +4,11 @@
 * @Author       : Shiming
 * @Date         : 2022-04-29 17:28:23
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-11 11:28:35
+ * @LastEditTime : 2022-05-12 16:55:43
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\level-config\\components\\list\\list.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
+<page-header-wrapper [title]="'等级配置'"> </page-header-wrapper>
 <nz-card>
  <!-- 搜索区 -->
  <sf
--- 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
@ -569,12 +569,14 @@ export class AddEtpPartnerComponent {
        cityCodesList: {
          type: 'string',
          title: '所属城市',
+          maxMultipleCount: 3,
          ui: {
            widget: 'tree-select',
            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
            placeholder: '请选择城市(最多3个)',
            checkable: true,
            class: 'city-tree-select',
+            maxMultipleCount: 3,
            asyncData: () =>
              this.getRegionDetailByCode('').pipe(
                map((res: any) =>
--- 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
@ -299,9 +299,12 @@ export class AddPersonalPartnerComponent {
        _addressTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
        cityCodesList: {
          type: 'string',
-          title: '所属城市',
+          title: '所属城市7',
+          maxMultipleCount: 3,
          ui: {
            widget: 'tree-select',
+            maxMultipleCount: 3,
+            maxTagCount: 3,
            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
            placeholder: '请选择城市(最多3个)',
            checkable: true,
@ -314,9 +317,9 @@ export class AddPersonalPartnerComponent {
                )
              ),
            expandChange: ({ node }: { node: NzTreeNode }) =>
-              this.getRegionDetailByCode(node.key).pipe(
-                map((res: any) => res.map((item: any) => ({ ...item, title: item.name, key: item.regionCode, isLeaf: true })))
-              )
+            this.getRegionDetailByCode(node.key).pipe(
+              map((res: any) => res.map((item: any) => ({ ...item, title: item.name, key: item.regionCode, isLeaf: true })))
+            )
          } as SFTreeSelectWidgetSchema
        },
        // 渠道销售
@ -340,30 +343,30 @@ export class AddPersonalPartnerComponent {
  }

  private setInfo(info: any) {
-      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
-        }
-      ]);
-      this.sf.setValue('/adminUserInfo/certificatePhotoBack', info?.certificatePhotoBack);
-      this.sf.setValue('/adminUserInfo/certificatePhotoBackWatermark', [
-        {
-          uid: -1,
-          name: '文件',
-          status: 'done',
-          url: info?.certificatePhotoBackWatermark,
-          response: info?.certificatePhotoBackWatermark
-        }
-      ]);
-      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);
+    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
+      }
+    ]);
+    this.sf.setValue('/adminUserInfo/certificatePhotoBack', info?.certificatePhotoBack);
+    this.sf.setValue('/adminUserInfo/certificatePhotoBackWatermark', [
+      {
+        uid: -1,
+        name: '文件',
+        status: 'done',
+        url: info?.certificatePhotoBackWatermark,
+        response: info?.certificatePhotoBackWatermark
+      }
+    ]);
+    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-record/rebate-record.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-02-24 20:09:49
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-12 15:42:27
+ * @LastEditTime : 2022-05-12 16:43:10
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -42,7 +42,7 @@
    [loading]="service.http.loading"
  >
  <ng-template st-row='abnormalFeedback' let-item let-index='index'>
-    <div style="color: #f59a23;" (click)="feedback()">123212{{item?.abnormalFeedback}}</div>
+    <div style="color: #f59a23;" (click)="feedback(item)">123212{{item?.abnormalFeedback}}</div>
  </ng-template>
  <ng-template st-row='profitAmountSum' let-item let-index='index'>
    <div >{{item?.profitAmountSum | currency}}</div>
--- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
@ -118,7 +118,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
      nzTitle: '明细',
      nzWidth: 1200,
      nzContent: ParterRebateManageMenRecordDetailComponent,
-      nzComponentParams: { },
+      nzComponentParams: { record: item },
      nzFooter: null
    });
    modal.afterClose.subscribe((res: any) => {
--- a/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts
+++ b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-03-10 14:50:45
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-10 15:09:51
+ * @LastEditTime : 2022-05-12 16:46:35
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -29,8 +29,17 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit {

  ngOnInit() {
    this.initSF();
+    this.initData();
+  }
+  initData() {
+    if (this.i) {
+      console.log(this.i);
+      
+      this.service.request(this.service.$api_get_getExceptionMessage, { partnerId: this.i?.partnerId }).subscribe(res => {
+        console.log(res);
+      });
+    }
  }
-
  initSF() {
    this.schema = {
      properties: {
--- a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
+++ b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
@ -23,7 +23,7 @@
  <st
    #st
    [bordered]="true"
-    [data]="service.$api_get_listCompliancePage"
+    [data]="service.$api_get_partnerIncomeDetail"
    [columns]="columns"
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
--- a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts
+++ b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts
@ -21,6 +21,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
  spuStatus = '1';
  size: NzButtonSize = 'large';
  _$expand = false;
+  record: any;
  data = [{ name1: 1111 }];
  constructor(public service: RebateManagementService, public shipperservice: ShipperBaseService, public modalRef: NzModalRef) {}
  /**
@ -43,10 +44,13 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
    const params: any = Object.assign({}, this.sf?.value || {});
    delete params._$expand;
    return {
+      partnerId: this.record.partnerId,
      ...params
    };
  }
  ngOnInit() {
+    console.log(this.record);
+
    this.initSF();
    this.initST();
  }
@ -54,7 +58,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
  initSF() {
    this.schema = {
      properties: {
-        enterpriseInfoId: {
+        ltdId: {
          type: 'string',
          title: '网络货运人',
          ui: {
@ -68,18 +72,27 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
            }
          }
        },
-        paymentStatus: {
+        bankType: {
          title: '银行类型',
          type: 'string',
-          ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'overall:payment:status' },
-            containsAllLabel: true,
-            change: (value: any) => {
-              console.log(value);
-              this.st.reload();
+          enum: [
+            {
+              label: '全部',
+              value: ''
+            },
+            {
+              label: '平安银行',
+              value: '1'
+            },
+            {
+              label: '浦发银行',
+              value: '2'
            }
-          } as SFSelectWidgetSchema
+          ],
+          ui: {
+            widget: 'select',
+            containsAllLabel: true
+          }
        }
      }
    };
@ -93,6 +106,10 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {

  initST() {
    this.columns = [
+      {
+        title: '网络货运人',
+        index: 'billCode'
+      },
      {
        title: '订单号',
        index: 'billCode'
@ -106,7 +123,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
        index: 'name1'
      },
      {
-        title: '预估返佣金额（元）',
+        title: '返佣金额（元）',
        index: 'name1'
      },
      {
@ -118,27 +135,11 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
        index: 'name1'
      },
      {
-        title: '网络货运人',
+        title: '银行类型',
        index: 'name1'
      },
      {
-        title: '销售渠道',
-        index: 'name1'
-      },
-      {
-        title: '合伙人名称',
-        index: 'name1'
-      },
-      {
-        title: '合伙人等级',
-        index: 'name1'
-      },
-      {
-        title: '管理费比例',
-        index: 'name1'
-      },
-      {
-        title: '固定结算费率',
+        title: '虚拟账户',
        index: 'name1'
      },
      {
--- a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
@ -3,7 +3,7 @@ import { SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/f
 import { ShipperBaseService } from '@shared';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service';
-import { NzModalRef } from 'ng-zorro-antd/modal';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';

@Component({
  selector: 'app-ad-components-partner',
@ -23,7 +23,8 @@ export class EditPartnerComponentsAddComponent implements OnInit {
    public msgSrv: NzMessageService,
    public service: UsermanageService,
    private modal: NzModalRef,
-    public shipperservice: ShipperBaseService
+    public shipperservice: ShipperBaseService,
+    public nzModalService: NzModalService
  ) {}

  ngOnInit(): void {
@ -139,12 +140,17 @@ export class EditPartnerComponentsAddComponent implements OnInit {
      enterpriceIds: enterId,
      settStartTime: this.sf?.value?.settStartTime + ' 00:00:00'
    };
-
-    this.service.request(this.service.$api_batchUpdateEnterpricePartner, params).subscribe(res => {
-      if (res) {
-        this.service.msgSrv.success('修改成功');
-        this.modal.destroy(true);
+    this.nzModalService.warning({
+      nzTitle: '确定提交吗？',
+      nzOnOk: () => {
+        this.service.request(this.service.$api_batchUpdateEnterpricePartner, params).subscribe(res => {
+          if (res) {
+            this.service.msgSrv.success('修改成功');
+            this.modal.destroy(true);
+          }
+        });
      }
    });
+   
  }
 }
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@ -382,7 +382,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
        title: '公司所在地',
        index: 'province',
        width: 200,
-        format: item => `${item.provinceName}${item.cityName}${item.areaName}`
+        format: item => `${item.provinceName ? item.provinceName: ''}${item.cityName ? item.cityName: ''}${item.areaName ? item.areaName: ''}`
      },
      { title: '管理员', render: 'contacter', width: 150 },
      { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 },