From 11d39744cdefce8f6144e5bd5021495768453b8a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 12 May 2022 14:58:10 +0800 Subject: [PATCH 01/12] fix bug --- .../recorded-detail.component.html | 28 ++++++++++- .../recorded-detail.component.ts | 46 ++++++++++++++++++- .../services/account-managemant.service.ts | 3 +- 3 files changed, 73 insertions(+), 4 deletions(-) diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html index 86530656..79d88f53 100644 --- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html +++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-28 20:27:07 * @LastEditors : Shiming - * @LastEditTime : 2022-05-12 13:59:31 + * @LastEditTime : 2022-05-12 14:57:21 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\account-management\\components\\recorded-detail\\recorded-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -85,7 +85,7 @@
{{ item.waitRecordedTaxPersonal | currency }}
-
{{ item.changeAmount | currency }}
+
{{ item.changeAmount | currency }}
{{ item.waitRecordedAmount | currency }}
@@ -123,6 +123,30 @@ + +
+
+ {{ changeRecordB?.ltdName }} + {{ changeRecordB?.changeAmount | currency: ' ' }} +
+ + +
{{item.changeAmount | currency}}
+ + +
{{ item?.createUserName ? item?.createUserName : '--'}}/{{item?.createUserPhone ? item?.createUserPhone : '--'}}
+ + +
+
{{ changeRecord?.ltdName }}
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts index dec67fe0..e145c47d 100644 --- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts +++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts @@ -32,19 +32,24 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { detailRecord: any = {}; changeRecord: any = {}; + changeRecordB: any = {}; url = `/user`; schema: SFSchema = {}; ui!: SFUISchema; @ViewChild('st') private readonly st!: STComponent; + @ViewChild('stB') private readonly stB!: STComponent; @ViewChild('sf') private readonly sf!: SFComponent; columns: STColumn[] = []; billDetailColumns: STColumn[] = []; + billDetailColumnsB: STColumn[] = []; showBillDetail = false; changeAccount = false; + showBillDetailB = false; addd = false; billDetailList = []; + billDetailListB = []; roleId = ''; changeAmount: number = 0; constructor(public service: AccountManagemantService, public router: Router, public ar: ActivatedRoute, private nzModalService: NzModalService,) { @@ -142,6 +147,14 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { } ]; } + initBillDetailSTB() { + this.billDetailColumnsB = [ + { title: '调整金额（元）', render: 'changeAmount', className: 'text-center', width: '150px' }, + { title: '备注', index: 'remark', className: 'text-center', width: '200px' }, + { title: '操作时间', index: 'modifyTime', className: 'text-center', width: '200px' }, + { title: '操作人', index: 'createUserName', className: 'text-center', width: '150px' }, + ]; + } initSFNew() { this.schemaView = { properties: { @@ -200,6 +213,21 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { }); } + /** + * 获取入账金额记录 + */ + getBillDetailB(ltdId: string) { + let params = { + ltdId: ltdId, + partnerId: this.roleId , + } + this.service.request(this.service.$api_get_getIncomeChangePage, params).subscribe(res => { + if (res) { + this.billDetailListB = res.records; + } + }); + } + export() {} /** @@ -221,6 +249,17 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { this.detailRecord = record; this.getBillDetail(record?.ltdId); } + /** + * 查看调整金额 + * @param record 当前行 + */ + changeB(record: any) { + // this.billDetailColumns = []; + this.showBillDetailB = true; + this.initBillDetailSTB(); + this.changeRecordB = record; + this.getBillDetailB(record?.ltdId); + } /** * 调整待入账金额 * @param record 当前行 @@ -230,7 +269,8 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { this.changeRecord = record; let params:any = { partnerId: this.roleId , - ltdId: record.ltdId + ltdId: record.ltdId, + ltdName: record.ltdName, } this.service.request(this.service.$api_get_getPartnerLitAmountSummary, params).subscribe(res => { if (res) { @@ -263,6 +303,10 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { this.changeAccount = false; this.changeRecord = {}; } + handleCancelB() { + this.showBillDetailB = false; + this.changeRecordB = {}; + } goBack() { window.history.go(-1); } diff --git a/src/app/routes/partner/account-management/services/account-managemant.service.ts b/src/app/routes/partner/account-management/services/account-managemant.service.ts index 848cbba3..d87bd317 100644 --- a/src/app/routes/partner/account-management/services/account-managemant.service.ts +++ b/src/app/routes/partner/account-management/services/account-managemant.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-21 13:49:22 * @LastEditors : Shiming - * @LastEditTime : 2022-05-11 19:56:49 + * @LastEditTime : 2022-05-12 14:44:17 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\account-management\\services\\account-managemant.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -27,6 +27,7 @@ export class AccountManagemantService extends ShipperBaseService { $api_get_invoice_detail_page = `/api/bpc/partnerInvoiceEntry/oprationEntryDetail`; // 待入账明细列表 $api_get_getPartnerLitAmountSummary = `/api/bpc/partnerInvoiceEntry/getPartnerLitAmountSummary`; // 查询合伙货运人相关金额 $api_get_saveIncomeChange = `/api/bpc/partnerIncomeChange/saveIncomeChange`; // 调整金额 + $api_get_getIncomeChangePage = `/api/bpc/partnerIncomeChange/getIncomeChangePage`; // 调整金额 constructor(public injector: Injector) { super(injector) From 4fa5127b3fb0d38f03ea9338f1006881918e109d Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 12 May 2022 15:22:13 +0800 Subject: [PATCH 02/12] fix bug --- .../components/detail/detail.component.ts | 27 +++++++++++++++++-- .../recorded/services/recorded.service.ts | 3 ++- .../express-detail-modal.component.ts | 2 +- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.ts b/src/app/routes/partner/recorded/components/detail/detail.component.ts index 1f235de5..d5a1877e 100644 --- a/src/app/routes/partner/recorded/components/detail/detail.component.ts +++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts @@ -26,12 +26,19 @@ export class PartnerRecordedDetailComponent implements OnInit { this.service.request(this.service.$api_get_recorded_record_detail, { id }).subscribe(res => { if (res) { this.formData = res; + + } + }); + this.service.request(this.service.$api_get_getPartnerInvoiceEntryDetail, { id }).subscribe(res => { + if (res) { // 处理流程节点数据 // 流程是否结束 + console.log(res); + // submitTime creattime let isEnd = false; - if (res.successTime) { + if (res.reAuditTime) { isEnd = true; - if (res.refundStatus === '3') { + if (res.sts === '3') { this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' }); } else { this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' }); @@ -40,6 +47,22 @@ export class PartnerRecordedDetailComponent implements OnInit { if (res.agreeTime && res.refundStatus !== '4') { this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' }); } + if (res.reAuditTime) { + if (res.refundStatus === '4') { + isEnd = true; + this.timeLineData.push({ + time: res.reAuditTime, + value: `拒绝提现
操作人员：${res.handlerUserIdLabel}`, + color: 'red' + }); + } else { + this.timeLineData.push({ + time: res.reAuditTime, + value: `审核通过
操作人员：${res.handlerUserIdLabel}`, + color: 'gray' + }); + } + } if (res.agreeTime) { if (res.refundStatus === '4') { isEnd = true; diff --git a/src/app/routes/partner/recorded/services/recorded.service.ts b/src/app/routes/partner/recorded/services/recorded.service.ts index 6135dae6..2dddb1d7 100644 --- a/src/app/routes/partner/recorded/services/recorded.service.ts +++ b/src/app/routes/partner/recorded/services/recorded.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-21 13:49:22 * @LastEditors : Shiming - * @LastEditTime : 2022-04-25 11:11:58 + * @LastEditTime : 2022-05-12 15:02:19 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\recorded\\services\\recorded.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -22,6 +22,7 @@ export class RecordedService extends BaseService { $api_agree_recorded = ``; // 同意审核 $api_audit_recored = `/api/bpc/partnerInvoiceEntry/oprationAudit`; // 审核单据 $api_get_list_summary = `/api/bpc/partnerInvoiceEntry/invoiceEntrySummary`; // 每页统计 + $api_get_getPartnerInvoiceEntryDetail = `/api/bpc/partnerInvoiceEntry/getPartnerInvoiceEntryDetail`; // 获取合伙人发票入账明细 constructor(public injector: Injector) { super(injector); } diff --git a/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts b/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts index 6bb43c7b..addcb379 100644 --- a/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts +++ b/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts @@ -66,7 +66,7 @@ export class ExpressDetailModalComponent implements OnInit { placeholder: '发票号码' } }, - expressno: { + vatinvcode: { title: '', type: 'string', ui: { From ded0c5e48bcda25b1da5d83acb8ecf867fb77665 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 12 May 2022 15:50:52 +0800 Subject: [PATCH 03/12] 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: '企业类型', From 54bd5c3bb11c1bc1546a2db8f9c577a5ed9d8bee Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 12 May 2022 16:16:35 +0800 Subject: [PATCH 04/12] edit --- proxy.conf.js | 22 +++++------ .../dataindex/dataindex.component.ts | 38 +++++++++++-------- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index b9211e38..eb14ed31 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -18,19 +18,9 @@ module.exports = { // secure: false, // Ignore invalid SSL certificates // changeOrigin: true // } - // '//api': { - // target: { - // host: 'tms-api.yunduoxing.com', - // protocol: 'https:', - // port: 443 - // }, - // secure: false, - // changeOrigin: true, - // logLevel: 'debug' - // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api.yunduoxing.com', protocol: 'https:', port: 443 }, @@ -38,4 +28,14 @@ module.exports = { changeOrigin: true, logLevel: 'debug' }, + // '//api': { + // target: { + // host: 'tms-api-test.eascs.com', + // protocol: 'https:', + // port: 443 + // }, + // secure: false, + // changeOrigin: true, + // logLevel: 'debug' + // }, }; diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.ts b/src/app/routes/datatable/components/dataindex/dataindex.component.ts index 12562a13..e8a6ee5f 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.ts +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.ts @@ -53,7 +53,9 @@ export class DatatableDataindexComponent implements OnInit, AfterViewInit { this.service.request(this.service.$api_total_advance_deposit).subscribe((res: DataTotalVO) => { if (res) { this.totalAdvanceDeposit = this.formatMiniAreaData(res); - this.initAreaMap(this.AdvanceDeposit['el'].nativeElement as any, []); + setTimeout(() => { + this.initAreaMap(this.AdvanceDeposit['el'].nativeElement as any, []); + }, 400); } }); // 业绩量总额 @@ -82,8 +84,9 @@ export class DatatableDataindexComponent implements OnInit, AfterViewInit { if (res) { const billTypeDatas2 = this.formatCoordinateData(res); console.log(billTypeDatas2); - - this.initBillChart(this.g2custom['el'].nativeElement as any, billTypeDatas2); + setTimeout(() => { + this.initBillChart(this.g2custom['el'].nativeElement as any, billTypeDatas2); + }, 100); } }); // 大区业绩完成情况 @@ -92,30 +95,35 @@ export class DatatableDataindexComponent implements OnInit, AfterViewInit { // this.regionalPerformanceCompletion = res.map(item => ({ ...item, time: new Date(item.time)?.getTime() })); // this.initRegionalPerformanceChart(this.RegionalPerforman['el'].nativeElement as any, this.regionalPerformanceCompletion); this.regionalPerformanceCompletion = this.formatBarData(res); - this.initBiaxialChart(this.RegionalPerforman['el'].nativeElement as any, this.regionalPerformanceCompletion, { - y1Title: '业绩量(万)', - y2Title: '业绩完成率', - y3Title: '同期业绩完成率' - }); + setTimeout(() => { + this.initBiaxialChart(this.RegionalPerforman['el'].nativeElement as any, this.regionalPerformanceCompletion, { + y1Title: '业绩量(万)', + y2Title: '业绩完成率', + y3Title: '同期业绩完成率' + }); + }, 100); } }); // 订单类型比例 this.service.request(this.service.$api_getWayBillDirectProportion).subscribe(res => { if (res) { const billTypeDatas = this.formatCoordinateData(res.map((item: any) => ({ ...item, billType: item.wayBillType }))); - console.log(billTypeDatas); - this.initBillChart(this.BillDirectProportion['el'].nativeElement as any, billTypeDatas); + setTimeout(() => { + this.initBillChart(this.BillDirectProportion['el'].nativeElement as any, billTypeDatas); + }, 100); } }); // 统计订单结算金额-趋势 this.service.request(this.service.$api_get_bill_payment_amount).subscribe(res => { if (res) { this.salesData = this.formatBarData(res); - this.initBiaxialChart(this.SaleProportion['el'].nativeElement as any, this.salesData, { - y1Title: '业绩量(万)', - y2Title: '业绩完成率', - y3Title: '同期业绩完成率' - }); + setTimeout(() => { + this.initBiaxialChart(this.SaleProportion['el'].nativeElement as any, this.salesData, { + y1Title: '业绩量(万)', + y2Title: '业绩完成率', + y3Title: '同期业绩完成率' + }); + }, 100); } }); } From 695c9a45845683926d592f5ba3b7a3b21d7f2282 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 12 May 2022 16:22:46 +0800 Subject: [PATCH 05/12] edit --- proxy.conf.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index eb14ed31..9b37b357 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -18,19 +18,9 @@ module.exports = { // secure: false, // Ignore invalid SSL certificates // changeOrigin: true // } - '//api': { - target: { - host: 'tms-api.yunduoxing.com', - protocol: 'https:', - port: 443 - }, - secure: false, - changeOrigin: true, - logLevel: 'debug' - }, // '//api': { // target: { - // host: 'tms-api-test.eascs.com', + // host: 'tms-api.yunduoxing.com', // protocol: 'https:', // port: 443 // }, @@ -38,4 +28,14 @@ module.exports = { // changeOrigin: true, // logLevel: 'debug' // }, + '//api': { + target: { + host: 'tms-api-test.eascs.com', + protocol: 'https:', + port: 443 + }, + secure: false, + changeOrigin: true, + logLevel: 'debug' + }, }; From 230bcce9f3a0437f59999f39b1994c8ac062efb1 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 12 May 2022 16:53:50 +0800 Subject: [PATCH 06/12] fix bug --- proxy.conf.js | 4 +- .../rebate-record.component.html | 4 +- .../rebate-record/rebate-record.component.ts | 2 +- .../abnormal-feedback.component.ts | 13 +++- .../record-detail.component.html | 2 +- .../record-detail/record-detail.component.ts | 59 ++++++++++--------- 6 files changed, 47 insertions(+), 37 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index b9211e38..83d7ec32 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-11 19:19:55 + * @LastEditTime : 2022-05-12 16:51:55 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, 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 46fa0a43..5e27e01e 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-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" > -
123212{{item?.abnormalFeedback}}
+
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 dfc949a3..1cff3f6c 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 @@ -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) => { diff --git 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 index 4c4f36d9..b4abc7cf 100644 --- 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: { diff --git 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 index 63f8290c..69b77791 100644 --- 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 @@ { - 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' }, { From 1bca5d70ae6605e2e65c0c4af08ba9fbfeb3da66 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 12 May 2022 16:55:55 +0800 Subject: [PATCH 07/12] fix bug --- .../partner/level-config/components/list/list.component.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/routes/partner/level-config/components/list/list.component.html b/src/app/routes/partner/level-config/components/list/list.component.html index 4b5ae111..5f637e77 100644 --- 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. --> + Date: Thu, 12 May 2022 17:12:38 +0800 Subject: [PATCH 08/12] fix bug --- .../add-etp-partner.component.ts | 2 + .../add-personal-partner.component.ts | 61 ++++++++++--------- .../list/editPartner/editPartner.component.ts | 20 +++--- 3 files changed, 47 insertions(+), 36 deletions(-) diff --git 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 index 359dba09..44b9acce 100644 --- 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) => diff --git 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 index 9de158b2..a322db65 100644 --- 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); } } diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts index e1f914ef..0a06c989 100644 --- 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); + } + }); } }); + } } From 317f6e73b15b81426d9187b7959d17aa90fb5366 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 12 May 2022 17:14:52 +0800 Subject: [PATCH 09/12] fix bug --- .../routes/usercenter/components/freight/list/list.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index cfb0dad0..d35a2a33 100644 --- 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 }, From b5da3a1e1411177b6998f5b1012d45fe1fa74049 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 12 May 2022 17:20:18 +0800 Subject: [PATCH 10/12] edit --- .../components/basic-table/basic-table.component.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/routes/commom/components/basic-table/basic-table.component.ts b/src/app/routes/commom/components/basic-table/basic-table.component.ts index f58d7dde..f25482d7 100644 --- a/src/app/routes/commom/components/basic-table/basic-table.component.ts +++ b/src/app/routes/commom/components/basic-table/basic-table.component.ts @@ -1,5 +1,5 @@ import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core'; -import { OnReuseDestroy } from '@delon/abc/reuse-tab'; +import { OnReuseDestroy, OnReuseInit, ReuseHookOnReuseInitType } from '@delon/abc/reuse-tab'; import { SFComponent, SFSchema } from '@delon/form'; import { SearchDrawerService } from '@shared'; import { fromEvent, Subscription } from 'rxjs'; @@ -25,7 +25,7 @@ import { debounceTime } from 'rxjs/operators'; @Component({ template: '' }) -export class BasicTableComponent implements AfterViewInit, OnDestroy, OnReuseDestroy { +export class BasicTableComponent implements AfterViewInit, OnDestroy, OnReuseDestroy, OnReuseInit { scrollY = '400px'; sf!: SFComponent; @@ -35,6 +35,9 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy, OnReuseDes deviationHeight = 0; constructor(public searchDrawerService: SearchDrawerService) {} + _onReuseInit(type?: ReuseHookOnReuseInitType): void { + this.search(); + } ngAfterViewInit(): void { setTimeout(() => { @@ -48,8 +51,6 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy, OnReuseDes } _onReuseDestroy(): void { - console.log(1); - // this.drawer.forEach(sub => sub.unsubscribe()); } @@ -59,7 +60,7 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy, OnReuseDes openDrawer() { console.log(this.sfValue); - + if (this.searchDrawerService.drawer?.length > 0) { this.searchDrawerService.create(this.sfValue, this.schema); } else { From 33ae979b08fa0bb0fe86fe46ed0c00c363fe7046 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 12 May 2022 17:52:16 +0800 Subject: [PATCH 11/12] fix bug --- proxy.conf.js | 4 ++-- .../rebate-record/rebate-record.component.ts | 2 +- .../abnormal-feedback.component.html | 23 +++++++++---------- .../abnormal-feedback.component.ts | 16 ++++++++++--- .../freight/list/detail/detail.component.ts | 6 ++--- 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 83d7ec32..1443977f 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-12 16:51:55 + * @LastEditTime : 2022-05-12 17:15:50 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, 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 1cff3f6c..cacd4105 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 @@ -68,7 +68,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit { { title: '月份', index: 'month', - format: (item: any) => {return item?.month ? item?.month + '月' : ''} + format: (item: any) => {return ((item?.year ? item?.year + '-' : '') + (item?.month ? item.month : ''))} }, { title: '返佣金额（元）', diff --git a/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.html b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.html index cef84c44..aeefdd53 100644 --- a/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.html +++ b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.html @@ -4,23 +4,22 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-03-10 15:10:47 + * @LastEditTime : 2022-05-12 17:43:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - -
有订单有异常请查看
-
2022-09-08 00:00:00
+ +
{{item.feedbackInfo}}
+
{{item.createTime}}
+ +
{{item.replyVOList}}
+
{{item.feedbackInfo}}
+ + + +
暂无反馈信息
-
{ + this.service.request(this.service.$api_get_getExceptionMessage, { partnerId: this.i?.partnerId,month: this.i.month,year: this.i.year }).subscribe(res => { console.log(res); + this.mybidDetailInfo = res }); } } initSF() { this.schema = { properties: { - name3: { + feedbackInfo: { type: 'string', title: '回复', maxLength: 50, @@ -63,6 +65,14 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit { }; } close() { + if(!this.sf.valid) { + this.service.msgSrv.error('请填写必填项！') + return + } + let params = { + + } + this.service.request(this.service.$api_get_partnerIncomeExceptionAdd) this.modalRef.destroy(); } } diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts index 4fb06006..8907cf1e 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts @@ -505,9 +505,9 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { if (res.name) { this.detailData.enterpriseName = res.name; } - if (res.type) { - this.detailData.enterpriseType = res.type; - } + // if (res.type) { + // this.detailData.enterpriseType = res.type; + // } if (res.addressRegionCodes) { this.detailData.enterpriseAddressCode = res.addressRegionCodes; } From a43d56bdc984ede6b54740273328a73050c7386c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 12 May 2022 17:54:52 +0800 Subject: [PATCH 12/12] fix bug --- .../abnormal-feedback.component.ts | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git 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 index eed28c66..a2d22712 100644 --- 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-05-12 17:41:17 + * @LastEditTime : 2022-05-12 17:54:15 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -35,11 +35,13 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit { initData() { if (this.i) { console.log(this.i); - - this.service.request(this.service.$api_get_getExceptionMessage, { partnerId: this.i?.partnerId,month: this.i.month,year: this.i.year }).subscribe(res => { - console.log(res); - this.mybidDetailInfo = res - }); + + this.service + .request(this.service.$api_get_getExceptionMessage, { partnerId: this.i?.partnerId, month: this.i.month, year: this.i.year }) + .subscribe(res => { + console.log(res); + this.mybidDetailInfo = res; + }); } } initSF() { @@ -65,14 +67,21 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit { }; } close() { - if(!this.sf.valid) { - this.service.msgSrv.error('请填写必填项！') - return + if (!this.sf.valid) { + this.service.msgSrv.error('请填写必填项！'); + return; } let params = { - - } - this.service.request(this.service.$api_get_partnerIncomeExceptionAdd) - this.modalRef.destroy(); + partnerId: this.i?.partnerId, + month: this.i.month, + year: this.i.year, + ...this.sf.value + }; + this.service.request(this.service.$api_get_partnerIncomeExceptionAdd,params).subscribe((res) => { + if(res) { + this.service.msgSrv.success('保存成功！'); + this.modalRef.destroy(); + } + }) } }