From ded0c5e48bcda25b1da5d83acb8ecf867fb77665 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 12 May 2022 15:50:52 +0800 Subject: [PATCH] fix bug --- .../rebate-record.component.html | 7 ++++-- .../rebate-record/rebate-record.component.ts | 9 ++++--- .../services/rebate-management.service.ts | 25 +++++++++++++------ .../enterprise-audit.component.ts | 3 ++- 4 files changed, 29 insertions(+), 15 deletions(-) diff --git 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 index b99860bf..46fa0a43 100644 --- 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-03-29 13:40:16 + * @LastEditTime : 2022-05-12 15:42:27 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -33,7 +33,7 @@
123212{{item?.abnormalFeedback}}
+ +
{{item?.profitAmountSum | currency}}
+ diff --git 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 index 74ab1f6f..dfc949a3 100644 --- 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 @@ -72,7 +72,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit { }, { title: '返佣金额（元）', - index: 'name1' + render: 'profitAmountSum' }, { title: '合伙人名称', @@ -80,15 +80,16 @@ export class ParterRebateManageMentRecordComponent implements OnInit { }, { title: '实际等级', - index: 'name1' + index: 'partnerGrade' }, { title: '管理费比例', - index: 'rebateRatio' + index: 'manageFeeRatio', + format: (item) => {return item.manageFeeRatio + '%' } }, { title: '返佣时间', - index: 'name1' + index: 'returnCommissionTime' }, { title: '异常反馈', diff --git a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts index 6d62828e..a96181ef 100644 --- a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts +++ b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts @@ -1,10 +1,10 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-03-10 11:19:00 * @LastEditors : Shiming - * @LastEditTime : 2022-04-25 19:23:25 + * @LastEditTime : 2022-05-12 15:36:23 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\services\\rebate-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -12,7 +12,7 @@ import { Injectable, Injector } from '@angular/core'; import { BaseService } from '@shared'; @Injectable({ - providedIn: 'root', + providedIn: 'root' }) export class RebateManagementService extends BaseService { // 查询规则抽查列表 @@ -24,17 +24,26 @@ export class RebateManagementService extends BaseService { // 启用/禁用返佣配置 public $api_set_updateRebateConfig = '/api/mdc/rebateConfig/updateRebateConfig'; - // 运营端查询合伙人返佣 public $api_get_getIncomeByBillpage = '/api/bpc/partnerIncomeHead/getIncomeByBillpage'; // 获取返佣模板信息 public $api_get_getPartnerRebateConfigInfo = '/api/mdc/rebateConfig/getPartnerRebateConfigInfo'; // 合伙人管理/返佣管理/返佣明细 - public $api_get_searchPageList= '/api/fcc/billPaymentApplicationOBC/list/searchPageList'; + public $api_get_searchPageList = '/api/fcc/billPaymentApplicationOBC/list/searchPageList'; // 合伙人管理/返佣管理/退款返佣明细 - public $api_get_searchRefundPageList= '/api/fcc/billPaymentApplicationOBC/list/searchRefundPageList'; -   // 查询合伙人信息-分页 - public $api_get_partner_page = '/api/mdc/partner/list/page'; + public $api_get_searchRefundPageList = '/api/fcc/billPaymentApplicationOBC/list/searchRefundPageList'; // 查询合伙人信息-分页 + public $api_get_partner_page = '/api/mdc/partner/list/page'; + + // 查询查询返佣记录列表-分页 + public $api_get_partnerIncomeHead = '/api/fcc/partnerIncomeHead/list/rebate'; + // 查询返佣记录明细 + public $api_get_partnerIncomeDetail = '/api/fcc/partnerIncomeDetail/rebate/detail'; + // 导出返佣记录明细 + public $api_get_partnerIncomeHead_export = '/api/fcc/partnerIncomeDetail/rebate/detail/export'; + // 根据合伙人id、年、月 查询异常反馈信息(反馈异常查下) + public $api_get_getExceptionMessage = '/api/fcc/partnerIncomeDetailException/getExceptionMessage'; + // 保存合伙人收益账单详情-异常反馈表(反馈异常提交) + public $api_get_partnerIncomeExceptionAdd = '/api/fcc/partnerIncomeDetailException/partnerIncomeExceptionAdd'; constructor(public injector: Injector) { super(injector); } diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts index a5299d7d..ab219c3c 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts @@ -148,6 +148,7 @@ export class FreightComponentsEnterpriseAuditComponent extends BasicTableCompone { label: '通过', type: 'primary', + loading: this.service.http.loading, onClick: () => { this.adminAuditUser( { @@ -258,7 +259,7 @@ export class FreightComponentsEnterpriseAuditComponent extends BasicTableCompone className: 'text-center', 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: '企业类型',