From ec2e1516f493665c6104201fd171f1d331ee0f33 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 25 Jan 2022 10:55:47 +0800 Subject: [PATCH] edit --- src/app/core/guards/auth.guard.ts | 2 +- .../basic-setting/basic-setting.component.ts | 3 +- .../requested-invoice-modal.component.ts | 4 +- .../dynamic-setting-h5.component.html | 24 +++--------- .../dynamic-setting/dynamic-setting.module.ts | 7 ++-- .../freight-table.component.html | 22 +++++++++++ .../freight-table.component.less | 0 .../freight-table/freight-table.component.ts | 38 +++++++++++++++++++ 8 files changed, 73 insertions(+), 27 deletions(-) create mode 100644 src/app/shared/components/dynamic-setting/freight-table/freight-table.component.html create mode 100644 src/app/shared/components/dynamic-setting/freight-table/freight-table.component.less create mode 100644 src/app/shared/components/dynamic-setting/freight-table/freight-table.component.ts diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts index df5a927c..47b7dcca 100644 --- a/src/app/core/guards/auth.guard.ts +++ b/src/app/core/guards/auth.guard.ts @@ -30,7 +30,7 @@ export class AuthGuard implements CanActivate, CanActivateChild { } console.log(route); - return this.baseService.request('/api/mdc/cuc/user/getUserDetail', { link: route }).pipe( + return this.baseService.request('/api/mdc/cuc/functionButton/getPermissionsCodeoByLink', { link: route }).pipe( map(_ => { this.srv.setAbility(auths); this.menuService.resume(); diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts index 345126e2..25cc3383 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts @@ -20,7 +20,7 @@ export class BasicSettingComponent implements OnInit { } getTypeList() { - this.service.request(this.service.$api_get_config_tree, { configFullKey: 'sys.config' }).subscribe((res: Array) => { + this.service.request(this.service.$api_get_config_tree, { configFullKey: 'sys.config', extendType: 0 }).subscribe((res: Array) => { if (res?.length > 0) { const typeData = res.find(config => config.configFullKey === 'sys.config'); if (typeData) { @@ -50,7 +50,6 @@ export class BasicSettingComponent implements OnInit { } saveAction(params: any) { - this.service.request(this.service.$api_update_config_batch, params).subscribe(res => { if (res) { this.service.msgSrv.success('修改配置成功'); diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts index 9dd55397..422dcf0c 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -74,11 +74,11 @@ export class RequestedInvoiceModalComponent implements OnInit { { title: '承运司机', index: 'driverinfo', width: 170 }, { title: '总费用', - index: 'vatmoney', + index: 'billkpmoney', width: 90, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.billkpmoney }) } }, { title: '运输费', diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html index 6e6838dc..93fd874b 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html @@ -14,7 +14,10 @@

{{selectedTab?.name}}

- + + + + - + -->
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts b/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts index cddc9b6d..7154dc0e 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts @@ -5,10 +5,11 @@ import { SHARED_ZORRO_MODULES } from '../../shared-zorro.module'; import { SHARED_DELON_MODULES } from '../../shared-delon.module'; import { FormsModule } from '@angular/forms'; import { DynamicSettingModalComponent } from './dynamic-setting-modal/dynamic-setting-modal.component'; - +import { FreightTableComponent } from './freight-table/freight-table.component'; +const COMPONENTS = [DynamicSettingH5Component, DynamicSettingModalComponent, FreightTableComponent]; @NgModule({ - declarations: [DynamicSettingH5Component, DynamicSettingModalComponent], + declarations: [...COMPONENTS], imports: [CommonModule, FormsModule, SHARED_ZORRO_MODULES, SHARED_DELON_MODULES], - exports: [DynamicSettingH5Component] + exports: [...COMPONENTS] }) export class DynamicSettingModule {} diff --git a/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.html b/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.html new file mode 100644 index 00000000..e14c7991 --- /dev/null +++ b/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.html @@ -0,0 +1,22 @@ + + + + 公里数 + 计算方式 + 车长（米） + 操作 + + + + + + + {{ item.startKm }} - {{ item.endKm }} + {{ item.computeMode }} + 最高{{ node.maxPrice }} 预警{{ + node.ewPrice }} + 删除 + + + \ No newline at end of file diff --git a/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.less b/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.ts b/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.ts new file mode 100644 index 00000000..2ed7b501 --- /dev/null +++ b/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.ts @@ -0,0 +1,38 @@ +import { Component, OnInit } from '@angular/core'; +import { BaseService } from '@shared'; + +@Component({ + selector: 'app-freight-table', + templateUrl: './freight-table.component.html', + styleUrls: ['./freight-table.component.less'] +}) +export class FreightTableComponent implements OnInit { + data: any[] = []; + headers: any[] = []; + constructor(public service: BaseService) {} + + ngOnInit(): void { + this.loadHeaders(); + this.loadData(); + } + + loadHeaders() { + this.service.request('/api/mdc/cuc/freightConfigItem/list').subscribe(res => { + if (res) { + this.headers = res; + } + }); + } + + loadData() { + this.service.request('/api/mdc/cuc/freightConfig/list').subscribe(res => { + if (res) { + this.data = res; + } + }); + } + + changeEndLength(event: any, i: number) { + console.log(event, i); + } +}