diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts
index 920095b6..eb319233 100644
--- a/src/app/core/guards/auth.guard.ts
+++ b/src/app/core/guards/auth.guard.ts
@@ -1,3 +1,13 @@
+/*
+ * @Description :
+ * @Version : 1.0
+ * @Author : Shiming
+ * @Date : 2022-01-25 16:03:45
+ * @LastEditors : Shiming
+ * @LastEditTime : 2022-01-25 19:12:23
+ * @FilePath : \\tms-obc-web\\src\\app\\core\\guards\\auth.guard.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
import { Inject, Injectable, Injector } from '@angular/core';
import {
ActivatedRouteSnapshot,
@@ -43,7 +53,7 @@ export class AuthGuard implements CanActivate, CanActivateChild {
if (!route) {
return of(true);
}
- return this.baseService.request('/api/mdc/cuc/functionButton/getPermissionsCodeoByLink', { link: route }).pipe(
+ return this.baseService.request('/api/mdc/cuc/functionButton/getUserFunctionButton', { link: route }).pipe(
switchMap(res => {
if (res) {
this.srv.setAbility(res.permissionsCodeList || []);
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 76c0f7c6..feecb88c 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
@@ -1,11 +1,14 @@
+
@@ -54,6 +57,9 @@
[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 cb0c9e4d..a64a9190 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
@@ -50,56 +50,56 @@ export class NetworkFreightComponent implements OnInit {
index: 'invoiceTaxRate' },
{
- title: '电子发票账号',
+ title: '云开票',
width: '150px',
-
-
- index: 'electronicInvoiceAccount' },
+ render: 'electronicInvoiceAccount'
+ },
{
- title: 'ETC账号',
+ title: 'e签宝',
width: '150px',
-
- index: 'etcAccount' },
+ render: 'etcAccount'
+ },
{
- title: '电子合同账号',
+ title: '保险',
width: '150px',
- index: 'electronicContractAccount' },
+ render: 'electronicContractAccount' },
{
- title: '开户行',
+ title: '平安银行',
width: '150px',
- index: 'bankName' },
+ render: 'bankName' },
{
- title: '虚拟账户',
+ title: '浦发银行',
width: '150px',
- index: 'virtualAccount' },
- {
- title: '附加费比例',
- index: 'surchargeRate',
- width: '150px',
- format: (item: any) => {
- return item.surchargeRate + '%';
- }
- },
+ render: 'virtualAccount'
+ },
{
title: '操作',
- width: '80px',
+ width: '',
fixed: 'right',
className: 'text-left',
buttons: [
{
- text: '财务设置',
+ text: '银行设置 ',
click: item => this.roleAction(item, 2)
},
{
- text: '票务设置',
- click: item => this.ticket(item)
- },
- {
- text: '合同设置',
+ text: '系统配置 ',
click: item => this.roleAction(item, 2)
},
{
- text: '基础设置',
+ text: '银行卡管理',
+ click: item => this.roleAction(item, 2)
+ },
+ // {
+ // text: '票务设置',
+ // click: item => this.ticket(item)
+ // },
+ // {
+ // text: '合同设置',
+ // click: item => this.roleAction(item, 2)
+ // },
+ {
+ text: '基础设置 ',
click: item => this.settingAction(item)
}
]
@@ -401,7 +401,10 @@ export class NetworkFreightComponent implements OnInit {
}
});
}
-
+ // 云开票
+ setMakeInvoice() {
+
+ }
/*
* 根据地区code查询地区列表
*/