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

proxy.conf.js

@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts

@@ -147,24 +147,22 @@ export class PlatformAccountDetailComponent implements OnInit {
           },
           default: ''
         },
-        enterpriseId: {
+        enterpriseName: {
           type: 'string',
           title: '货主',
           ui: {
-            widget: 'select',
+            placeholder: '请输入',
-            placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
           },
           default: ''
         },
-        projectId: {
+        projectName: {
           type: 'string',
           title: '所属项目',
           ui: {
-            widget: 'select',
+            placeholder: '请输入',
-            placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -184,7 +182,7 @@ export class PlatformAccountDetailComponent implements OnInit {
       { title: '订单号', index: 'orderSn', width: 170 },
       { title: '运单号', index: 'businessNumber', width: 190 },
       { title: '账户类型', index: 'accountTypeLabel', className: 'text-center', width: 130 },
-      { title: '账户名称', index: 'incomeTypeLabel', className: 'text-center', width: 150 },
+      { title: '账户名称', index: 'payName', className: 'text-center', width: 150 },
       { title: '所属项目', index: 'projectName', className: 'text-center', width: 150 },
       { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 130 },
       {
@@ -203,7 +201,7 @@ export class PlatformAccountDetailComponent implements OnInit {
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
       },
-      { title: '付款方', index: 'incomeTypeLabel', className: 'text-center', width: 150 },
+      { title: '付款方', index: 'payName', className: 'text-center', width: 150 },
       { title: '收款方', index: 'payeeName', className: 'text-center', width: 150 },
       { title: '备注', index: 'tradeContent', className: 'text-center', width: 150 }
     ];

src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts

@@ -320,7 +320,7 @@ export class VoucherManagementComponent implements OnInit {
       { title: '汇总凭证号', index: 'vc2code', width: 150 },
       { title: '凭证状态', index: 'stsLabel', width: 120 },
       { title: '创建时间', index: 'createTime', width: 140 },
-      { title: '创建人', index: 'createUserId', width: 150 },
+      // { title: '创建人', index: 'createUserId', width: 150 },
       {
         title: '操作',
         width: '130px',

src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts

@@ -212,6 +212,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
           {
             text: '审核',
             click: _record => this.ViewAdimin(_record),
+            acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-adminAudit'] },
             iif: (item: any) => item.approvalStatus === 10
           },
           {

src/app/routes/usercenter/usercenter-routing.module.ts

@@ -22,25 +22,51 @@ import { FreightComponentsListViewComponent } from './components/freight/list/vi
 import { FreightComponentsUserDetailComponent } from './components/freight/user/detail/detail.component';
 import { FreightComponentsUserComponent } from './components/freight/user/user.component';
 
-
 const routes: Routes = [
-
+  { path: 'freight/list', component: FreightComponentsListComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-LIST-list'] } } },
-  { path: 'freight/list', component: FreightComponentsListComponent },
   { path: 'freight/list/view/:id', component: FreightComponentsListViewComponent },
-  { path: 'freight/list/new', component: FreightComponentsListNewComponent },
+  { path: 'freight/list/new', component: FreightComponentsListNewComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-NEW-save'] } } },
-  { path: 'freight/list/detail/:id', component: FreightComponentsListDetailComponent },
+  {
-  { path: 'freight/enterprise/detail/:id', component: FreightComponentsListDetailComponent },
+    path: 'freight/list/detail/:id',
-  { path: 'freight/enterprise', component: FreightComponentsEnterpriseAuditComponent },
+    component: FreightComponentsListDetailComponent,
-  { path: 'freight/user', component: FreightComponentsUserComponent },
+    data: { guard: { ability: ['USERCENTER-FREIGHT-LIST-DETAIL-view'] } }
-  { path: 'freight/user/view/:id', component: FreightComponentsUserDetailComponent },
+  },
-  { path: 'driver', component: UserCenterComponentsDriverComponent },
+  {
-  { path: 'driver/detail/:id', component: UserCenterComponentsDriverDetailComponent },
+    path: 'freight/enterprise/detail/:id',
-  { path: 'driver/captain', component: UserCenterComponentsDriverCaptainComponent },
+    component: FreightComponentsListDetailComponent,
-  { path: 'driver/captain/detail/:id', component: CaptainDetailComponent },
+    data: { guard: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-view'] } }
+  },
+  {
+    path: 'freight/enterprise',
+    component: FreightComponentsEnterpriseAuditComponent,
+    data: { guard: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-list', 'USERCENTER-FREIGHT-ENTERPRISE-adminList'] } }
+  },
+  { path: 'freight/user', component: FreightComponentsUserComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-USER-list'] } } },
+  {
+    path: 'freight/user/view/:id',
+    component: FreightComponentsUserDetailComponent,
+    data: { guard: { ability: ['USERCENTER-FREIGHT-USER-D-view'] } }
+  },
+  { path: 'driver', component: UserCenterComponentsDriverComponent, data: { guard: { ability: ['USERCENTER-DRIVER-LIST-list'] } } },
+  {
+    path: 'driver/detail/:id',
+    component: UserCenterComponentsDriverDetailComponent,
+    data: { guard: { ability: ['USERCENTER-DRIVER-LIST-DETAIL-view'] } }
+  },
+  {
+    path: 'driver/captain',
+    component: UserCenterComponentsDriverCaptainComponent,
+    data: { guard: { ability: ['USERCENTER-DRIVER-CAPTAIN-list'] } }
+  },
+  {
+    path: 'driver/captain/detail/:id',
+    component: CaptainDetailComponent,
+    data: { guard: { ability: ['USERCENTER-DRIVER-CAPTAIN-DETAIL-view'] } }
+  }
 ];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
+  exports: [RouterModule]
 })
 export class UsercenterRoutingModule {}