From 35717ca650306c33735c899b733cb5d723dc0261 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 25 Jan 2022 19:12:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/core/guards/auth.guard.ts             | 12 +++-
 .../network-freight.component.html            | 18 ++++--
 .../network-freight.component.ts              | 63 ++++++++++---------
 3 files changed, 56 insertions(+), 37 deletions(-)

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 @@
 <!--
- * @Author: your name
- * @Date: 2021-12-24 15:38:08
- * @LastEditTime: 2022-01-14 14:40:25
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \tms-obc-web\src\app\routes\sys-setting\components\crm-management\crm-management.component.html
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2021-12-24 15:54:08
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-25 17:43:07
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\network-freight.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
+
 <page-header-wrapper title="网络货运人"> </page-header-wrapper>
 
 <nz-card>
@@ -54,6 +57,9 @@
     [loading]="service.http.loading"
     (change)="stChange($event)"
   >
+  <ng-template st-row="electronicInvoiceAccount" let-item let-index="index">
+    <a href="javascript:;" (click)="setMakeInvoice()">设置</a>
+  </ng-template>
   </st>
 </nz-card>
 
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查询地区列表
    */