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

src/app/routes/sys-setting/components/role-management/role-management.component.ts

@@ -42,11 +42,13 @@ export class RoleManagementComponent implements OnInit {
       buttons: [
         {
           text: '编辑',
-          click: item => this.roleAction(item)
+          click: item => this.roleAction(item),
+          iif: item => item.roleName !== '超级管理员'
         },
         {
           text: '删除',
-          click: item => this.deleteAction(item)
+          click: item => this.deleteAction(item),
+          iif: item => item.roleName !== '超级管理员'
         }
       ]
     }

src/app/routes/usercenter/components/freight/list/list.component.ts

@@ -197,7 +197,7 @@ export class FreightComponentsListComponent implements OnInit {
         className: 'text-center',
         buttons: [
           {
-            text: '查看',
+            text: '查看<br/>',
             click: item => {
               this.router.navigate(['./detail', item.id], { relativeTo: this.ar });
               // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });