diff --git a/proxy.conf.js b/proxy.conf.js index 67c15ee2..10071e14 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,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/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 2e47723a..7d1cafb2 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -71,6 +71,9 @@ export class PartnerListComponent { nzComponentParams: { info: { ...item, enterpriseName: item.enterpriseName || item.contactName }, sourcePage: '合伙人审核列表' }, nzFooter: null }); + modal.afterClose.subscribe(res => { + modal.destroy(); + }); } editTemplateAction(item: any) { @@ -102,6 +105,7 @@ export class PartnerListComponent { .subscribe(res => { if (res) { this.service.msgSrv.success('修改成功'); + this.st.load(1); this.nzModalService.closeAll(); } }); @@ -161,6 +165,7 @@ export class PartnerListComponent { if (res) { this.service.msgSrv.success('修改成功'); this.nzModalService.closeAll(); + this.st.load(1); } }); } @@ -185,6 +190,7 @@ export class PartnerListComponent { } else { this.service.msgSrv.warning('发起失败'); } + this.st.load(1); }); } }); diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts index 6e271d70..f6fbcaac 100644 --- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts @@ -112,6 +112,7 @@ export class PartnerAuditModalComponent implements OnInit { }; this.service .request(this.service.$api_audit_partner, { + ...params, auditStatusEnum: params.auditStatusEnum, id: params.id, approvalOpinion: params.approvalOpinion, diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html index c4abbd48..dc271a74 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html @@ -16,8 +16,8 @@

{{ detailData?.enterpriseName }}

- - + +
@@ -46,12 +46,12 @@ diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts index 61559772..b65e7695 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts @@ -117,8 +117,10 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { freezeOrResume(type: number) { this.service.http .post(this.service.$api_lock_freight, { - id: this.route.snapshot.params.id, - statedLocked: !!type + appUserId: [this.detailData.appUserId], + freezeOrResume: !!type, + pageName: '合伙人详情', + telephone: this.detailData.adminUserInfo.mobile }) .subscribe(res => { if (res.data === true) { @@ -138,7 +140,7 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { const modal = this.nzModalService.create({ nzTitle: '审核', nzContent: PartnerAuditModalComponent, - nzComponentParams: { info: { ...this.detailData, isPass },sourcePage:'合伙人审核详情' }, + nzComponentParams: { info: { ...this.detailData, isPass }, sourcePage: '合伙人审核详情' }, nzFooter: null }); } @@ -274,7 +276,7 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { operatingEndTime: this.datePipe.transform(dateil.operatingEndTime, 'yyyy-MM-dd'), operatingStartTime: this.datePipe.transform(dateil.operatingStartTime, 'yyyy-MM-dd') }); - + this.service.request(this.service.$api_save_entp_partner, params).subscribe(res => { if (res) { this.service.msgSrv.success('企业合伙人修改成功'); diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html index 96041864..b34aef70 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html @@ -16,8 +16,8 @@

{{ detailData?.adminUserInfo?.name }}

- - + +
@@ -46,12 +46,12 @@ diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts index 6ee8f6d5..ce1cec65 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts @@ -92,8 +92,10 @@ export class PersonalPartnerDetailComponent implements OnInit { freezeOrResume(type: number) { this.service.http .post(this.service.$api_lock_freight, { - id: this.route.snapshot.params.id, - statedLocked: !!type + appUserId: [this.detailData.appUserId], + freezeOrResume: !!type, + pageName: '合伙人详情', + telephone: this.detailData.adminUserInfo.mobile }) .subscribe(res => { if (res.data === true) { diff --git a/src/app/routes/partner/partner-list/services/partner-list.service.ts b/src/app/routes/partner/partner-list/services/partner-list.service.ts index 5a00d758..b714c47c 100644 --- a/src/app/routes/partner/partner-list/services/partner-list.service.ts +++ b/src/app/routes/partner/partner-list/services/partner-list.service.ts @@ -38,7 +38,7 @@ export class PartnerListService extends ShipperBaseService { // 渠道销售修改详情 $api_get_partner_change_list = '/api/mdc/partnerChannelRelLog/partnerChannelUpdateDetaiList'; // 冻结/启用企业业 - $api_lock_freight = '/api/mdc/cuc/enterpriseInfo/operate/lock'; + $api_lock_freight = '/api/mdc/cuc/userApp/freezeOrResume'; // 根据地区code查询列表 $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode'; diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index bba9056d..045ca354 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -297,7 +297,7 @@ export class ShipperBaseService extends BaseService { map(res => { if (res) { return res.map((m: any) => { - return { label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.userAppId }; + return { label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.id }; }); } else { return [];