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

src/app/routes/contract-management/components/index/index.component.ts

@@ -26,7 +26,6 @@ export class ContractManagementIndexComponent implements OnInit {
     const acls = acl.data.abilities || [];
     this.isShowDetail = !!acls.find(acl => acl === 'CONTRACT-INDEX-searchDetail');
     this.isShowFrame = !!acls.find(acl => acl === 'CONTRACT-INDEX-listFrame');
-    console.log(this.isShowFrame);
     
   }
 

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -555,8 +555,8 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
           },{
             text: '订单上报推送',
             click: _record => this.orderReportPush(_record),
-            iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5')
+            iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5'),
-            // acl: { ability: ['VEHICLE-LIST-view'] },
+            acl: { ability: ['ORDER-BULK-push'] },
           }
         ]
       }

src/app/routes/order-management/components/vehicle/vehicle.component.ts

@@ -473,8 +473,8 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
           {
             text: '订单上报推送',
             click: _record => this.orderReportPush(_record),
-            iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5')
+            iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5'),
-            // acl: { ability: ['VEHICLE-LIST-view'] },
+            acl: { ability: ['ORDER-VEHICLE-push'] },
           }
         ]
       }

src/app/routes/supply-management/components/index/index.component.html

@@ -25,10 +25,10 @@
     <label class="page_title"> <label class="driver">|</label> 货源管理</label>
   </div>
   <nz-tabset [(nzSelectedIndex)]="selectedIndex" class="header_tab">
-    <nz-tab nzTitle="整车货源">
+    <nz-tab nzTitle="整车货源" *ngIf="isShowVehicle">
       <app-supply-management-vehicle></app-supply-management-vehicle>
     </nz-tab>
-    <nz-tab nzTitle="大宗货源">
+    <nz-tab nzTitle="大宗货源" *ngIf="isShowBulk">
       <app-supply-management-bulk></app-supply-management-bulk>
     </nz-tab>
   </nz-tabset>

src/app/routes/supply-management/components/index/index.component.ts

@@ -1,5 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent } from '@delon/abc/st';
+import { ACLService } from '@delon/acl';
 import { SFSchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { SearchDrawerService } from '@shared';
@@ -12,7 +13,14 @@ import { BasicTableComponent } from 'src/app/routes/commom';
 })
 export class SupplyManagementIndexComponent implements OnInit {
   selectedIndex = 0;
+  isShowVehicle = false;
+  isShowBulk = false;
 
+  constructor(private http: _HttpClient, private modal: ModalHelper, private acl: ACLService) {
+    const acls = acl.data.abilities || [];
+    this.isShowVehicle = !!acls.find(acl => acl === 'SUPPLY-INDEX-vehicleSearch');
+    this.isShowBulk = !!acls.find(acl => acl === 'SUPPLY-INDEX-bulkSearch');
+  }
 
   ngOnInit(): void {}
 }

src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html

@@ -113,14 +113,16 @@
           {{ i?.carrierInformationVO?.driverLicensePlate }}
         </sv>
       </sv-container>
-      <sv label="承运司机" *ngIf="i?.carrierInformationVO.driverTelephone !== i?.payeePhone">
+      <sv-container>
-        {{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} /
+        <sv label="承运司机" *ngIf="i?.carrierInformationVO.driverTelephone !== i?.payeePhone">
-        {{i?.carrierInformationVO.driverLicensePlate || '--'}}
+          {{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} /
-      </sv>
+          {{i?.carrierInformationVO.driverLicensePlate || '--'}}
-      <sv label="车型车长载重">
+        </sv>
-        {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight ||
+        <sv label="车型车长载重">
-        '--')+'吨'}}
+          {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight ||
-      </sv>
+          '--')+'吨'}}
+        </sv>
+      </sv-container>
       <div class="mt-md">
         <h4 class="text-md">装货卸货信息
           <span class="ml-sm text-sm">(

src/app/routes/supply-management/supply-management-routing.module.ts

@@ -21,11 +21,46 @@ import { SupplyManagementReleasePublishComponent } from './components/release-pu
 import { SupplyManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
 
 const routes: Routes = [
-  { path: 'index', component: SupplyManagementIndexComponent },
+  {
-  { path: 'index/bulk-detail/:id', component: SupplyManagementBulkDetailComponent },
+    path: 'index',
-  { path: 'index/vehicle-detail/:id', component: SupplyManagementVehicleDetailComponent },
+    component: SupplyManagementIndexComponent,
+    data: { guard: { ability: ['SUPPLY-INDEX-vehicleSearch', 'SUPPLY-INDEX-bulkSearch'] } }
+  },
+  {
+    path: 'index/bulk-detail/:id',
+    component: SupplyManagementBulkDetailComponent,
+    data: {
+      guard: { ability: ['SUPPLY-BULK-DETAIL-cancelSupply', 'SUPPLY-BULK-DETAIL-updatePrice', 'SUPPLY-BULK-DETAIL-bulkAnotherOrder'] }
+    }
+  },
+  {
+    path: 'index/vehicle-detail/:id',
+    component: SupplyManagementVehicleDetailComponent,
+    data: {
+      guard: {
+        ability: [
+          'SUPPLY-VEHICLE-DETAIL-cancelSupply',
+          'SUPPLY-VEHICLE-DETAIL-changeSupply',
+          'SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder',
+          'SUPPLY-VEHICLE-DETAIL-vehicleAnew'
+        ]
+      }
+    }
+  },
   { path: 'add-drivers', component: SupplyManagementAddDriversComponent },
-  { path: 'vehicle-amend/:id', component: SupplyManagementOnecarPublishComponent },
+  {
+    path: 'vehicle-amend/:id',
+    component: SupplyManagementOnecarPublishComponent,
+    data: {
+      guard: {
+        ability: [
+          'SUPPLY-VEHICLE-PLACEORDER-QRCode',
+          'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate',
+          'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder'
+        ]
+      }
+    }
+  },
   { path: 'vehicle-release', component: SupplyManagementReleasePublishComponent },
   { path: 'bulk-release', component: SupplyManagementBulkReleasePublishComponent },
   { path: 'bulk-amend/:id', component: SupplyManagementBulkPublishComponent }

src/app/shared/index.ts

@@ -22,7 +22,7 @@ export * from './components/dynamic-setting';
 export * from './components/singlepage-setting';
 export * from './components/insurance-table/index';
 export * from './components/rebate-table/index';
-export * from './components/search-drawer';
+export * from './components/search-drawer/index';
 
 // Utils
 export * from './utils';

src/app/shared/shared.module.ts

@@ -39,8 +39,9 @@ import { PipeModule } from './pipes';
 import { AccountDetailComponent } from './components/account-detail/account-detail.component';
 import { CaptchaModule } from './components/captcha';
 import { rebateTableModule } from './components/rebate-table';
-import { SearchDrawerComponent } from './components/search-drawer/search-drawer.component';
+import { SearchDrawerModule } from './components/search-drawer';
-import { SearchDrawerModule } from './components/search-drawer/search-drawer.module';
+// import { SearchDrawerComponent } from './components/search-drawer/search-drawer.component';
+
 
 const MODULES = [
   AddressModule,