Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangshiming
2022-02-23 16:22:07 +08:00
parent aae2bb67e4 307ee2a12a
commit c27874bb3f
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
View File

@ -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);
}
});
}
/**

15
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
View File

@ -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: '操作',

7
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
View File

@ -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() {

4
src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts
View File

@ -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);
}
});
}