From 7cbc7b1b2ecd2656193163c4e79f9c23a69dd2be Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 23 Feb 2022 15:12:42 +0800 Subject: [PATCH] edit --- .../driver-config/driver-config.component.ts | 8 +++++++- .../enterprise-audit.component.ts | 15 ++++++++------- .../freight-config/freight-config.component.ts | 7 ++++++- .../dynamic-setting-modal.component.ts | 4 +--- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts index 67067671..11e4542c 100644 --- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts +++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts @@ -33,7 +33,7 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit { ngOnInit() {} settingAction(item?: any) { - this.modal.create({ + const modal = this.modal.create({ nzTitle: '配置', nzContent: DynamicSettingModalComponent, nzWidth: 900, @@ -44,6 +44,12 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit { }, nzFooter: null }); + + modal.afterClose.subscribe(res => { + if (res) { + this.st.load(1); + } + }); } /** 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 7ffd3e84..44df5acc 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 @@ -153,7 +153,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 }, { title: '联系人', className: 'text-center', index: 'contacter', width: 150 }, { title: '手机号', className: 'text-center', index: 'mobile', width: 150 }, - { title: '申请时间', className: 'text-center', index: 'createTime', width: 150 }, + { title: '申请时间', className: 'text-center', index: 'createTime', width: 160 }, { title: '审核状态', className: 'text-center', @@ -189,11 +189,11 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { initAdminST(): STColumn[] { return [ { title: '企业名称', className: 'text-center', index: 'enterpriseName' }, - { title: '当前管理员', className: 'text-center', index: 'oldAdminName' }, - { title: '当前管理员手机号', className: 'text-center', index: 'oldAdminMobile' }, - { title: '转授对象', className: 'text-center', index: 'newAdminName' }, - { title: '转授对象手机号', className: 'text-center', index: 'newAdminMobile' }, - { title: '申请时间', className: 'text-center', index: 'createTime' }, + { title: '当前管理员', className: 'text-center', index: 'oldAdminName', width: 140 }, + { title: '当前管理员手机号', className: 'text-center', index: 'oldAdminMobile', width: 150 }, + { title: '转授对象', className: 'text-center', index: 'newAdminName', width: 140 }, + { title: '转授对象手机号', className: 'text-center', index: 'newAdminMobile', width: 150 }, + { title: '申请时间', className: 'text-center', index: 'createTime', width: 160 }, { title: '状态', className: 'text-center', @@ -203,7 +203,8 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { 10: { text: '待审核', color: 'processing' }, 20: { text: '已成功', color: 'success' }, 30: { text: '已驳回', color: 'warning' } - } + }, + width: 130 }, { title: '操作', diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts index cd0c528e..31f5486b 100644 --- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts +++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts @@ -35,7 +35,7 @@ export class FreightConfigComponent implements OnInit { }; settingAction(item?: any) { - this.modal.create({ + const modal = this.modal.create({ nzTitle: '配置', nzContent: DynamicSettingModalComponent, nzWidth: 900, @@ -66,6 +66,11 @@ export class FreightConfigComponent implements OnInit { }, nzFooter: null }); + modal.afterClose.subscribe(res => { + if (res) { + this.st.load(1); + } + }); } exportList() { diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts index 7b03d3e4..426e0ddb 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts @@ -75,8 +75,6 @@ export class DynamicSettingModalComponent implements OnInit { this.configList = this.formatItems(this.selectedTab.items); const hiddenType = this.configList.find((item: any) => item.itemType === 7 || item.itemType === 999); this.labelWidth = hiddenType ? 0 : 200; - console.log(this.configList); - } }); } @@ -103,7 +101,7 @@ export class DynamicSettingModalComponent implements OnInit { this.service.request('/api/mdc/pbc/sysConfigItemExtend/saveBatch', p).subscribe(res => { if (res) { this.service.msgSrv.success('修改配置成功'); - this.modalHelp.destroy(); + this.modalHelp.destroy(true); } }); }