diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html index 4e65ce4e..f1cf0363 100644 --- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html +++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 15:54:08 * @LastEditors : Shiming - * @LastEditTime : 2022-02-11 15:36:29 + * @LastEditTime : 2022-02-14 14:39:47 * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\network-freight.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -55,15 +55,6 @@ [loading]="service.http.loading" (change)="stChange($event)" > - - 设置 - - - 设置 - - - 设置 - 开通子账户 diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts index d1d297a4..9ad337cd 100644 --- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts @@ -45,24 +45,30 @@ export class NetworkFreightComponent implements OnInit { index: 'taxCode' }, { - title: '发票税率', + title: '成立日期', width: '150px', - - index: 'invoiceTaxRate' }, + index: 'createTime' + }, { - title: '云开票', + title: '成本费率', width: '150px', render: 'electronicInvoiceAccount' }, { - title: 'e签宝', + title: '附加费率', width: '150px', render: 'etcAccount' }, + { + title: '云开票', + width: '150px', + render: 'electronicContractAccount' + }, { title: '保险', width: '150px', - render: 'electronicContractAccount' }, + render: 'electronicContractAccount' + }, { title: '平安银行', width: '150px', @@ -72,36 +78,52 @@ export class NetworkFreightComponent implements OnInit { width: '150px', render: 'virtualAccount' }, + { + title: '平安电子账户', + width: '150px', + render: 'virtualAccount' + }, + { + title: '浦发电子账户', + width: '150px', + render: 'virtualAccount' + }, + { + title: '开票开关', + width: '150px', + render: 'virtualAccount' + }, { title: '操作', - width: '', + width: '110px', fixed: 'right', className: 'text-left', buttons: [ { - text: '银行设置　', + text: '基础设置', + click: item => this.settingAction(item) + }, + { + text: '财务设置', click: item => this.roleAction(item, 2) }, { - text: '系统配置　', + text: '充值账户', click: item => this.roleAction(item, 2) }, { - text: '银行卡管理', - click: item => this.roleAction(item, 2) + text: '应用设置', + click: item => this.settingApp(item) + }, + { + text: '系统配置', + click: item => this.ticket(item) }, - // { - // text: '票务设置', - // click: item => this.ticket(item) - // }, // { // text: '合同设置', // click: item => this.roleAction(item, 2) // }, - { - text: '基础设置　', - click: item => this.settingAction(item) - } + ] } ]; @@ -329,7 +351,7 @@ export class NetworkFreightComponent implements OnInit { nzOnOk: () => {} }); } - +// 基础设置 settingAction(item?: any) { this.nzModalService.create({ nzTitle: '基础设置', @@ -337,7 +359,21 @@ export class NetworkFreightComponent implements OnInit { nzWidth: 900, nzComponentParams: { extendType: '1', - businessId: item.id + businessId: item.id, + }, + nzFooter: null + }); + } + // 应用设置 + settingApp(item?: any) { + this.nzModalService.create({ + nzTitle: '基础设置', + nzContent: DynamicSettingModalComponent, + nzWidth: 900, + nzComponentParams: { + extendType: '1', + businessId: item.id, + configvalue: 'app' }, nzFooter: null }); @@ -411,16 +447,16 @@ export class NetworkFreightComponent implements OnInit { getRegionDetailByCode(regionCode: any) { return this.service.request(this.service.$api_get_region_by_code, { regionCode }); } - setMakeInvoice2(item:any) { - this.nzModalService.create({ - nzTitle: '基础设置', - nzContent: SinglepageSettingModalComponent, - nzWidth: 900, - nzComponentParams: { - extendType: '1', - businessId: item.id - }, - nzFooter: null - }); - } + // setMakeInvoice2(item:any) { + // this.nzModalService.create({ + // nzTitle: '基础设置', + // nzContent: SinglepageSettingModalComponent, + // nzWidth: 900, + // nzComponentParams: { + // extendType: '1', + // businessId: item.id + // }, + // nzFooter: null + // }); + // } } 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 2eb2dd34..8c7d5a06 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 @@ -209,12 +209,12 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { fixed: 'right', width: '180px', className: 'text-center', - buttons: [ - { text: '审核', - click: _record => this.ViewAdimin(_record), iif: (item: any) => item.approvalStatus === 10, - acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-adminAudit'] }, - } - ] + buttons: [{ + text: '审核', + click: _record => this.ViewAdimin(_record), + iif: (item: any) => item.approvalStatus === 10, + // acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-view'] }, + }] } ]; } 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 5aa60dc9..de8fca57 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 @@ -1,3 +1,13 @@ +
@@ -63,6 +73,12 @@ + + + + +
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts index 7bd096d5..d22bc5f1 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-01-25 16:03:45 + * @LastEditors : Shiming + * @LastEditTime : 2022-02-14 14:54:08 + * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit, EventEmitter, Input, Output } from '@angular/core'; import { BaseService } from '@shared'; @@ -29,7 +39,9 @@ export class DynamicSettingH5Component implements OnInit { constructor(public service: BaseService) {} - ngOnInit() {} + ngOnInit() { + console.log(this.tabs) + } changeType(type: any): void { this.selectedTab = type; @@ -42,7 +54,7 @@ export class DynamicSettingH5Component implements OnInit { if (this.configList?.length < 0) { return; } - + console.log(this.configList) let params = [...this.configList]; params = params.map((item: any) => { if (JSONTYPE.has(item.itemType)) { 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 fed36e60..b6f7e054 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 @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-01-10 16:06:17 + * @LastEditors : Shiming + * @LastEditTime : 2022-02-14 15:28:16 + * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-modal\\dynamic-setting-modal.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, Input, OnInit } from '@angular/core'; import { ModalHelper } from '@delon/theme'; import { NzModalRef } from 'ng-zorro-antd/modal'; @@ -11,30 +21,37 @@ import { BaseService } from 'src/app/shared/services'; export class DynamicSettingModalComponent implements OnInit { tabs: any[] = []; selectedTab: any = null; - + configFullKey = 'sys.config' configList: any = []; @Input() extendType!: string; @Input() businessId!: string; + @Input() + configvalue!: string; constructor(public service: BaseService, private modalHelp: NzModalRef) {} ngOnInit() { + if(this.configvalue) { + console.log(this.configvalue) + this.configFullKey = this.configvalue + } this.getTypeList(); } getTypeList() { + this.service .request('/api/mdc/pbc/sysConfigItemExtend/getSysConfigExtend', { - configFullKey: 'sys.config', + configFullKey: this.configFullKey, extendType: this.extendType, businessId: this.businessId }) .subscribe((res: Array) => { if (res?.length > 0) { - const typeData = res.find(config => config.configFullKey === 'sys.config'); + const typeData = res.find(config => config.configFullKey === this.configFullKey); if (typeData) { this.tabs = typeData.children; this.selectedTab = typeData.children[0]; @@ -78,12 +95,13 @@ export class DynamicSettingModalComponent implements OnInit { itemData: item.extendItemData || item.itemData, itemValue: item.extendItemValue || item.itemValue })) - .map(item => ({ + .map(item => ( + { ...item, - remark: item.remark ? JSON.parse(item.remark) : null, - extend: item.extend ? JSON.parse(item.extend) : [], + remark: item?.remark ? JSON.parse(item?.remark) : null, + extend: item?.extend ? JSON.parse(item?.extend) : [], // itemData: item.itemData ? JSON.parse(item.itemData) : item.itemData, - itemValue: item.itemValue ? JSON.parse(item.itemValue) : item.itemValue + itemValue: item?.itemValue ? JSON.parse(item?.itemValue) : item?.itemValue })); } return [];